morpheus 0.4.0 → 0.5.0

data/spec/morpheus/{associations → mixins/associations}/association_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Associations::Association do
+describe Morpheus::Mixins::Associations::Association do
 
   describe '#initialize' do
     pending

data/spec/morpheus/{associations → mixins/associations}/belongs_to_association_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Associations::BelongsToAssociation do
+describe Morpheus::Mixins::Associations::BelongsToAssociation do
 
   describe '#initialize' do
     pending

data/spec/morpheus/{associations → mixins/associations}/has_many_association_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Associations::HasManyAssociation do
+describe Morpheus::Mixins::Associations::HasManyAssociation do
 
   describe '#initialize' do
     pending

data/spec/morpheus/{associations → mixins/associations}/has_one_association_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Associations::HasOneAssociation do
+describe Morpheus::Mixins::Associations::HasOneAssociation do
 
   describe '#initialize' do
     pending

data/spec/morpheus/mixins/associations_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Associations do
+describe Morpheus::Mixins::Associations do
 
   describe '.belongs_to' do
 

data/spec/morpheus/mixins/attributes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Attributes do
+describe Morpheus::Mixins::Attributes do
   let(:book) { Book.new }
 
   describe '.property' do
@@ -23,11 +23,23 @@ describe Morpheus::Attributes do
   end
 
   describe '.typecast_attributes' do
-    pending
+    it 'returns the attributes that will be typecasted' do
+      Book.typecast_attributes.should eql(HashWithIndifferentAccess.new({ :id => nil, :title => :string, :author_id => nil }))
+    end
   end
 
   describe '.attribute_defined?' do
-    pending
+    context 'when the attribute exists as one of the default attributes' do
+      it 'returns true' do
+        Book.attribute_defined?(:title).should be_true
+      end
+    end
+
+    context 'when the attribute does not exist as one of teh default attributes' do
+      it 'returns false' do
+        Book.attribute_defined?(:publisher).should be_false
+      end
+    end
   end
 
   describe '#attributes' do
@@ -37,15 +49,24 @@ describe Morpheus::Attributes do
   end
 
   describe '#read_attribute_for_validation' do
-    pending
+    before { book.title = 'Horton Hears a Who' }
+
+    it 'returns the value of the attribute' do
+      book.read_attribute_for_validation(:title).should eql('Horton Hears a Who')
+    end
   end
 
   describe '#typecast' do
-    pending
+    it 'delegates to TypeCaster' do
+      Morpheus::TypeCaster.should_receive(:cast).with('Horton Hears a Who', :string)
+      book.typecast(:title, 'Horton Hears a Who')
+    end
   end
 
   describe '#attributes_without_basic_attributes' do
-    pending
+    it 'returns a hash with basic attributes and associations removed' do
+      book.attributes_without_basic_attributes.should eql(HashWithIndifferentAccess.new(:title => nil, :author_id => nil))
+    end
   end
 
   describe "#update_attribute" do

data/spec/morpheus/mixins/conversion_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Conversion do
+describe Morpheus::Mixins::Conversion do
 
   describe '#to_model' do
     before(:each) do

data/spec/morpheus/mixins/filtering_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Morpheus::Filtering do
+describe Morpheus::Mixins::Filtering do
   let(:klass) do
     Class.new do
-      include Morpheus::Filtering
+      include Morpheus::Mixins::Filtering
     end
   end
   let(:name) { mock }

data/spec/morpheus/mixins/finders_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Finders do
+describe Morpheus::Mixins::Finders do
 
   describe '.find' do
     context 'when the argument is a single integer' do

data/spec/morpheus/mixins/introspection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Introspection do
+describe Morpheus::Mixins::Introspection do
 
   describe '#persisted?' do
     before(:each) do

data/spec/morpheus/mixins/persistence_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Persistence do
+describe Morpheus::Mixins::Persistence do
 
   describe '#save' do
     context 'when the instance is a new record' do

data/spec/morpheus/mixins/reflections_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::Reflections do
+describe Morpheus::Mixins::Reflections do
 
   context 'when the resource has a belongs_to association' do
     before(:each) do

data/spec/morpheus/mixins/request_handling_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Morpheus::RequestHandling do
+describe Morpheus::Mixins::RequestHandling do
   let(:path)     { mock }
   let(:params)   { mock }
   let(:metadata) { mock }
@@ -8,7 +8,7 @@ describe Morpheus::RequestHandling do
   let(:block)    { lambda {} }
   let(:klass) do
     Class.new do
-      include Morpheus::RequestHandling
+      include Morpheus::Mixins::RequestHandling
     end
   end
 

data/spec/morpheus/mixins/response_parsing_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Morpheus::ResponseParsing do
+describe Morpheus::Mixins::ResponseParsing do
   let(:model) do
     Class.new do
-      include Morpheus::ResponseParsing
+      include Morpheus::Mixins::ResponseParsing
     end
   end
   let(:request)  { mock }

data/spec/morpheus/mixins/url_support_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Morpheus::UrlSupport do
+describe Morpheus::Mixins::UrlSupport do
   let(:model) do
     Class.new do
