morpheus 0.3.7 → 0.3.8

data/.gitignore

@@ -2,6 +2,9 @@
 *.gem
 *.rbc
 .bundle
+.rvmrc
+.rbenv-version
+.rbenv-gemsets
 .config
 .yardoc
 Gemfile.lock

data/lib/morpheus/client/associations.rb

@@ -1,7 +1,10 @@
 module Morpheus
   module Client
     module Associations
-      extend ActiveSupport::Concern
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
       module ClassMethods
 

data/lib/morpheus/mixins/conversion.rb

@@ -13,5 +13,10 @@ module Morpheus
       attributes.keys if persisted?
     end
 
+    def to_partial_path
+      underscored_model_name = self.class.model_name.underscore
+      "#{underscored_model_name.pluralize}/#{underscored_model_name}"
+    end
+
   end
 end

data/lib/morpheus/response_parser.rb

@@ -9,67 +9,55 @@ module Morpheus
     end
 
     def self.parse(owner, request, metadata)
-      parser = new(owner, request, metadata)
-      ActiveSupport::Notifications.instrument('request.morpheus',
-        :url      => request.url,
-        :params   => request.params,
-        :method   => request.method,
-        :class    => owner,
-        :response => request.response
-      ) do
-        @parsed_response = parser.parse
-      end
-      RequestCache.cache.clear unless request.method == :get
-      @parsed_response
+      new(owner, request, metadata).parse
     end
 
     def parse
-      case @response.code
-      when 200..299
-        build_from_response
-      when 404
-        raise_not_found
-      when 422
-        build_from_response
-      when 500..599
-        raise ServerError
-      when 0
-        raise RemoteHostConnectionFailure
-      else
-        raise InvalidResponseCode, "Response had error code: #{@response.code}"
+      clear_cache!
+      with_active_support_notifications do
+        case @response.code
+        when 200..299, 422
+          build_from_response
+        when 404
+          raise_not_found
+        when 500..599
+          raise ServerError
+        when 0
+          raise RemoteHostConnectionFailure
+        else
+          raise InvalidResponseCode, "Response had error code: #{@response.code}"
+        end
       end
     end
 
     private
 
-    def content
-      @content ||= Yajl::Parser.parse(@response.body).try(:[], 'content')
+    def with_active_support_notifications
+      ActiveSupport::Notifications.instrument('request.morpheus',
+        :url      => @request.url,
+        :params   => @request.params,
+        :method   => @request.method,
+        :class    => @owner,
+        :response => @request.response
+      ) { yield }
     end
 
-    def response_errors
-      @response_errors ||= Yajl::Parser.parse(@response.body).try(:[], 'errors')
+    def clear_cache!
+      RequestCache.cache.clear unless @request.method == :get
     end
 
     def build_from_response
       if content
         if Array === content
           content.collect do |attributes|
-            obj = build_object_with_attributes(attributes)
+            build_object_with_attributes(attributes)
           end
         else
-          obj = build_object_with_attributes(content)
+          build_object_with_attributes(content)
         end
       end
     end
 
-    def build_object_with_attributes(attributes)
-      if attributes.keys.include?('type')
-        attributes['type'].constantize.new(attributes)
-      else
-        @requesting_class.new.send(:merge_attributes, attributes)
-      end
-    end
-
     def raise_not_found
       case
       when @metadata[:ids]
@@ -81,5 +69,25 @@ module Morpheus
       end
     end
 
+    def parsed_body
+      @parsed_body ||= Yajl::Parser.parse(@response.body)
+    end
+
+    def content
+      @content ||= parsed_body.try(:[], 'content')
+    end
+
+    def response_errors
+      @response_errors ||= parsed_body.try(:[], 'errors')
+    end
+
+    def build_object_with_attributes(attributes)
+      if attributes.keys.include?('type')
+        attributes['type'].constantize.new(attributes)
+      else
+        @requesting_class.new.send(:merge_attributes, attributes)
+      end
+    end
+
   end
 end

data/lib/morpheus/version.rb

@@ -1,3 +1,3 @@
 module Morpheus
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/morpheus.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/morpheus/version', __FILE__)
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'morpheus/version'
 
 Gem::Specification.new do |gem|
   gem.authors       = ['Ryan Moran']
@@ -17,13 +18,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'yajl-ruby',     '~> 0.8.2'
   gem.add_dependency 'typhoeus',      '~> 0.2.4'
-  gem.add_dependency 'activemodel',   '> 3.0.0'
-  gem.add_dependency 'activesupport', '> 3.0.0'
-  gem.add_dependency 'i18n',          '> 0.5.0'
+  gem.add_dependency 'activemodel',   '>= 3.0.0'
+  gem.add_dependency 'activesupport', '>= 3.0.0'
+  gem.add_dependency 'i18n',          '>= 0.5.0'
 
