configuration.rb in frenetic-0.0.20.alpha.0

- old
+ new
@@ -1,103 +1,67 @@
-require 'socket'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/deep_merge'
+require 'addressable/uri'
+require 'active_support/core_ext/hash/indifferent_access'
 
 class Frenetic
   class Configuration
 
     @@defaults = {
-      adapter:  nil,
-      cache:    nil,
-      url:      nil,
-      username: nil,
-      password: nil,
-      headers:  {
-        accept: 'application/hal+json'
-      },
-      request:  {},
-      response: {}
+      headers:   {
+        accept:     'application/hal+json',
+        user_agent: "Frenetic v#{Frenetic::VERSION}; #{Socket.gethostname}"
+      }
     }
 
-    attr_accessor :adapter, :cache, :url, :username, :password
-    attr_accessor :headers, :request, :response, :middleware
+    def initialize( cfg = {} )
+      @_cfg = cfg.symbolize_keys
+    end
 
-    def initialize( config = {} )
-      config = @@defaults.deep_merge( config.symbolize_keys )
+    def adapter
+      @_cfg[:adapter] || :net_http
+    end
 
-      map_api_key_to_username config
-      append_user_agent       config
-      filter_cache_headers    config
-
-      config.each do |k, v|
-        v.symbolize_keys! if v.is_a? Hash
-
-        instance_variable_set "@#{k}", v
-      end
+    def api_token
+      @_cfg[:api_token]
     end
 
     def attributes
-      validate!
-
-      (instance_variables - [:@middleware]).each_with_object({}) do |k, attrs|
-        key = k.to_s.gsub( '@', '' )
-
-        value = instance_variable_get( k )
-
-        attrs[key.to_sym] = value
-      end
+      {
+        adapter:   adapter,
+        api_token: api_token,
+        cache:     cache,
+        headers:   headers,
+        password:  password,
+        url:       url,
+        username:  username
+      }
     end
-    alias_method :to_hash, :attributes
 
-    def validate!
-      raise(Frenetic::ConfigurationError, 'No API URL defined!') unless @url.present?
-
-      if @cache
-        raise( ConfigurationError, 'No cache :metastore defined!' )               unless @cache[:metastore].present?
-        raise( ConfigurationError, "No cache :entitystore defined!" )             unless @cache[:entitystore].present?
+    def cache
+      if @_cfg[:cache] == :rack
+        {
+          metastore:     'file:tmp/rack/meta',
+          entitystore:   'file:tmp/rack/body',
+          ignore_headers: %w{Authorization Set-Cookie X-Content-Digest}
+        }
+      else
+        {}
       end
     end
 
-    def middleware
-      @middleware ||= []
+    def headers
+      @@defaults[:headers].merge( @_cfg[:headers] || {} )
     end
 
-    def use( *args )
-      middleware << args
+    def password
+      @_cfg[:password] || @_cfg[:api_key]
     end
 
-  private
-
-    def user_agent
-      "Frenetic v#{Frenetic::VERSION}; #{Socket.gethostname}"
+    def url
+      Addressable::URI.parse @_cfg[:url]
     end
 
-    def map_api_key_to_username( config )
-      if config[:api_key]
-        if config[:app_id]
-          config[:username] = config.delete :app_id
-          config[:password] = config.delete :api_key
-        else
-          config[:username] = config.delete :api_key
-        end
-      end
-    end
-
-    def append_user_agent( config )
-      if config[:headers][:user_agent]
-        config[:headers][:user_agent] << " (#{user_agent})"
-      else
-        config[:headers][:user_agent] = user_agent
-      end
-    end
-
-    def filter_cache_headers( config )
-      if config[:cache]
-        ignore_headers = config[:cache][:ignore_headers] || []
-
-        config[:cache][:ignore_headers] = (ignore_headers + %w[Set-Cookie X-Content-Digest]).uniq
-      end
+    def username
+      @_cfg[:username] || @_cfg[:app_id]
     end
 
   end
 end
\ No newline at end of file