-      include Morpheus::UrlSupport
+      include Morpheus::Mixins::UrlSupport
 
       def self.model_name
         'OriginalModelName'

data/spec/morpheus/response_parser_spec.rb

@@ -215,7 +215,11 @@ describe Morpheus::ResponseParser do
 
       module Handler; end
 
-      before { Morpheus::Configuration.parse_error_handler = Handler }
+      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 'calls #handle on a handler instance, passing the offending string' do
         Handler.should_receive(:handle).with(offending_string)

data/spec/regressions/sorting_resources_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+# We get this error when trying to sort objects returned from a service using Morpheus.
+#   ArgumentError: comparison of Student with Student failed
+#   /morpheus-0.3.6/lib/morpheus/associations/association.rb:104
+#
+# Usage:
+#   @students = @course.students.sort { |a,b| a.first_name <=> b.first_name }
+#
+# Top of backtrace:
+#   /morpheus-0.3.6/lib/morpheus/associations/association.rb:104:in "sort"
+#   /morpheus-0.3.6/lib/morpheus/associations/association.rb:104:in "send"
+#   /morpheus-0.3.6/lib/morpheus/associations/association.rb:104:in "method_missing"
+#   /app/controllers/courses_and_proctorings_controller.rb:24:in "attendance"
+#   One can assume method missing results in the loading of students, then sort is called on the result, I'm curious if the first_name call is lost or if it is null, self (in this case a Student) is being returned.
+#
+# Changing the code to this solved (or at least hid) the issue:
+#   @students = @course.students.sort { |a,b| a.first_name.to_s <=> b.first_name.to_s }
+
+describe 'Github Issue #2' do
+  context 'when the sort types are all the same' do
+    let(:dogs) { Dog.all }
+
+    before { stub_web! }
+
+    it 'sorts the resources correctly' do
+      dogs.sort { |a,b| a.name <=> b.name }.map(&:id).should == [3, 1, 2]
+    end
+
+    def stub_web!
+      Morpheus::Configuration.hydra.stub(:get, "#{Morpheus::Configuration.host}/dogs").and_return(build_morpheus_response(
+        200,
+        [
+          {
+            :id     => 1,
+            :valid  => true,
+            :errors => {},
+            :name   => 'Fido',
+            :breed  => 'Boxer'
+          },
+          {
+            :id     => 2,
+            :valid  => true,
+            :errors => {},
+            :name   => 'Winslow',
+            :breed  => 'Corgi'
+          },
+          {
+            :id     => 3,
+            :valid  => true,
+            :errors => {},
+            :name   => 'Daisy',
+            :breed  => 'English Bulldog'
+          }
+        ]
+      ))
+    end
+  end
+
+  context 'when the sort types are different' do
+    let(:dogs) { Dog.all }
+
+    before { stub_web! }
+
+    it 'raises an ArgumentError' do
+      expect {
+        dogs.sort { |a,b| a.name <=> b.name }
+      }.to raise_error(ArgumentError, /comparison of Dog with Dog failed|block returned nil/)
+    end
+
+    def stub_web!
+      Morpheus::Configuration.hydra.stub(:get, "#{Morpheus::Configuration.host}/dogs").and_return(build_morpheus_response(
+        200,
+        [
+          {
+            :id     => 1,
+            :valid  => true,
+            :errors => {},
+            :name   => 'Fido',
+            :breed  => 'Boxer'
+          },
+          {
+            :id     => 2,
+            :valid  => true,
+            :errors => {},
+            :name   => nil,
+            :breed  => 'Corgi'
+          },
+          {
+            :id     => 3,
+            :valid  => true,
+            :errors => {},
+            :name   => 'Daisy',
+            :breed  => 'English Bulldog'
+          }
+        ]
+      ))
+    end
+  end
+
+  context 'with any other type of Object' do
+    class Thing
+      attr_reader :name
+      def initialize(name = nil)
+        @name = name
+      end
+    end
+
+    let(:thing)         { Thing.new('Thingy') }
+    let(:another_thing) { Thing.new }
+    let(:things)        { [thing, another_thing] }
+
+    it 'raises an ArgumentError' do
+      expect {
+        things.sort { |a,b| a.name <=> b.name }
+      }.to raise_error(ArgumentError, /comparison of Thing with Thing failed|block returned nil/)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -20,8 +20,9 @@ Rails.backtrace_cleaner.remove_silencers!
 
 ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-Dir["#{File.dirname(__FILE__)}/shared/**/*.rb"].each { |f| require f }
+%w{ support shared regressions }.each do |dir|
+  Dir["#{File.dirname(__FILE__)}/#{dir}/**/*.rb"].each { |f| require f }
+end
 
 RSpec.configure do |config|
   require 'rspec/expectations'

metadata

