morpheus 0.4.0 → 0.5.0

data/lib/morpheus/reflection.rb

@@ -1,13 +1,16 @@
 module Morpheus
   class Reflection
-    attr_reader :macro, :name, :options, :class_name, :klass
+    attr_reader :macro, :name, :options, :class_name
 
     def initialize(macro, name, options = {})
       @macro      = macro
       @name       = name
       @options    = options
       @class_name = (@options[:class_name] || @name).to_s.singularize.camelize
-      @klass      = @class_name.constantize
+    end
+
+    def klass
+      @klass ||= @class_name.constantize
     end
 
     def build_association(*options)

data/lib/morpheus/type_caster.rb

@@ -70,7 +70,7 @@ module Morpheus
     end
 
     def parse_boolean(value)
-      !["nil", nil, "false", false, "0", 0].include?(value)
+      !['nil', nil, 'false', false, '0', 0].include?(value)
     end
 
   end

data/lib/morpheus/version.rb

@@ -1,3 +1,3 @@
 module Morpheus
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/morpheus.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['ryan.moran@revolutionprep.com']
   gem.description   = %q{RESTful API Client}
   gem.summary       = %q{RESTful API Client}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/ryanmoran/morpheus"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.version       = Morpheus::VERSION
 
   gem.add_dependency 'yajl-ruby',     '~> 1.1.0'
-  gem.add_dependency 'typhoeus',      '~> 0.3.3'
+  gem.add_dependency 'typhoeus',      '~> 0.4.2'
   gem.add_dependency 'activemodel',   '>= 3.0.0'
   gem.add_dependency 'activesupport', '>= 3.0.0'
   gem.add_dependency 'i18n',          '>= 0.5.0'

data/spec/dummy/app/resources/book.rb

@@ -1,4 +1,4 @@
 class Book < Morpheus::Base
-  property :title
+  property :title, :string
   belongs_to :author
 end

data/spec/morpheus/base_spec.rb

@@ -7,69 +7,69 @@ describe Morpheus::Base do
     it_behaves_like 'ActiveModel'
   end
 
-  describe 'implements Morpheus::Associations' do
-    it 'includes the Morpheus::Associations module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Associations)
+  describe 'implements Morpheus::Mixins::Associations' do
+    it 'includes the Morpheus::Mixins::Associations module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Associations)
     end
   end
 
-  describe 'implements Morpheus::Attributes' do
-    it 'includes the Morpheus::Attributes module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Attributes)
+  describe 'implements Morpheus::Mixins::Attributes' do
+    it 'includes the Morpheus::Mixins::Attributes module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Attributes)
     end
   end
 
-  describe 'implements Morpheus::Conversion' do
-    it 'includes the Morpheus::Conversion module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Conversion)
+  describe 'implements Morpheus::Mixins::Conversion' do
+    it 'includes the Morpheus::Mixins::Conversion module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Conversion)
     end
   end
 
-  describe 'implements Morpheus::Filtering' do
-    it 'includes the Morpheus::Filtering module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Filtering)
+  describe 'implements Morpheus::Mixins::Filtering' do
+    it 'includes the Morpheus::Mixins::Filtering module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Filtering)
     end
   end
 
-  describe 'implements Morpheus::Finders' do
-    it 'includes the Morpheus::Finders module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Finders)
+  describe 'implements Morpheus::Mixins::Finders' do
+    it 'includes the Morpheus::Mixins::Finders module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Finders)
     end
   end
 
-  describe 'implements Morpheus::Introspection' do
-    it 'includes the Morpheus::Introspection module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Introspection)
+  describe 'implements Morpheus::Mixins::Introspection' do
+    it 'includes the Morpheus::Mixins::Introspection module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Introspection)
     end
   end
 
-  describe 'implements Morpheus::Persistence' do
-    it 'includes the Morpheus::Persistence module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Persistence)
+  describe 'implements Morpheus::Mixins::Persistence' do
+    it 'includes the Morpheus::Mixins::Persistence module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Persistence)
     end
   end
 
-  describe 'implements Morpheus::Reflections' do
-    it 'includes the Morpheus::Reflections module' do
-      Morpheus::Base.included_modules.should include(Morpheus::Reflections)
+  describe 'implements Morpheus::Mixins::Reflections' do
+    it 'includes the Morpheus::Mixins::Reflections module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::Reflections)
     end
   end
 