-  gem.add_development_dependency 'rails',               '> 3.0.0'
+  gem.add_development_dependency 'rails',               '>= 3.0.0'
   gem.add_development_dependency 'sqlite3',             '~> 1.3.3'
-  gem.add_development_dependency 'rspec-rails',         '~> 2.7.0'
+  gem.add_development_dependency 'rspec-rails',         '~> 2.8.1'
   gem.add_development_dependency 'rcov',                '~> 0.9.11'
-  gem.add_development_dependency 'autotest-standalone', '~> 4.5.8'
+  gem.add_development_dependency 'autotest-standalone', '~> 4.5.9'
 end

data/spec/morpheus/mixins/conversion_spec.rb

@@ -63,4 +63,14 @@ describe Morpheus::Conversion do
     end
   end
 
+  describe '#to_partial_path' do
+    before(:each) do
+      @dog = Dog.new
+    end
+
+    it 'returns a string representing the path to a partial for this model' do
+      @dog.to_partial_path.should eql('dogs/dog')
+    end
+  end
+
 end

data/spec/morpheus/response_parser_spec.rb

@@ -1,17 +1,235 @@
 require 'spec_helper'
 
 describe Morpheus::ResponseParser do
-
-  describe '#initialize' do
-    pending
-  end
+  let(:owner)           { Dog }
+  let(:response)        { mock(:body => '{ "content": { "foo": "bar" }, "errors": [{ "foo": "cannot be \"bar\"" }] }') }
+  let(:request)         { req = mock(:response => response, :url => '/dog/1', :params => { :id => 1 }); req.stub(:method).and_return(:get); req }
+  let(:metadata)        { {} }
+  let(:parsed_response) { mock }
+  let(:parser)          { Morpheus::ResponseParser.new(owner, request, metadata) }
 
   describe '.parse' do
-    pending
+    before do
+      parser
+      Morpheus::ResponseParser.stub(:new).and_return(parser)
+      parser.stub(:parse).and_return(parsed_response)
+    end
+
+    it 'creates a new ResponseParser' do
+      Morpheus::ResponseParser.should_receive(:new).with(owner, request, metadata).and_return(parser)
+      Morpheus::ResponseParser.parse(owner, request, metadata)
+    end
+
+    it 'delegates parsing to the new ResponseParser' do
+      parser.should_receive(:parse)
+      Morpheus::ResponseParser.parse(owner, request, metadata)
+    end
+
+    it 'returns the parsed response' do
+      response = Morpheus::ResponseParser.parse(owner, request, metadata)
+      response.should eql(parsed_response)
+    end
   end
 
   describe '#parse' do