@@ -1,134 +1,189 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: morpheus
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - Ryan Moran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &70093023811320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093023811320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: typhoeus
-  requirement: &70093023810620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.3
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
+        version: 0.4.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70093023810620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &70093023810160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093023810160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70093023809700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093023809700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: &70093023809200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093023809200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70093023808740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70093023808740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70093023808260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :development
-  prerelease: false
-  version_requirements: *70093023808260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &70093023807800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 2
+        - 9
+        - 0
         version: 2.9.0
   type: :development
-  prerelease: false
-  version_requirements: *70093023807800
+  version_requirements: *id008
 description: RESTful API Client
-email:
+email: 
 - ryan.moran@revolutionprep.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/ext/typhoeus.rb
 - lib/morpheus.rb
-- lib/morpheus/associations/association.rb
-- lib/morpheus/associations/belongs_to_association.rb
-- lib/morpheus/associations/has_many_association.rb
-- lib/morpheus/associations/has_one_association.rb
 - lib/morpheus/base.rb
+- lib/morpheus/client.rb
 - lib/morpheus/client/associations.rb
+- lib/morpheus/client/cached_request_formatter.rb
 - lib/morpheus/client/inflections.rb
 - lib/morpheus/client/log_subscriber.rb
 - lib/morpheus/client/railtie.rb
+- lib/morpheus/client/request_formatter.rb
+- lib/morpheus/client/uncached_request_formatter.rb
 - lib/morpheus/configuration.rb
 - lib/morpheus/errors.rb
 - lib/morpheus/filter.rb
+- lib/morpheus/mixins.rb
 - lib/morpheus/mixins/associations.rb
+- lib/morpheus/mixins/associations/association.rb
+- lib/morpheus/mixins/associations/belongs_to_association.rb
+- lib/morpheus/mixins/associations/has_many_association.rb
+- lib/morpheus/mixins/associations/has_one_association.rb
 - lib/morpheus/mixins/attributes.rb
 - lib/morpheus/mixins/conversion.rb
 - lib/morpheus/mixins/filtering.rb
@@ -189,15 +244,18 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
-- spec/morpheus/associations/association_spec.rb
-- spec/morpheus/associations/belongs_to_association_spec.rb
-- spec/morpheus/associations/has_many_association_spec.rb
-- spec/morpheus/associations/has_one_association_spec.rb
 - spec/morpheus/base_spec.rb
 - spec/morpheus/client/associations_spec.rb
+- spec/morpheus/client/cached_request_formatter_spec.rb
 - spec/morpheus/client/log_subscriber_spec.rb
 - spec/morpheus/client/railtie_spec.rb
+- spec/morpheus/client/request_formatter_spec.rb
+- spec/morpheus/client/uncached_request_formatter_spec.rb
 - spec/morpheus/configuration_spec.rb
+- spec/morpheus/mixins/associations/association_spec.rb
+- spec/morpheus/mixins/associations/belongs_to_association_spec.rb
+- spec/morpheus/mixins/associations/has_many_association_spec.rb
+- spec/morpheus/mixins/associations/has_one_association_spec.rb
 - spec/morpheus/mixins/associations_spec.rb
 - spec/morpheus/mixins/attributes_spec.rb
 - spec/morpheus/mixins/conversion_spec.rb
@@ -218,34 +276,44 @@ files:
 - spec/morpheus/response_spec.rb
 - spec/morpheus/type_caster_spec.rb
 - spec/morpheus/url_builder_spec.rb
+- spec/regressions/sorting_resources_spec.rb
 - spec/shared/active_model_lint_test.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb
-homepage: ''
+homepage: https://github.com/ryanmoran/morpheus
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RESTful API Client
-test_files:
+test_files: 
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -285,15 +353,18 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
-- spec/morpheus/associations/association_spec.rb
-- spec/morpheus/associations/belongs_to_association_spec.rb
-- spec/morpheus/associations/has_many_association_spec.rb
-- spec/morpheus/associations/has_one_association_spec.rb
 - spec/morpheus/base_spec.rb
 - spec/morpheus/client/associations_spec.rb
+- spec/morpheus/client/cached_request_formatter_spec.rb
 - spec/morpheus/client/log_subscriber_spec.rb
 - spec/morpheus/client/railtie_spec.rb
+- spec/morpheus/client/request_formatter_spec.rb
+- spec/morpheus/client/uncached_request_formatter_spec.rb
 - spec/morpheus/configuration_spec.rb
+- spec/morpheus/mixins/associations/association_spec.rb
+- spec/morpheus/mixins/associations/belongs_to_association_spec.rb
+- spec/morpheus/mixins/associations/has_many_association_spec.rb
+- spec/morpheus/mixins/associations/has_one_association_spec.rb
 - spec/morpheus/mixins/associations_spec.rb
 - spec/morpheus/mixins/attributes_spec.rb
 - spec/morpheus/mixins/conversion_spec.rb
@@ -314,6 +385,7 @@ test_files:
 - spec/morpheus/response_spec.rb
 - spec/morpheus/type_caster_spec.rb
 - spec/morpheus/url_builder_spec.rb
+- spec/regressions/sorting_resources_spec.rb
 - spec/shared/active_model_lint_test.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb