morpheus 0.4.0 → 0.5.0

data/.rspec

@@ -1 +1 @@
---color
+--order rand

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# 0.5.0
+* Upgrading typhoeus to ~> 0.4.2
+* Morpheus::Client::LogSubscriber has been refactored out into separate formatter classes.
+
+# 0.4.0
+* Updated yajl-ruby to ~> 1.1.0 [3f30762](https://github.com/ryanmoran/morpheus/commit/3f30762528f4fc6b1f35775ce81e5ba1c03bc3c7).
+* Updated typhoeus to ~> 0.3.3 [cf474b6](https://github.com/ryanmoran/morpheus/commit/cf474b651a77a8359ebb25600ab2be8a57a06df2).
+* Added Yajl::ParseError exception handling support [3234984](https://github.com/ryanmoran/morpheus/commit/32349841d155188fe37906351f5091e756deca76).
+* Continuing to add spec coverage.
+
+# 0.3.9
+* Fixed ResponseCache hashing issue where duplicate cache_key values were being created for different responses [5b507a7](https://github.com/ryanmoran/morpheus/commit/5b507a78e53120239ad38df0018b7324bd5969e9).
+* Continuing to add spec coverage.
+
+# 0.3.8
+* Fixed dependency version issues with activemodel, activesupport, and i18n [36575ef](https://github.com/ryanmoran/morpheus/commit/36575efe6ca42edf1e7b461658c55048823730f7).
+* Continuing to add spec coverage.

data/Gemfile

@@ -3,6 +3,6 @@ source 'http://rubygems.org'
 gemspec
 
 group :development do
-  gem 'simplecov',           '~> 0.6.1'
+  gem 'simplecov',           '~> 0.6.4'
   gem 'autotest-standalone', '~> 4.5.9'
 end

data/lib/morpheus.rb

@@ -13,11 +13,11 @@ require 'active_model'
 # The bulk of the library consists of the Base class and its mix-in modules, the request/response wrappers,
 # mocking, configuration, errors, and classes managing associations, reflections, relations, and typecasting.
 module Morpheus
-  autoload :Version, 'morpheus/version'
-
   autoload :Base,           'morpheus/base'
+  autoload :Client,         'morpheus/client'
   autoload :Configuration,  'morpheus/configuration'
   autoload :Filter,         'morpheus/filter'
+  autoload :Mixins,         'morpheus/mixins'
   autoload :Mock,           'morpheus/mock'
   autoload :Reflection,     'morpheus/reflection'
   autoload :Relation,       'morpheus/relation'
@@ -28,19 +28,7 @@ module Morpheus
   autoload :ResponseParser, 'morpheus/response_parser'
   autoload :TypeCaster,     'morpheus/type_caster'
   autoload :UrlBuilder,     'morpheus/url_builder'
-
-  # Mixins provide behaviors to the Base class.
-  autoload :Associations,    'morpheus/mixins/associations'
-  autoload :Attributes,      'morpheus/mixins/attributes'
-  autoload :Conversion,      'morpheus/mixins/conversion'
-  autoload :Filtering,       'morpheus/mixins/filtering'
-  autoload :Finders,         'morpheus/mixins/finders'
-  autoload :Introspection,   'morpheus/mixins/introspection'
-  autoload :Persistence,     'morpheus/mixins/persistence'
-  autoload :Reflections,     'morpheus/mixins/reflections'
-  autoload :RequestHandling, 'morpheus/mixins/request_handling'
-  autoload :ResponseParsing, 'morpheus/mixins/response_parsing'
-  autoload :UrlSupport,      'morpheus/mixins/url_support'
+  autoload :Version,        'morpheus/version'
 
   # Error classes
   autoload :ConfigurationError,          'morpheus/errors'
@@ -52,14 +40,6 @@ module Morpheus
   autoload :InvalidResponseCode,         'morpheus/errors'
 end
 
-# Associations for application objects, typically ActiveRecord, to resource
-module Morpheus
-  module Client
-    autoload :Associations,  'morpheus/client/associations'
-    autoload :LogSubscriber, 'morpheus/client/log_subscriber'
-  end
-end
-
 # The Railtie loads the LogSubscriber for printing output to the Rails log, and
 # Associations which plug-in to ActiveRecord to link associated resources.
 require 'morpheus/client/railtie'     if defined?(Rails)

data/lib/morpheus/base.rb

@@ -17,17 +17,17 @@ module Morpheus
     # In many cases they rely upon other classes in the library to complete
     # their functionality. The helper classes can be used stand-alone, but
     # are most effective when used as collaborators to the mix-in behaviors.
-    include Associations
-    include Attributes
-    include Conversion
-    include Filtering
-    include Finders
-    include Introspection
-    include Persistence
-    include Reflections
-    include RequestHandling
-    include ResponseParsing
-    include UrlSupport
+    include Mixins::Associations
+    include Mixins::Attributes
+    include Mixins::Conversion
+    include Mixins::Filtering
+    include Mixins::Finders
+    include Mixins::Introspection
+    include Mixins::Persistence
+    include Mixins::Reflections
+    include Mixins::RequestHandling
+    include Mixins::ResponseParsing
+    include Mixins::UrlSupport
 
     # Defines a default 'id' property on all instances of Morpheus::Base and subclasses
     property :id, :integer

data/lib/morpheus/client.rb

@@ -0,0 +1,10 @@
+# Associations for application objects, typically ActiveRecord, to resource
+module Morpheus
+  module Client
+    autoload :Associations,             'morpheus/client/associations'
+    autoload :CachedRequestFormatter,   'morpheus/client/cached_request_formatter'
+    autoload :LogSubscriber,            'morpheus/client/log_subscriber'
+    autoload :RequestFormatter,         'morpheus/client/request_formatter'
+    autoload :UncachedRequestFormatter, 'morpheus/client/uncached_request_formatter'
+  end
+end

data/lib/morpheus/client/associations.rb

@@ -11,11 +11,11 @@ module Morpheus
         def belongs_to_resource(association, options = {})
           define_method association do
             instance_variable_get("@#{association}") ||
-              instance_variable_set("@#{association}", Morpheus::Associations::BelongsToAssociation.new(self, association, :options => options))
+              instance_variable_set("@#{association}", Morpheus::Mixins::Associations::BelongsToAssociation.new(self, association, :options => options))
           end
 
           define_method "#{association}=" do |target|
-            instance_variable_set("@#{association}", Morpheus::Associations::BelongsToAssociation.new(self, association, :target => target, :options => options))
+            instance_variable_set("@#{association}", Morpheus::Mixins::Associations::BelongsToAssociation.new(self, association, :target => target, :options => options))
             send("#{association}_id=", target.id)
           end
 
@@ -24,22 +24,22 @@ module Morpheus
         def has_many_resources(association, options = {})
           define_method association do
             instance_variable_get("@#{association}") ||
-              instance_variable_set("@#{association}", Morpheus::Associations::HasManyAssociation.new(self, association, :options => options))
+              instance_variable_set("@#{association}", Morpheus::Mixins::Associations::HasManyAssociation.new(self, association, :options => options))
           end
 
           define_method "#{association}=" do |target|
-            instance_variable_set("@#{association}", Morpheus::Associations::HasManyAssociation.new(self, association, :target => target, :options => options))
+            instance_variable_set("@#{association}", Morpheus::Mixins::Associations::HasManyAssociation.new(self, association, :target => target, :options => options))
           end
         end
 
         def has_one_resource(association, options = {})
           define_method association do
             instance_variable_get("@#{association}") ||
-              instance_variable_set("@#{association}", Morpheus::Associations::HasOneAssociation.new(self, association, :options => options))
+              instance_variable_set("@#{association}", Morpheus::Mixins::Associations::HasOneAssociation.new(self, association, :options => options))
           end
 
           define_method "#{association}=" do |target|
-            instance_variable_set("@#{association}", Morpheus::Associations::HasOneAssociation.new(self, association, :target => target, :options => options))
+            instance_variable_set("@#{association}", Morpheus::Mixins::Associations::HasOneAssociation.new(self, association, :target => target, :options => options))
           end
         end
 

data/lib/morpheus/client/cached_request_formatter.rb

@@ -0,0 +1,20 @@
+module Morpheus
+  module Client
+    class CachedRequestFormatter < RequestFormatter
+
+      def call
+        "#{request_statement} #{payload}"
+      end
+
+      def request_statement
+        statement = "CACHE (#{duration}ms)"
+        color(statement, request_color, true)
+      end
+
+      def duration
+        event.duration
+      end
+
+    end
+  end
+end

data/lib/morpheus/client/log_subscriber.rb

@@ -12,37 +12,11 @@ module Morpheus
       end
 
       def uncached_request(event)
-        duration          = event.payload[:response].time * 1000
-        request_statement = "#{event.payload[:class].to_s} #{event.payload[:method].to_s.upcase} (#{duration}ms)"
-        if odd?
-          request_statement = color(request_statement, MAGENTA, true)
-          payload           = color(payload(event), nil, true)
-        else
-          request_statement = color(request_statement, CYAN, true)
-          payload           = payload(event)
-        end
-
-        response_color = case event.payload[:response].code
-        when 200..299 then GREEN
-        when 400..599 then RED
-        else               YELLOW
-        end
-        response_statement = color("[#{event.payload[:response].code}]", response_color, true)
-
-        "#{request_statement} #{response_statement} #{payload}"
+        UncachedRequestFormatter.call(self, event, odd?)
       end
 
       def cached_request(event)
-        duration          = event.duration
-        request_statement = "CACHE (#{duration}ms)"
-        if odd?
-          request_statement = color(request_statement, MAGENTA, true)
-          payload           = color(payload(event), nil, true)
-        else
-          request_statement = color(request_statement, CYAN, true)
-          payload           = payload(event)
-        end
-        "#{request_statement} #{payload}"
+        CachedRequestFormatter.call(self, event, odd?)
       end
 
       def payload(event)

data/lib/morpheus/client/railtie.rb

@@ -4,19 +4,19 @@ module Morpheus
 
       if defined?(ActiveRecord)
         ActiveRecord::Base.send(:include, Morpheus::Client::Associations)
-        ActiveRecord::Base.send(:include, Morpheus::UrlSupport)
+        ActiveRecord::Base.send(:include, Morpheus::Mixins::UrlSupport)
       end
 
-      initializer "morpheus.client.configure_request_cache" do |app|
+      initializer 'morpheus.client.configure_request_cache' do |app|
         app.middleware.use Morpheus::RequestQueue
         app.middleware.use Morpheus::RequestCache
       end
 
-      initializer "morpheus.configure_logger", :after => :initialize_logger do |app|
+      initializer 'morpheus.configure_logger', :after => :initialize_logger do |app|
         Morpheus::Configuration.logger = Rails.logger
       end
 
-      initializer "morpheus.client.log_subscriber", :after => "morpheus.configure_logger" do
+      initializer 'morpheus.client.log_subscriber', :after => 'morpheus.configure_logger' do
         Morpheus::Client::LogSubscriber.attach_to :morpheus
       end
 

data/lib/morpheus/client/request_formatter.rb

@@ -0,0 +1,50 @@
+module Morpheus
+  module Client
+    class RequestFormatter
+      MAGENTA = ActiveSupport::LogSubscriber::MAGENTA
+      CYAN    = ActiveSupport::LogSubscriber::CYAN
+      GREEN   = ActiveSupport::LogSubscriber::GREEN
+      RED     = ActiveSupport::LogSubscriber::RED
+      YELLOW  = ActiveSupport::LogSubscriber::YELLOW
+
+      attr_reader :subscriber, :event
+
+      def self.call(subscriber, event, odd)
+        new(subscriber, event, odd).call
+      end
+
+      def initialize(subscriber, event, odd)
+        @subscriber = subscriber
+        @event      = event
+        @odd        = odd
+      end
+
+      def odd?
+        @odd
+      end
+
+      def payload
+        if odd?
+          color(formatted_payload, nil, true)
+        else
+          formatted_payload
+        end
+      end
+
+      def color(*args)
+        subscriber.send(:color, *args)
+      end
+
+      def formatted_payload
+        payload  = "#{event.payload[:url]}"
+        payload << " #{event.payload[:params].inspect}" unless event.payload[:params].blank?
+        payload
+      end
+
+      def request_color
+        odd? ? MAGENTA : CYAN
+      end
+
+    end
+  end
+end

data/lib/morpheus/client/uncached_request_formatter.rb

@@ -0,0 +1,40 @@
+module Morpheus
+  module Client
+    class UncachedRequestFormatter < RequestFormatter
+
+      def call
+        "#{request_statement} #{response_statement} #{payload}"
+      end
+
+      def request_statement
+        klass     = event.payload[:class]
+        method    = event.payload[:method].to_s.upcase
+        statement = "#{klass} #{method} (#{duration})"
+        color(statement, request_color, true)
+      end
+
+      def response_statement
+        statement = "[#{response.code}]"
+        color(statement, response_color, true)
+      end
+
+      def response
+        event.payload[:response]
+      end
+
+      def duration
+        value = response.time * 1000
+        "#{value}ms"
+      end
+
+      def response_color
+        case response.code
+        when 200..299 then GREEN
+        when 400..599 then RED
+        else               YELLOW
+        end
+      end
+
+    end
+  end
+end

data/lib/morpheus/configuration.rb

@@ -2,33 +2,54 @@ module Morpheus
   module Configuration
     extend self
 
-    attr_accessor :username, :password
+    def attributes
+      @attributes ||= {}
+    end
+
+    def username=(username)
+      attributes[:username] = username
+    end
+
+    def username
+      attributes[:username]
+    end
+
+    def password=(password)
+      attributes[:password] = password
+    end
+
+    def password
+      attributes[:password]
+    end
 
     # Sets and gets the remote host service domain.
     # The domain must be set before any requests can be made.
-    attr_writer :host
+    def host=(host)
+      attributes[:host] = host
+    end
+
     def host
-      @host || raise(Morpheus::ConfigurationError,
+      attributes[:host] || raise(Morpheus::ConfigurationError,
         'The request HOST has not been set. Please set the host using Morpheus::Configuration.host = "http://www.example.com"')
     end
 
     # Links to the underlying libcurl request pool.
     # Allows for concurrent requests.
     def hydra
-      Typhoeus::Hydra.hydra
+      attributes[:hydra] ||= Typhoeus::Hydra.hydra
     end
 
     def hydra=(hydra)
-      Typhoeus::Hydra.hydra = hydra
+      attributes[:hydra] = Typhoeus::Hydra.hydra = hydra
     end
 
     # Handles the default logger that is used by the LogSubscriber
     def logger
-      @logger ||= ::Logger.new(STDOUT)
+      attributes[:logger] ||= ::Logger.new(STDOUT)
     end
 
     def logger=(logger)
-      @logger = logger
+      attributes[:logger] = logger
     end
 
     # Can be set or unset to allow for test suite mocking.
@@ -44,11 +65,11 @@ module Morpheus
     end
 
     def parse_error_handler
-      @parse_error_handler
+      attributes[:parse_error_handler]
     end
 
     def parse_error_handler=(handler)
-      @parse_error_handler = handler
+      attributes[:parse_error_handler] = handler
     end
 
   end

data/lib/morpheus/mixins.rb

@@ -0,0 +1,16 @@
+# Mixins provide behaviors to support the Base class.
+module Morpheus
+  module Mixins
+    autoload :Associations,    'morpheus/mixins/associations'
+    autoload :Attributes,      'morpheus/mixins/attributes'
+    autoload :Conversion,      'morpheus/mixins/conversion'
+    autoload :Filtering,       'morpheus/mixins/filtering'
+    autoload :Finders,         'morpheus/mixins/finders'
+    autoload :Introspection,   'morpheus/mixins/introspection'
+    autoload :Persistence,     'morpheus/mixins/persistence'
+    autoload :Reflections,     'morpheus/mixins/reflections'
+    autoload :RequestHandling, 'morpheus/mixins/request_handling'
+    autoload :ResponseParsing, 'morpheus/mixins/response_parsing'
+    autoload :UrlSupport,      'morpheus/mixins/url_support'
+  end
+end

data/lib/morpheus/mixins/associations.rb

@@ -1,57 +1,59 @@
 module Morpheus
-  module Associations
-    autoload :Association,          'morpheus/associations/association'
-    autoload :BelongsToAssociation, 'morpheus/associations/belongs_to_association'
-    autoload :HasManyAssociation,   'morpheus/associations/has_many_association'
-    autoload :HasOneAssociation,    'morpheus/associations/has_one_association'
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+  module Mixins
+    module Associations
+      autoload :Association,          'morpheus/mixins/associations/association'
+      autoload :BelongsToAssociation, 'morpheus/mixins/associations/belongs_to_association'
+      autoload :HasManyAssociation,   'morpheus/mixins/associations/has_many_association'
+      autoload :HasOneAssociation,    'morpheus/mixins/associations/has_one_association'
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def belongs_to(association, options = {})
-        attribute_id_sym  = "#{association}_id".to_sym
+        def belongs_to(association, options = {})
+          attribute_id_sym  = "#{association}_id".to_sym
 
-        property attribute_id_sym
+          property attribute_id_sym
 
-        create_reflection(:belongs_to, association, options)
+          create_reflection(:belongs_to, association, options)
 
-        define_method association do
-          instance_variable_get("@#{association}") ||
-            instance_variable_set("@#{association}", BelongsToAssociation.new(self, association, :options => options))
-        end
+          define_method association do
+            instance_variable_get("@#{association}") ||
+              instance_variable_set("@#{association}", BelongsToAssociation.new(self, association, :options => options))
+          end
 
-        define_method "#{association}=" do |target|
-          instance_variable_set("@#{association}", BelongsToAssociation.new(self, association, :target => target, :options => options))
-          send("#{association}_id=", target.id)
+          define_method "#{association}=" do |target|
+            instance_variable_set("@#{association}", BelongsToAssociation.new(self, association, :target => target, :options => options))
+            send("#{association}_id=", target.id)
+          end
         end
-      end
 
-      def has_many(association, options = {})
-        create_reflection(:has_many, association, options)
+        def has_many(association, options = {})
+          create_reflection(:has_many, association, options)
 
-        define_method association do
-          instance_variable_get("@#{association}") ||
-            instance_variable_set("@#{association}", HasManyAssociation.new(self, association, :options => options))
+          define_method association do
+            instance_variable_get("@#{association}") ||
+              instance_variable_set("@#{association}", HasManyAssociation.new(self, association, :options => options))
+          end
         end
-      end
 
-      def has_one(association, options = {})
-        create_reflection(:has_one, association, options)
+        def has_one(association, options = {})
+          create_reflection(:has_one, association, options)
 
-        define_method association do
-          instance_variable_get("@#{association}") ||
-            instance_variable_set("@#{association}", HasOneAssociation.new(self, association, :options => options))
-        end
+          define_method association do
+            instance_variable_get("@#{association}") ||
+              instance_variable_set("@#{association}", HasOneAssociation.new(self, association, :options => options))
+          end
 
-        define_method "#{association}=" do |target|
-          instance_variable_set("@#{association}", HasOneAssociation.new(self, association, :target => target, :options => options))
+          define_method "#{association}=" do |target|
+            instance_variable_set("@#{association}", HasOneAssociation.new(self, association, :target => target, :options => options))
+          end
         end
+
       end
 
     end
-
   end
 end