-    pending
+    before do
+      parser.stub(:clear_cache!)
+    end
+
+    it 'clears the cache' do
+      parser.stub(:with_active_support_notifications)
+      parser.should_receive(:clear_cache!)
+      parser.parse
+    end
+
+    context 'when the response code is 200..299' do
+      before do
+        response.stub(:code).and_return(200)
+      end
+
+      it 'delegates to #build_from_response' do
+        parser.should_receive(:build_from_response)
+        parser.parse
+      end
+    end
+
+    context 'when the repsonse code is 404' do
+      before do
+        response.stub(:code).and_return(404)
+      end
+
+      it 'delegates to #raise_not_found' do
+        parser.should_receive(:raise_not_found)
+        parser.parse
+      end
+    end
+
+    context 'when the response code is 422' do
+      before do
+        response.stub(:code).and_return(422)
+      end
+
+      it 'delegates to #build_from_response' do
+        parser.should_receive(:build_from_response)
+        parser.parse
+      end
+    end
+
+    context 'when the response code is 500..599' do
+      before do
+        response.stub(:code).and_return(500)
+      end
+
+      it 'raises a ServerError exception' do
+        lambda { parser.parse }.should raise_error(Morpheus::ServerError)
+      end
+    end
+
+    context 'when the response code is 0' do
+      before do
+        response.stub(:code).and_return(0)
+      end
+
+      it 'raises a RemoteHostConnectionFailure exception' do
+        lambda { parser.parse }.should raise_error(Morpheus::RemoteHostConnectionFailure)
+      end
+    end
+
+    context 'when the response code is not one of the above' do
+      before do
+        response.stub(:code).and_return(701)
+      end
+
+      it 'raises an InvalidResponseCode exception' do
+        lambda { parser.parse }.should raise_error(Morpheus::InvalidResponseCode, 'Response had error code: 701')
+      end
+    end
+  end
+
+  describe '#clear_cache!' do
+    context 'when the request method is not GET' do
+      before do
+        request.stub(:method).and_return(:put)
+      end
+
+      it 'clears the RequestCache cache' do
+        Morpheus::RequestCache.cache.should_receive(:clear)
+        parser.send(:clear_cache!)
+      end
+    end
+
+    context 'when the request method is GET' do
+      before do
+        request.stub(:method).and_return(:get)
+      end
+
+      it 'does not clear the RequestCache cache' do
+        Morpheus::RequestCache.cache.should_not_receive(:clear)
+        parser.stub(:clear_cache!)
+      end
+    end
+  end
+
+  describe '#build_from_response' do
+    context 'when there is content' do
+      context 'when the content is an Array' do
+        let(:content) { [{ 'foo' => 'bar' }, { 'baz' => 'qux' }] }
+
+        before do
+          parser.stub(:content).and_return(content)
+        end
+
+        it 'delegates to #build_object_with_attributes for each element, collecting the results' do
+          parser.should_receive(:build_object_with_attributes).exactly(2).times
+          parser.send(:build_from_response)
+        end
+      end
+
+      context 'when the content is not an Array' do
+        let(:content) { { 'foo' => 'bar' } }
+
+        it 'delegates to #build_object_with_attributes' do
+          parser.should_receive(:build_object_with_attributes).with(content)
+          parser.send(:build_from_response)
+        end
+      end
+    end
+
+    context 'when there is no content' do
+      before do
+        parser.stub(:content).and_return(nil)
+      end
+
+      it 'returns nil' do
+        parser.send(:build_from_response).should be_nil
+      end
+    end
+  end
+
+  describe '#raise_not_found' do
+    context 'when the metadata hash contains :ids' do
+      let(:metadata) { { :ids => [1,2,3] } }
+
+      it 'raises a ResourceNotFound exception with the appropriate message' do
+        lambda { parser.send(:raise_not_found) }.should raise_error(Morpheus::ResourceNotFound, "Couldn't find all Dogs with IDs (1, 2, 3)")
+      end
+    end
+
+    context 'when the metadata hash contains :id' do
+      let(:metadata) { { :id => 1 } }
+
+      it 'raises a ResourceNotFound exception with the appropriate message' do
+        lambda { parser.send(:raise_not_found) }.should raise_error(Morpheus::ResourceNotFound, "Couldn't find Dog with ID=1")
+      end
+    end
+
+    context 'when the metadata hash does not contain either :ids or :id' do
+      it 'raises a ResourceNotFound exception with the appropriate message' do
+        lambda { parser.send(:raise_not_found) }.should raise_error(Morpheus::ResourceNotFound, /No resource was found at/)
+      end
+    end
+  end
+
+  describe '#parsed_body' do
+    it 'parses out the entire response body JSON' do
+      parser.send(:parsed_body).should eql({
+        'content' => { 'foo' => 'bar' },
+        'errors'  => [{ 'foo' => 'cannot be "bar"' }]
+      })
+    end
+  end
+
+  describe '#content' do
+    it 'parses out the "content" attribute from the response body JSON' do
+      parser.send(:content).should eql({ 'foo' => 'bar' })
+    end
+  end
+
+  describe '#response_errors' do
+    it 'parses out the "errors" attribute from the response body JSON' do
+      parser.send(:response_errors).should eql([{ 'foo' => 'cannot be "bar"' }])
+    end
+  end
+
+  describe '#build_object_with_attributes' do
+    context 'when the attributes has a "type" key' do
+      let(:attributes) { { 'type' => 'Author', 'name' => 'Chuck Palahniuk' } }
+
+      it 'creates a new instance of the "type" with the attributes' do
+        Author.should_receive(:new).with(attributes)
+        parser.send(:build_object_with_attributes, attributes)
+      end
+    end
+
+    context 'when the attributes does not have a "type" key' do
+      let(:instance)   { mock }
+      let(:attributes) { { 'name' => 'Fido' } }
+      it 'merges attributes into a new object of the owner class' do
+        Dog.should_receive(:new).and_return(instance)
+        instance.should_receive(:merge_attributes).with(attributes)
+        parser.send(:build_object_with_attributes, attributes)
+      end
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: morpheus
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Ryan Moran
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-02-09 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -55,7 +56,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -71,7 +72,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -87,7 +88,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 11
         segments: 
@@ -103,7 +104,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -137,12 +138,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 45
         segments: 
         - 2
-        - 7
-        - 0
-        version: 2.7.0
+        - 8
+        - 1
+        version: 2.8.1
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -169,12 +170,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 57
         segments: 
         - 4
         - 5
-        - 8
-        version: 4.5.8
+        - 9
+        version: 4.5.9
   type: :development
   version_requirements: *id010
 description: RESTful API Client
@@ -190,7 +191,6 @@ files:
 - .autotest
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -302,6 +302,7 @@ files:
 - spec/shared/active_model_lint_test.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -331,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: RESTful API Client

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ree-1.8.7-2010.02@morpheus