-  describe 'implements Morpheus::RequestHandling' do
-    it 'includes the Morpheus::RequestHandling module' do
-      Morpheus::Base.included_modules.should include(Morpheus::RequestHandling)
+  describe 'implements Morpheus::Mixins::RequestHandling' do
+    it 'includes the Morpheus::Mixins::RequestHandling module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::RequestHandling)
     end
   end
 
-  describe 'implements Morpheus::ResponseParsing' do
-    it 'includes the Morpheus::ResponseParsing module' do
-      Morpheus::Base.included_modules.should include(Morpheus::ResponseParsing)
+  describe 'implements Morpheus::Mixins::ResponseParsing' do
+    it 'includes the Morpheus::Mixins::ResponseParsing module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::ResponseParsing)
     end
   end
 
-  describe 'implements Morpheus::UrlSupport' do
-    it 'includes the Morpheus::UrlSupport module' do
-      Morpheus::Base.included_modules.should include(Morpheus::UrlSupport)
+  describe 'implements Morpheus::Mixins::UrlSupport' do
+    it 'includes the Morpheus::Mixins::UrlSupport module' do
+      Morpheus::Base.included_modules.should include(Morpheus::Mixins::UrlSupport)
     end
   end
 
@@ -113,7 +113,7 @@ context 'when an attributes hash is supplied' do
     end
   end
 
-  describe Morpheus::Base, '#==' do
+  describe '#==' do
     let(:attributes) { { :id => 1, :name => 'Fido' } }
 
     context 'when comparing objects that are actually referencing the same memory' do
@@ -154,7 +154,7 @@ context 'when an attributes hash is supplied' do
     end
   end
 
-  describe Morpheus::Base, '.base_class' do
+  describe '.base_class' do
     it 'returns the current class' do
       Dog.base_class.should eql(Dog)
     end

data/spec/morpheus/client/cached_request_formatter_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Morpheus::Client::CachedRequestFormatter do
+  describe '.call' do
+    let(:subscriber) { ActiveSupport::LogSubscriber.new }
+    let(:event)    { mock(:duration => 0.12, :payload => payload) }
+    let(:response) { mock }
+    let(:payload) do
+      {
+        :response => response,
+        :class    => Dog,
+        :method   => :get,
+        :url      => '/dogs',
+        :params   => { :name   => 'Fido' }
+      }
+    end
+
+    it 'returns a formmated string representing the uncached request' do
+      expected = "\e[1m\e[35mCACHE (0.12ms)\e[0m \e[1m/dogs {:name=>\"Fido\"}\e[0m"
+      Morpheus::Client::CachedRequestFormatter.call(subscriber, event, true).should eql(expected)
+    end
+
+    it 'returns a formmated string representing the uncached request' do
+      expected = "\e[1m\e[36mCACHE (0.12ms)\e[0m /dogs {:name=>\"Fido\"}"
+      Morpheus::Client::CachedRequestFormatter.call(subscriber, event, false).should eql(expected)
+    end
+  end
+end

data/spec/morpheus/client/log_subscriber_spec.rb

@@ -1,33 +1,76 @@
 require 'spec_helper'
 
 describe Morpheus::Client::LogSubscriber do
-
-  describe '#initialize' do
-    pending
-  end
+  let(:subscriber) { Morpheus::Client::LogSubscriber.new }
+  let(:event)          { mock(:payload => payload) }
+  let(:payload)        { mock }
 
   describe '#request' do
-    pending
+    let(:payload) { { :response => response } }
+
+    context 'when the event payload contains a cached response' do
+      let(:response) { mock(:cached? => true) }
+
+      it 'calls #cached_request with the event' do
+        subscriber.should_receive(:cached_request).with(event)
+        subscriber.request(event)
+      end
+    end
+
+    context 'when the event payload contains an uncached response' do
+      let(:response) { mock(:cached? => false) }
+
+      it 'calls #uncached_request with the event' do
+        subscriber.should_receive(:uncached_request).with(event)
+        subscriber.request(event)
+      end
+    end
   end
 
   describe '#uncached_request' do
