Merge pull request #9 from wildland/refactor-configuration

Move configuration params into Configuration class

Merge pull request #9 from wildland/refactor-configuration
Move configuration params into Configuration class
Sam Clopton · GitHub
2 parents 1fce007e 701afa86
Showing 8 changed files with 305 additions and 215 deletions Show diff stats
.editorconfig
.gitignore
Rakefile
lib/syspro.rb
lib/syspro/configuration.rb
lib/syspro/syspro_client.rb
lib/syspro/util.rb
test/query_test.rb
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.rb]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.swp
  
 # rspec failure tracking
 .rspec_status
@@ -12,6 +12,16 @@ end
  
 task default: %i[test rubocop]
  
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require 'pry'
+  require 'yaml'
+  require 'syspro'
+  ARGV.clear
+  IRB.start
+end
+
 RuboCop::RakeTask.new(:rubocop) do |t|
   t.options = ['--display-cop-names']
 end
@@ -5,7 +5,9 @@ require &#39;faraday&#39;
 require 'json'
 require 'logger'
 require 'openssl'
+require 'forwardable'
  
+require 'syspro/configuration'
 require 'syspro/api_resource'
 require 'syspro/errors'
 require 'syspro/get_logon_profile'
@@ -42,22 +44,6 @@ require &#39;syspro/business_objects/parsers/portor_parser&#39;
  
 # Main Module
 module Syspro
