api_resource 0.2.5 → 0.2.6

data/Gemfile

@@ -23,7 +23,7 @@ group :development do
   gem 'guard'
   gem 'guard-rspec'
   gem 'mocha'
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
   gem 'activerecord', '3.0.9'
   gem "sqlite3"

data/Gemfile.lock

@@ -136,7 +136,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (= 3.0.9)
-  bundler (~> 1.0.0)
+  bundler
   colorize
   differ
   factory_girl

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/api_resource.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{api_resource}
-  s.version = "0.2.5"
+  s.name = "api_resource"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ethan Langevin}]
-  s.date = %q{2012-01-20}
-  s.description = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
-  s.email = %q{ejl6266@gmail.com}
+  s.authors = ["Ethan Langevin"]
+  s.date = "2012-03-15"
+  s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
+  s.email = "ejl6266@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
     "lib/api_resource/observing.rb",
     "lib/api_resource/railtie.rb",
     "lib/api_resource/scopes.rb",
+    "nohup.out",
     "spec/lib/associations_spec.rb",
     "spec/lib/attributes_spec.rb",
     "spec/lib/base_spec.rb",
@@ -76,11 +77,11 @@ Gem::Specification.new do |s|
     "spec/support/requests/test_resource_requests.rb",
     "spec/support/test_resource.rb"
   ]