-    pending
+    it 'delegates to UncachedRequestFormatter' do
+      Morpheus::Client::UncachedRequestFormatter.should_receive(:call).with(subscriber, event, true)
+      subscriber.uncached_request(event)
+    end
   end
 
   describe '#cached_request' do
-    pending
+    it 'delegates to CachedRequestFormatter' do
+      Morpheus::Client::CachedRequestFormatter.should_receive(:call).with(subscriber, event, true)
+      subscriber.cached_request(event)
+    end
   end
 
   describe '#payload' do
-    pending
+    context 'when the payload contains :url and :params' do
+      let(:payload) { { :url => '/dogs', :params => { :name  => 'fido' } } }
+
+      it 'returns a formatted string with the event :url and :params' do
+        subscriber.payload(event).should eql('/dogs {:name=>"fido"}')
+      end
+    end
+
+    context 'when the payload has no params' do
+      let(:payload) { { :url => '/dogs', :params => {} } }
+
+      it 'returns a formatted string with the event :url' do
+        subscriber.payload(event).should eql('/dogs')
+      end
+    end
   end
 
   describe '#logger' do
-    pending
+    it 'returns the Configuration logger' do
+      subscriber.logger.should eql(Morpheus::Configuration.logger)
+    end
   end
 
   describe '#odd?' do
-    pending
+    it 'returns an oscillating true/false value every time is is queried' do
+      subscriber.should be_odd
+      subscriber.should_not be_odd
+      subscriber.should be_odd
+    end
   end
 
 end

data/spec/morpheus/client/request_formatter_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Morpheus::Client::RequestFormatter do
+  pending
+end

data/spec/morpheus/client/uncached_request_formatter_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Morpheus::Client::UncachedRequestFormatter do
+  let(:subscriber) { Morpheus::Client::LogSubscriber.new }
+  let(:event) { mock(:payload => payload) }
+
+  describe '.call' do
+    let(:payload) do
+      {
+        :response => response,
+        :class    => Dog,
+        :method   => :get,
+        :url      => '/dogs',
+        :params   => { :name   => 'Fido' }
+      }
+    end
+    let(:response) { mock(:time => 3.024, :code => 200) }
+
+    it 'returns a formmated string representing the uncached request' do
+      expected = "\e[1m\e[35mDog GET (3024.0ms)\e[0m \e[1m\e[32m[200]\e[0m \e[1m/dogs {:name=>\"Fido\"}\e[0m"
+      Morpheus::Client::UncachedRequestFormatter.call(subscriber, event, true).should eql(expected)
+    end
+
+    it 'returns a formmated string representing the uncached request' do
+      expected = "\e[1m\e[36mDog GET (3024.0ms)\e[0m \e[1m\e[32m[200]\e[0m /dogs {:name=>\"Fido\"}"
+      Morpheus::Client::UncachedRequestFormatter.call(subscriber, event, false).should eql(expected)
+    end
+  end
+end

data/spec/morpheus/configuration_spec.rb

@@ -2,11 +2,31 @@ require 'spec_helper'
 
 describe Morpheus::Configuration do
 
+  describe '.username' do
+    before { @original_username = Morpheus::Configuration.username }
+    after  { Morpheus::Configuration.username = @original_username }
+    it 'allows the username to be set and retrieved' do
+      Morpheus::Configuration.username = 'test'
+      Morpheus::Configuration.username.should eql('test')
+    end
+  end
+
+  describe '.password' do
+    before { @original_password = Morpheus::Configuration.password }
+    after  { Morpheus::Configuration.password = @original_password }
+    it 'allows the password to be set and retrieved' do
+      Morpheus::Configuration.password = 'test'
+      Morpheus::Configuration.password.should eql('test')
+    end
+  end
+
   describe '.host' do
     context 'when host has not been set' do
-      before(:each) do
+      before do
+        @original_host = Morpheus::Configuration.host
         Morpheus::Configuration.host = nil
       end