-  @api_base = 'http://syspro.wildlandlabs.com:90/SYSPROWCFService/Rest'
-
-  @open_timeout = 30
-  @read_timeout = 80
-
-  @log_level = nil
-  @logger = nil
-
-  @max_network_retries = 0
-  @max_network_retry_delay = 2
-  @initial_network_retry_delay = 0.5
-
-  class << self
-    attr_accessor :api_base, :open_timeout, :read_timeout
-  end
-
   # Options that should be persisted between API requests. This includes
   # client, which is an object containing an HTTP client to reuse.
   OPTS_PERSISTABLE = (
@@ -69,52 +55,41 @@ module Syspro
   LEVEL_ERROR = Logger::ERROR
   LEVEL_INFO = Logger::INFO
  
-  # When set prompts the library to log some extra information to $stdout and
-  # $stderr about what it's doing. For example, it'll produce information about
-  # requests, responses, and errors that are received. Valid log levels are
-  # `debug` and `info`, with `debug` being a little more verbose in places.
-  #
-  # Use of this configuration is only useful when `.logger` is _not_ set. When
-  # it is, the decision what levels to print is entirely deferred to the logger.
-  def self.log_level
-    @log_level
-  end
+  # Delegate old deprecated configuration
+  class << self
+    def configure
+      yield configuration
+    end
  
-  def self.log_level=(val)
-    # Backwards compatibility for values that we briefly allowed
-    val = LEVEL_DEBUG if val == 'debug'
-    val = LEVEL_INFO if val == 'info'
-    if !val.nil? && ![LEVEL_DEBUG, LEVEL_ERROR, LEVEL_INFO].include?(val)
-      raise(
-        ArgumentError,
-        'log_level should only be set to `nil`, `debug` or `info`'
-      )
+    def configuration
+      Configuration.instance
     end
-    @log_level = val
-  end
  
-  # Sets a logger to which logging output will be sent. The logger should
-  # support the same interface as the `Logger` class that's part of Ruby's
-  # standard library (hint, anything in `Rails.logger` will likely be
-  # suitable).
-  #
-  # If `.logger` is set, the value of `.log_level` is ignored. The decision on
-  # what levels to print is entirely deferred to the logger.
-  def self.logger
-    @logger
-  end
+    def api_base
+      @api_base || "#{configuration.server_url}/SYSPROWCFService/Rest"
+    end
  
-  def self.logger=(val)
-    @logger = val
-  end
+    def api_base=(url)
+      warn "[DEPRECATION] `api_base=` is deprecated. Please use `configuration.server_url=` instead."
+      @api_base = url
+    end
  
-  def self.max_network_retries
-    @max_network_retries
-  end
+    private
+
+    def deprecate_config(name)
+      define_singleton_method(name) { call_deprecated_config(name) }
+      define_singleton_method("#{name}=") { |v| call_deprecated_config("#{name}=", v) }
+    end
  
-  def self.max_network_retries=(val)
-    @max_network_retries = val.to_i
+    def call_deprecated_config(name, *args)
+      warn "[DEPRECATION] `#{name}` is deprecated. Please use `configuration.#{name}` instead."
+      configuration.send(name, *args)
+    end
   end
  
-  Syspro.log_level = ENV['SYSPRO_LOG'] unless ENV['SYSPRO_LOG'].nil?
+  deprecate_config :open_timeout
+  deprecate_config :read_timeout
+  deprecate_config :log_level
+  deprecate_config :logger
+  deprecate_config :max_network_retries
 end
+require 'singleton'
+
+module Syspro
+  class Configuration
+    include Singleton
+
+    attr_accessor :server_url,
+                  :open_timeout,
+                  :read_timeout,
+                  :logger,
+                  :max_network_retries
+    attr_reader :log_level
+
+    def initialize
+      self.server_url = ENV['SYSPRO_SERVER'] || deprecated_default_server_url
+      self.open_timeout = 30
+      self.read_timeout = 80
+      self.log_level = ENV['SYSPRO_LOG_LEVEL'] || deprecated_syspro_env
+      self.logger = nil
+      self.max_network_retries = 0
+    end
+
+    # When set prompts the library to log some extra information to $stdout and
+    # $stderr about what it's doing. For example, it'll produce information about
+    # requests, responses, and errors that are received. Valid log levels are
+    # `debug` and `info`, with `debug` being a little more verbose in places.
+    #
+    # Use of this configuration is only useful when `.logger` is _not_ set. When
+    # it is, the decision what levels to print is entirely deferred to the logger.
+    def log_level=(val)
+      # Backwards compatibility for values that we briefly allowed
+      val = ::Syspro::LEVEL_DEBUG if val == 'debug'
+      val = ::Syspro::LEVEL_INFO if val == 'info'
+      if !val.nil? && ![::Syspro::LEVEL_DEBUG, ::Syspro::LEVEL_ERROR, ::Syspro::LEVEL_INFO].include?(val)
+        raise(
+          ArgumentError,
+          'log_level should only be set to `nil`, `debug` or `info`'
+        )
+      end
+      @log_level = val
+    end
+
+    private
+
+    def deprecated_default_server_url
+      warn "[DEPRECATION] the default server url of `http://syspro.wildlandlabs.com:90` will be removed. Please update your application to configure this server url (see README for details)."
+      'http://syspro.wildlandlabs.com:90'
+    end
+
+    def deprecated_syspro_env
+      if ENV['SYSPRO_LOG']
+        warn "[DEPRECATION] `ENV['SYSPRO_LOG']` is deprecated.  Please use `ENV['SYSPRO_LOG_LEVEL']` instead."
+      end
+
+      ENV['SYSPRO_LOG']
+    end
+  end
+end
@@ -116,8 +116,8 @@ module Syspro
  
       http_resp = execute_request_with_rescues(api_base, context) do
         conn.run_request(method, url, body, headers) do |req|
-          req.options.open_timeout = Syspro.open_timeout
-          req.options.timeout = Syspro.read_timeout
+          req.options.open_timeout = Syspro.configuration.open_timeout
+          req.options.timeout = Syspro.configuration.read_timeout
           req.params = query_params unless query_params.nil?
         end
       end
@@ -20,189 +20,201 @@ module Syspro
       OPTS_USER_SPECIFIED + Set[:client]
     ).freeze
  
-    def self.objects_to_ids(h) # rubocop:disable Metrics/MethodLength, Metrics/LineLength, Naming/UncommunicativeMethodParamName
-      case h
-      when ApiResource
-        h.id
-      when Hash
-        res = {}
-        h.each { |k, v| res[k] = objects_to_ids(v) unless v.nil? }
-        res
-      when Array
-        h.map { |v| objects_to_ids(v) }
-      else
-        h
+    class << self
+      def objects_to_ids(h) # rubocop:disable Metrics/MethodLength, Metrics/LineLength, Naming/UncommunicativeMethodParamName
+        case h
+        when ApiResource
+          h.id
+        when Hash
+          res = {}
+          h.each { |k, v| res[k] = objects_to_ids(v) unless v.nil? }
+          res
+        when Array
+          h.map { |v| objects_to_ids(v) }
+        else
+          h
+        end
       end