-  s.homepage = %q{http://github.com/ejlangev/resource}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
+  s.homepage = "http://github.com/ejlangev/resource"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -103,7 +104,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<activerecord>, ["= 3.0.9"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -125,7 +126,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<activerecord>, ["= 3.0.9"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -148,7 +149,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<activerecord>, ["= 3.0.9"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/lib/api_resource/associations/association_proxy.rb

@@ -70,7 +70,11 @@ module ApiResource
       def inspect
         self.internal_object.inspect
       end
-
+      
+      def ==(other)
+         raise "Not Implemented: This method must be implemented in a subclass"
+      end
+      
       protected
       # This method loads a particular scope with a set of options from the remote server
       def load_scope_with_options(scope, options)

data/lib/api_resource/associations/multi_object_proxy.rb

@@ -15,6 +15,16 @@ module ApiResource
         def each(*args, &block)
           self.internal_object.each(*args, &block)
         end
+        
+        def ==(other)
+          return false if self.class != other.class
+          if self.internal_object.is_a?(Array)
+            self.internal_object.sort.each_with_index do |elem, i|
+              return false if other.internal_object.sort[i].attributes != elem.attributes
+            end
+          end
+          return true
+        end
 
         def serializable_hash(options)
           self.internal_object.collect{|obj| obj.serializable_hash(options) }

data/lib/api_resource/associations/single_object_proxy.rb

@@ -24,6 +24,12 @@ module ApiResource
       def present?
 	      return @internal_object.present?
       end
+      
+      def ==(other)
+        return false if self.class != other.class
+        return false if other.internal_object.attributes != self.internal_object.attributes
+        return true
+      end
 
       protected
       def load_scope_with_options(scope, options)

data/lib/api_resource/associations.rb

@@ -97,7 +97,7 @@ module ApiResource
       
       def association_names
         # structure is {:has_many => {"myname" => "ClassName"}}
-        self.related_objects.clone.delete_if{|k,v| k.to_s == "scope"}.collect{|k,v| v.keys.first.to_sym}
+        self.related_objects.clone.delete_if{|k,v| k.to_s == "scope"}.collect{|k,v| v.keys.collect(&:to_sym)}.flatten
       end
       
       def association_class_name(assoc)
@@ -116,13 +116,18 @@ module ApiResource
       
       protected
         def define_association_as_attribute(assoc_type, assoc_name)
+          # set up dirty tracking for associations
+          
           self.class_eval <<-EOE, __FILE__, __LINE__ + 1
             def #{assoc_name}
               self.attributes[:#{assoc_name}] ||= #{self.association_types[assoc_type.to_sym].to_s.classify}ObjectProxy.new(self.association_class_name('#{assoc_name}'), nil, self)
             end
             def #{assoc_name}=(val)
-              #{assoc_name}_will_change! unless self.#{assoc_name}.internal_object == val
+              # get old internal object
+              old_internal_object = self.#{assoc_name}.internal_object
               self.#{assoc_name}.internal_object = val
+              #{assoc_name}_will_change! unless self.#{assoc_name} == old_internal_object
+              self.#{assoc_name}.internal_object
             end
             def #{assoc_name}?
               self.#{assoc_name}.internal_object.present?

data/lib/api_resource/attributes.rb

@@ -36,15 +36,12 @@ module ApiResource
     module ClassMethods
       
       def define_attributes(*args)
-        # This is provided by ActiveModel::AttributeMethods, it should define the basic methods
-        # but we need to override all the setters so we do dirty tracking
-        define_attribute_methods args
         args.each do |arg|
           if arg.is_a?(Array)
             self.define_attribute_type(arg.first, arg.second)
             arg = arg.first
           end
-          
+
           self.attribute_names << arg.to_sym
           self.public_attribute_names << arg.to_sym
           
@@ -70,8 +67,13 @@ module ApiResource
       end
       
       def define_protected_attributes(*args)
-        define_attribute_methods args
         args.each do |arg|
+          
+          if arg.is_a?(Array)
+            self.define_attribute_type(arg.first, arg.second)
+            arg = arg.first
+          end
+
           self.attribute_names << arg.to_sym
           self.protected_attribute_names << arg.to_sym
           

data/lib/api_resource/base.rb

@@ -39,11 +39,19 @@ module ApiResource
       def set_class_attributes_upon_load
         return true if self == ApiResource::Base
         begin
-          class_data = self.connection.get(self.new_element_path, self.headers)
+          class_data = self.connection.get(
+            self.new_element_path, self.headers
+          )
           # Attributes go first
           if class_data["attributes"]
-            define_attributes *(class_data["attributes"]["public"] || [])
-            define_protected_attributes *(class_data["attributes"]["protected"] || [])
+            
+            define_attributes(
+              *(class_data["attributes"]["public"] || [])
+            )
+            define_protected_attributes(
+              *(class_data["attributes"]["protected"] || [])
+            ) 
+            
           end
           # Then scopes
           if class_data["scopes"]
@@ -59,13 +67,32 @@ module ApiResource
               end
             end
           end
+          
+          # This is provided by ActiveModel::AttributeMethods, it should
+          # define the basic methods but we need to override all the setters 
+          # so we do dirty tracking
+          attrs = []
+          if class_data["attributes"] && class_data["attributes"]["public"]
+            attrs += class_data["attributes"]["public"].collect{|v| 
+              v.is_a?(Array) ? v.first : v
+            }.flatten
+          end
+          if class_data["associations"]
+            attrs += class_data["associations"].values.collect(&:keys).flatten
+          end
+          define_attribute_methods(attrs)
+          
         # Swallow up any loading errors because the site may be incorrect
         rescue Exception => e
           if ApiResource.raise_missing_definition_error
             raise e 
           end
-          ApiResource.logger.warn("#{self} accessing #{self.new_element_path}")
-          ApiResource.logger.warn("#{self}: #{e.message[0..60].gsub(/[\n\r]/, '')} ...\n")
+          ApiResource.logger.warn(
+            "#{self} accessing #{self.new_element_path}"
+          )
+          ApiResource.logger.warn(
+            "#{self}: #{e.message[0..60].gsub(/[\n\r]/, '')} ...\n"
+          )
           ApiResource.logger.debug(e.backtrace.pretty_inspect)
           return e.respond_to?(:request) ? e.request : nil
         end
@@ -446,6 +473,7 @@ module ApiResource
       attributes.symbolize_keys.each do |key, value|
         # If this attribute doesn't exist define it as a protected attribute
         self.class.define_protected_attributes(key) unless self.respond_to?(key)
+        #self.send("#{key}_will_change!") if self.respond_to?("#{key}_will_change!")
         self.attributes[key] =
         case value
           when Array
@@ -499,7 +527,7 @@ module ApiResource
     end
     
     def serializable_hash(options = {})
-      options[:include_associations] = options[:include_associations] ? options[:include_associations].symbolize_array : []
+      options[:include_associations] = options[:include_associations] ? options[:include_associations].symbolize_array : self.changes.keys.symbolize_array.select{|k| self.association?(k)}
       options[:include_extras] = options[:include_extras] ? options[:include_extras].symbolize_array : []
       options[:except] ||= []
       ret = self.attributes.inject({}) do |accum, (key,val)|

data/lib/api_resource/mocks.rb

@@ -254,7 +254,7 @@ module ApiResource
                 response[:response].tap{|resp| resp.generate_response(response[:params])}
               else
                 raise ApiResource::ResourceNotFound.new(
-                  MockResponse.new("", {:headers => {"Content-type" => "application/json"}, :status_code => 404}),
+                  MockResponse.new({}, {:headers => {"Content-type" => "application/json"}, :status_code => 404}),
                   :message => "\nCould not find a response recorded for \#{request.pretty_inspect}\n" +
                   "Potential Responses Are:\n" +
                   "\#{Array.wrap(Mocks.responses_for_path(request.path)[:responses]).collect(&:first).pretty_inspect}"

data/nohup.out

@@ -0,0 +1,63 @@
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/choice-0.1.4/lib/choice/parser.rb:108: warning: Hash#index is deprecated; use Hash#key
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid 18804 exit 2> (RuntimeError)
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:96:in `project_path='
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:86:in `start'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/bin/cijoe:50:in `<top (required)>'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `load'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `<main>'
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/choice-0.1.4/lib/choice/parser.rb:108: warning: Hash#index is deprecated; use Hash#key
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid 19377 exit 2> (RuntimeError)
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:96:in `project_path='
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:86:in `start'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/bin/cijoe:50:in `<top (required)>'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `load'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `<main>'
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/choice-0.1.4/lib/choice/parser.rb:108: warning: Hash#index is deprecated; use Hash#key
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid 19463 exit 2> (RuntimeError)
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:96:in `project_path='
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:86:in `start'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/bin/cijoe:50:in `<top (required)>'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `load'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `<main>'
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/choice-0.1.4/lib/choice/parser.rb:108: warning: Hash#index is deprecated; use Hash#key
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid 19730 exit 2> (RuntimeError)
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:96:in `project_path='
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:86:in `start'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/bin/cijoe:50:in `<top (required)>'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `load'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `<main>'
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/choice-0.1.4/lib/choice/parser.rb:108: warning: Hash#index is deprecated; use Hash#key
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid 19738 exit 2> (RuntimeError)
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:96:in `project_path='
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/lib/cijoe/server.rb:86:in `start'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/gems/cijoe-0.9.2/bin/cijoe:50:in `<top (required)>'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `load'
+	from /home/bb/.rvm/gems/ruby-1.9.2-p290/bin/cijoe:19:in `<main>'
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/../lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid=19748,exited(2)> (RuntimeError)
+	from /usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/../lib/cijoe/server.rb:96:in `project_path='
+	from /usr/lib/ruby/gems/1.8/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `__send__'
+	from /usr/lib/ruby/gems/1.8/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/../lib/cijoe/server.rb:86:in `start'
+	from /usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/cijoe:50
+	from /usr/bin/cijoe:19:in `load'
+	from /usr/bin/cijoe:19
+cd: 1: can't cd to /vol/www/releases/api_resource/api_resource
+/usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/../lib/cijoe/config.rb:25:in `to_s': Error calling git config, is a recent version of git installed? Command: "cd /vol/www/releases/api_resource/api_resource && git config cijoe.user", Error: "", Status: #<Process::Status: pid=19909,exited(2)> (RuntimeError)
+	from /usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/../lib/cijoe/server.rb:96:in `project_path='
+	from /usr/lib/ruby/gems/1.8/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `__send__'
+	from /usr/lib/ruby/gems/1.8/gems/sinatra-1.2.7/lib/sinatra/base.rb:964:in `set'
+	from /usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/../lib/cijoe/server.rb:86:in `start'
+	from /usr/lib/ruby/gems/1.8/gems/cijoe-0.9.2/bin/cijoe:50
+	from /usr/bin/cijoe:19:in `load'
+	from /usr/bin/cijoe:19

data/spec/lib/base_spec.rb

@@ -201,7 +201,7 @@ describe "Base" do
         hash["test_resource"].should_not be_nil
       end
       
-      it "should not include associations by default" do
+      it "should not include associations by default if they have not changed" do
         tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2", :has_many_objects => []})
         hash = JSON.parse(tst.to_json)
         hash["has_many_objects"].should be_nil
@@ -213,6 +213,13 @@ describe "Base" do
         hash["has_many_objects"].should_not be_nil
       end
       
+      it "should include associations by default if they have changed" do
+        tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2", :has_many_objects => []})
+        tst.has_many_objects = [{:name => "test"}]
+        hash = JSON.parse(tst.to_json)
+        hash["has_many_objects"].should_not be_nil
+      end
+      
       it "should not include unknown attributes unless they are passed in via the include_extras array" do
         tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2", :attr3 => "attr3"})
         hash = JSON.parse(tst.to_json)

data/spec/lib/mocks_spec.rb

@@ -8,7 +8,7 @@ describe Mocks do
   # we set up the mocks in spec helper, so we can just assert this
   it "should hijack the connection" do
     ApiResource::Mocks::Interface.any_instance.expects(:get).once.returns(
-      ApiResource::Mocks::MockResponse.new("", {:headers => {"Content-type" => "application/json"}, :status_code => 200})
+      ApiResource::Mocks::MockResponse.new({}, {:headers => {"Content-type" => "application/json"}, :status_code => 200})
     )
     TestResource.reload_class_attributes
   end

data/spec/support/requests/test_resource_requests.rb

@@ -12,10 +12,6 @@ HashDealer.define(:new_test_object) do
     :belongs_to => {:belongs_to_object => {}, :custom_name => {:class_name => "BelongsToObject"}},
     :has_one => {:has_one_object => {}},
   })
-  # Think of a use case for this
-  options({
-    
-  })
 end
 
 HashDealer.define(:test_resource) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2159188660 !ruby/object:Gem::Requirement
+  requirement: &2165270300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2159188660
+  version_requirements: *2165270300
 - !ruby/object:Gem::Dependency
   name: hash_dealer
-  requirement: &2159188140 !ruby/object:Gem::Requirement
+  requirement: &2165256520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159188140
+  version_requirements: *2165256520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2159187640 !ruby/object:Gem::Requirement
+  requirement: &2165233680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159187640
+  version_requirements: *2165233680
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &2159187100 !ruby/object:Gem::Requirement
+  requirement: &2165231660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159187100
+  version_requirements: *2165231660
 - !ruby/object:Gem::Dependency
   name: differ
-  requirement: &2159186620 !ruby/object:Gem::Requirement
+  requirement: &2165230180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159186620
+  version_requirements: *2165230180
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2159186140 !ruby/object:Gem::Requirement
+  requirement: &2165229340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159186140
+  version_requirements: *2165229340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2159185660 !ruby/object:Gem::Requirement
+  requirement: &2165228280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159185660
+  version_requirements: *2165228280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159185180 !ruby/object:Gem::Requirement
+  requirement: &2165227400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159185180
+  version_requirements: *2165227400
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2159177840 !ruby/object:Gem::Requirement
+  requirement: &2165226420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159177840
+  version_requirements: *2165226420
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2159177160 !ruby/object:Gem::Requirement
+  requirement: &2165225600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159177160
+  version_requirements: *2165225600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2159176520 !ruby/object:Gem::Requirement
+  requirement: &2165225020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159176520
+  version_requirements: *2165225020
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2159175880 !ruby/object:Gem::Requirement
+  requirement: &2165224220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159175880
+  version_requirements: *2165224220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2159175220 !ruby/object:Gem::Requirement
+  requirement: &2165223520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159175220
+  version_requirements: *2165223520
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2159174520 !ruby/object:Gem::Requirement
+  requirement: &2165222520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159174520
+  version_requirements: *2165222520
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2159173900 !ruby/object:Gem::Requirement
+  requirement: &2165220880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159173900
+  version_requirements: *2165220880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2159173240 !ruby/object:Gem::Requirement
+  requirement: &2165220040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159173240
+  version_requirements: *2165220040
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2159172660 !ruby/object:Gem::Requirement
+  requirement: &2165218740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,21 +197,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159172660
+  version_requirements: *2165218740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2159172040 !ruby/object:Gem::Requirement
+  requirement: &2165217560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159172040
+  version_requirements: *2165217560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2159171560 !ruby/object:Gem::Requirement
+  requirement: &2165216380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2159171560
+  version_requirements: *2165216380
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2159171080 !ruby/object:Gem::Requirement
+  requirement: &2165215240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -230,10 +230,10 @@ dependencies:
         version: 3.0.9
   type: :development
   prerelease: false
-  version_requirements: *2159171080
+  version_requirements: *2165215240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2159170600 !ruby/object:Gem::Requirement
+  requirement: &2165214200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159170600
+  version_requirements: *2165214200
 description: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
 email: ejl6266@gmail.com
@@ -293,6 +293,7 @@ files:
 - lib/api_resource/observing.rb
 - lib/api_resource/railtie.rb
 - lib/api_resource/scopes.rb
+- nohup.out
 - spec/lib/associations_spec.rb
 - spec/lib/attributes_spec.rb
 - spec/lib/base_spec.rb
@@ -324,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1395135479107090038
+      hash: -2414595039217114624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -333,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A replacement for ActiveResource for RESTful APIs that handles associated