+      after  { Morpheus::Configuration.host = @original_host }
 
       it 'raises a ConfigurationError' do
         lambda {
@@ -17,9 +37,11 @@ describe Morpheus::Configuration do
     end
 
     context 'when host has been set' do
-      before(:each) do
+      before do
+        @original_host = Morpheus::Configuration.host
         Morpheus::Configuration.host = 'http://localhost:3000'
       end
+      after  { Morpheus::Configuration.host = @original_host }
 
       it 'returns the host url string' do
         Morpheus::Configuration.host.should eql('http://localhost:3000')
@@ -29,9 +51,11 @@ describe Morpheus::Configuration do
 
   describe '.hydra' do
     context 'when hydra has not been set' do
-      before(:each) do
+      before do
+        @original_hydra = Morpheus::Configuration.hydra
         Morpheus::Configuration.hydra = nil
       end
+      after { Morpheus::Configuration.hydra = @original_hydra }
 
       it 'returns the shared Hydra instance from Typhoeus' do
         Morpheus::Configuration.hydra.should eql(Typhoeus::Hydra.hydra)
@@ -39,10 +63,12 @@ describe Morpheus::Configuration do
     end
 
     context 'when hydra has been set' do
-      before(:each) do
+      before do
         @hydra = Typhoeus::Hydra.new
+        @original_hydra = Morpheus::Configuration.hydra
         Morpheus::Configuration.hydra = @hydra
       end
+      after { Morpheus::Configuration.hydra = @original_hydra }
 
       it 'returns the specified Typhoeus Hydra instance' do
         Morpheus::Configuration.hydra.should eql(@hydra)
@@ -51,11 +77,11 @@ describe Morpheus::Configuration do
   end
 
   describe '.logger' do
-    before(:all) do
+    before do
       @original_logger = Morpheus::Configuration.logger
     end
 
-    after(:all) do
+    after do
       Morpheus::Configuration.logger = @original_logger
     end
 
@@ -70,10 +96,12 @@ describe Morpheus::Configuration do
     end
 
     context 'when logger has been set' do
-      before(:each) do
+      before do
         @logger = Logger.new(STDOUT)
+        @original_logger = Morpheus::Configuration.logger
         Morpheus::Configuration.logger = @logger
       end
+      after { Morpheus::Configuration.logger = @original_logger }
 
       it 'returns the specified Logger instance' do
         Morpheus::Configuration.logger.should eql(@logger)
@@ -82,6 +110,9 @@ describe Morpheus::Configuration do
   end
 
   describe '.allow_net_connect' do
+    before { @original_allow_net_connect = Morpheus::Configuration.allow_net_connect? }
+    after { Morpheus::Configuration.allow_net_connect = @original_allow_net_connect }
+
     it 'disables all net connections through Typhoeus' do
       Morpheus::Configuration.allow_net_connect = false
       lambda {
@@ -92,9 +123,11 @@ describe Morpheus::Configuration do
 
   describe '.allow_net_connect?' do
     context 'when net connect is allowed' do
-      before(:each) do
+      before do
+        @original_allow_net_connect = Morpheus::Configuration.allow_net_connect?
         Morpheus::Configuration.allow_net_connect = true
       end
+      after { Morpheus::Configuration.allow_net_connect = @original_allow_net_connect }
 
       it 'returns true' do
         Morpheus::Configuration.should be_allow_net_connect
@@ -102,9 +135,11 @@ describe Morpheus::Configuration do
     end
 
     context 'when net connect is not allowed' do
-      before(:each) do
+      before do
+        @original_allow_net_connect = Morpheus::Configuration.allow_net_connect?
         Morpheus::Configuration.allow_net_connect = false
       end
+      after { Morpheus::Configuration.allow_net_connect = @original_allow_net_connect }
 
       it 'returns true' do
         Morpheus::Configuration.should_not be_allow_net_connect
@@ -115,8 +150,11 @@ describe Morpheus::Configuration do
   describe '#parse_error_handler' do
     let(:handler) { mock }
 
-    before { Morpheus::Configuration.parse_error_handler = handler }
-    after  { Morpheus::Configuration.parse_error_handler = nil }
+    before do
+      @original_parse_error_handler = Morpheus::Configuration.parse_error_handler
+      Morpheus::Configuration.parse_error_handler = handler
+    end
+    after  { Morpheus::Configuration.parse_error_handler = @original_parse_error_handler }
 
     it 'allows a Yajl::ParseError handler class to be set' do
       Morpheus::Configuration.parse_error_handler.should eql(handler)