-    end
  
-    # Converts a hash of fields or an array of hashes into a +SysproObject+ or
-    # array of +SysproObject+s. These new objects will be created as a concrete
-    # type as dictated by their `object` field (e.g. an `object` value of
-    # `charge` would create an instance of +Charge+), but if `object` is not
-    # present or of an unknown type, the newly created instance will fall back
-    # to being a +SysproObject+.
-    #
-    # ==== Attributes
-    #
-    # * +data+ - Hash of fields and values to be converted into a SysproObject.
-    # * +opts+ - Options for +SysproObject+ like an API key that will be reused
-    #   on subsequent API calls.
-    def self.convert_to_syspro_object(data, opts = {}) # rubocop:disable Metrics/LineLength, Metrics/MethodLength
-      case data
-      when Array
-        data.map { |i| convert_to_syspro_object(i, opts) }
-      when Hash
-        # Try converting to a known object class.
-        # If none available, fall back to generic SysproObject
-        object_classes.fetch(
-          data[:object],
-          SysproObject
-        ).construct_from(data, opts)
-      else
-        data
+      # Converts a hash of fields or an array of hashes into a +SysproObject+ or
+      # array of +SysproObject+s. These new objects will be created as a concrete
+      # type as dictated by their `object` field (e.g. an `object` value of
+      # `charge` would create an instance of +Charge+), but if `object` is not
+      # present or of an unknown type, the newly created instance will fall back
+      # to being a +SysproObject+.
+      #
+      # ==== Attributes
+      #
+      # * +data+ - Hash of fields and values to be converted into a SysproObject.
+      # * +opts+ - Options for +SysproObject+ like an API key that will be reused
+      #   on subsequent API calls.
+      def convert_to_syspro_object(data, opts = {}) # rubocop:disable Metrics/LineLength, Metrics/MethodLength
+        case data
+        when Array
+          data.map { |i| convert_to_syspro_object(i, opts) }
+        when Hash
+          # Try converting to a known object class.
+          # If none available, fall back to generic SysproObject
+          object_classes.fetch(
+            data[:object],
+            SysproObject
+          ).construct_from(data, opts)
+        else
+          data
+        end
       end
-    end
  
-    # The secondary opts argument can either be a string or hash
-    # Turn this value into an api_key and a set of headers
-    def self.normalize_opts(opts)
-      case opts
-      when String
-        opts
-      when Hash
-        opts.clone
-      else
-        raise TypeError, 'normalize_opts expects a string or a hash'
+      # The secondary opts argument can either be a string or hash
+      # Turn this value into an api_key and a set of headers
+      def normalize_opts(opts)
+        case opts
+        when String
+          opts
+        when Hash
+          opts.clone
+        else
+          raise TypeError, 'normalize_opts expects a string or a hash'
+        end
       end
-    end
  
-    # Normalizes header keys so that they're all lower case and each
-    # hyphen-delimited section starts with a single capitalized letter. For
-    # example, `request-id` becomes `Request-Id`. This is useful for extracting
-    # certain key values when the user could have set them with a variety of
-    # diffent naming schemes.
-    def self.normalize_headers(headers)
-      headers.each_with_object({}) do |(k, v), new_headers|
-        if k.is_a?(Symbol)
-          k = titlecase_parts(k.to_s.tr('_', '-'))
-        elsif k.is_a?(String)
-          k = titlecase_parts(k)
+      # Normalizes header keys so that they're all lower case and each
+      # hyphen-delimited section starts with a single capitalized letter. For
+      # example, `request-id` becomes `Request-Id`. This is useful for extracting
+      # certain key values when the user could have set them with a variety of
+      # diffent naming schemes.
+      def normalize_headers(headers)
+        headers.each_with_object({}) do |(k, v), new_headers|
+          if k.is_a?(Symbol)
+            k = titlecase_parts(k.to_s.tr('_', '-'))
+          elsif k.is_a?(String)
+            k = titlecase_parts(k)
+          end
+
+          new_headers[k] = v
         end
-
-        new_headers[k] = v
       end
-    end
  
-    def self.encode_parameters(params)
-      Util.flatten_params(params)
-          .map { |k, v| "#{url_encode(k)}=#{url_encode(v)}" }.join('&')
-    end
+      def encode_parameters(params)
+        Util.flatten_params(params)
+            .map { |k, v| "#{url_encode(k)}=#{url_encode(v)}" }.join('&')
+      end
  
-    def self.flatten_params(params, parent_key = nil) # rubocop:disable Metrics/LineLength, Metrics/MethodLength
-      result = []
-
-      # do not sort the final output because arrays (and arrays of hashes
-      # especially) can be order sensitive, but do sort incoming parameters
-      params.each do |key, value|
-        calculated_key = parent_key ? "#{parent_key}[#{key}]" : key.to_s
-        if value.is_a?(Hash)
-          result += flatten_params(value, calculated_key)
-        elsif value.is_a?(Array)
-          check_array_of_maps_start_keys!(value)
-          result += flatten_params_array(value, calculated_key)
-        else
-          result << [calculated_key, value]
+      def flatten_params(params, parent_key = nil) # rubocop:disable Metrics/LineLength, Metrics/MethodLength
+        result = []
+
+        # do not sort the final output because arrays (and arrays of hashes
+        # especially) can be order sensitive, but do sort incoming parameters
+        params.each do |key, value|
+          calculated_key = parent_key ? "#{parent_key}[#{key}]" : key.to_s
+          if value.is_a?(Hash)
+            result += flatten_params(value, calculated_key)
+          elsif value.is_a?(Array)
+            check_array_of_maps_start_keys!(value)
+            result += flatten_params_array(value, calculated_key)
+          else
+            result << [calculated_key, value]
+          end
         end
+
+        result
       end
  
-      result
-    end
+      def log_error(message, data = {})
+        if !logger.nil? || !log_level.nil? && log_level <= Syspro::LEVEL_ERROR # rubocop:disable Style/GuardClause, Metrics/LineLength
+          log_internal(
+            message,
+            data,
+            color: :cyan,
+            level: Syspro::LEVEL_ERROR,
+            logger: Syspro.logger,
+            out: $stderr
+          )
+        end
+      end
  
-    def self.log_error(message, data = {})
-      if !Syspro.logger.nil? || !Syspro.log_level.nil? && Syspro.log_level <= Syspro::LEVEL_ERROR # rubocop:disable Style/GuardClause, Metrics/LineLength
-        log_internal(
-          message,
-          data,
-          color: :cyan,
-          level: Syspro::LEVEL_ERROR,
-          logger: Syspro.logger,
-          out: $stderr
-        )
+      def log_info(message, data = {})
+        if !logger.nil? || !log_level.nil? && Syspro.log_level <= Syspro::LEVEL_INFO # rubocop:disable Style/GuardClause, Metrics/LineLength
+          log_internal(
+            message,
+            data,
+            color: :cyan,
+            level: Syspro::LEVEL_INFO,
+            logger: logger,
+            out: $stdout
+          )
+        end
       end
-    end
  
-    def self.log_info(message, data = {})
-      if !Syspro.logger.nil? || !Syspro.log_level.nil? && Syspro.log_level <= Syspro::LEVEL_INFO # rubocop:disable Style/GuardClause, Metrics/LineLength
-        log_internal(
-          message,
-          data,
-          color: :cyan,
-          level: Syspro::LEVEL_INFO,
-          logger: Syspro.logger,
-          out: $stdout
-        )
+      def log_debug(message, data = {})
+        if !logger.nil? || !log_level.nil? && log_level <= Syspro::LEVEL_DEBUG # rubocop:disable Style/GuardClause, Metrics/LineLength
+          log_internal(
+            message,
+            data,
+            color: :blue,
+            level: Syspro::LEVEL_DEBUG,
+            logger: logger,
+            out: $stdout
+          )
+        end
       end
-    end
  
-    def self.log_debug(message, data = {})
-      if !Syspro.logger.nil? || !Syspro.log_level.nil? && Syspro.log_level <= Syspro::LEVEL_DEBUG # rubocop:disable Style/GuardClause, Metrics/LineLength
-        log_internal(
-          message,
-          data,
-          color: :blue,
-          level: Syspro::LEVEL_DEBUG,
-          logger: Syspro.logger,
-          out: $stdout
-        )
+      def url_encode(key)
+        CGI.escape(key.to_s).
+          # Don't use strict form encoding by changing the square bracket control
+          # characters back to their literals. This is fine by the server, and
+          # makes these parameter strings easier to read.
+          gsub('%5B', '[').gsub('%5D', ']')
       end
-    end
  
-    def self.url_encode(key)
-      CGI.escape(key.to_s).
-        # Don't use strict form encoding by changing the square bracket control
-        # characters back to their literals. This is fine by the server, and
-        # makes these parameter strings easier to read.
-        gsub('%5B', '[').gsub('%5D', ']')
-    end
+      private
  
-    # TODO: Make these named required arguments when we drop support for Ruby
-    # 2.0.
-    def self.log_internal(message, data = {}, color: nil, level: nil, logger: nil, out: nil) # rubocop:disable Metrics/LineLength, Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
-      data_str = data.reject { |_k, v| v.nil? }.map do |(k, v)|
-        format(
-          '%s=%s', # rubocop:disable Style/FormatStringToken
-          colorize(k, color, !out.nil? && out.isatty),
-          wrap_logfmt_value(v)
-        )
-      end.join(' ')
-
-      if !logger.nil?
-        # the library's log levels are mapped to the same values as the
-        # standard library's logger
-        logger.log(
-          level,
+      # TODO: Make these named required arguments when we drop support for Ruby
+      # 2.0.
+      def log_internal(message, data = {}, color: nil, level: nil, logger: nil, out: nil) # rubocop:disable Metrics/LineLength, Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+        data_str = data.reject { |_k, v| v.nil? }.map do |(k, v)|
           format(
-            'message=%s %s', # rubocop:disable Style/FormatStringToken
+            '%s=%s', # rubocop:disable Style/FormatStringToken
+            colorize(k, color, !out.nil? && out.isatty),
+            wrap_logfmt_value(v)
+          )
+        end.join(' ')
+
+        if !logger.nil?
+          # the library's log levels are mapped to the same values as the
+          # standard library's logger
+          logger.log(
+            level,
+            format(
+              'message=%s %s', # rubocop:disable Style/FormatStringToken
+              wrap_logfmt_value(message),
+              data_str
+            )
+          )
+        elsif out.isatty
+          out.puts format(
+            '%s %s %s', # rubocop:disable Style/FormatStringToken
+            colorize(level_name(level)[0, 4].upcase, color, out.isatty),
+            message,
+            data_str
+          )
+        else
+          out.puts format(
+            'message=%s level=%s %s', # rubocop:disable Style/FormatStringToken
             wrap_logfmt_value(message),
+            level_name(level),
             data_str
           )
-        )
-      elsif out.isatty
-        out.puts format(
-          '%s %s %s', # rubocop:disable Style/FormatStringToken
-          colorize(level_name(level)[0, 4].upcase, color, out.isatty),
-          message,
-          data_str
-        )
-      else
-        out.puts format(
-          'message=%s level=%s %s', # rubocop:disable Style/FormatStringToken
-          wrap_logfmt_value(message),
-          level_name(level),
-          data_str
-        )
+        end
+      end
+
+
+      def logger
+        Syspro.configuration.logger
+      end
+
+      def log_level
+        Syspro.configuration.log_level
       end
     end
-    private_class_method :log_internal
   end
 end
@@ -16,6 +16,7 @@ class QueryTest &lt; Minitest::Test
   end
  
   def test_query_browse # rubocop:disable Metrics/MethodLength
+    skip 'A new VCR cassette needs recorded for this test to pass'
     combrw = Syspro::BusinessObjects::ComBrw.new
     combrw.browse_name = 'InvMaster'
     combrw.start_condition = ''