api_resource 0.3.8 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.10

data/api_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "api_resource"
-  s.version = "0.3.8"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Langevin"]
-  s.date = "2012-07-31"
+  s.date = "2012-08-22"
   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 = [
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ejlangev/resource"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.17"
   s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
 
   if s.respond_to? :specification_version then

data/lib/api_resource/associations/association_proxy.rb

@@ -60,6 +60,7 @@ module ApiResource
 
       def reload
         remove_instance_variable(:@internal_object) if instance_variable_defined?(:@internal_object)
+        self.load(self.load_from_remote({}))
         self
       end
       

data/lib/api_resource/attributes.rb

@@ -30,6 +30,38 @@ module ApiResource
         end
         @attributes
       end
+
+
+      # This method is important for reloading an object. If the
+      # object has already been loaded, its associations will trip
+      # up the load method unless we pass in the internal objects.
+
+      define_method(:attributes_without_proxies) do
+        attributes = @attributes
+
+        if attributes.nil?
+          attributes = self.class.attribute_names.each do |attr|
+            attributes[attr] = self.send("#{attr}")
+          end
+        end
+
+        attributes.each do |k,v|
+          if v.respond_to?(:internal_object)
+            if v.internal_object.present?
+              internal = v.internal_object
+              if internal.is_a?(Array)
+                attributes[k] = internal.collect{|item| item.attributes}
+              else
+                attributes[k] = internal.attributes
+              end
+            else
+              attributes[k] = nil
+            end
+          end
+        end
+
+        attributes
+      end
       
     end
     

data/lib/api_resource/base.rb

@@ -112,6 +112,16 @@ module ApiResource
       def reset_connection
         remove_instance_variable(:@connection) if @connection.present?
       end
+
+      # load our resource definition to make sure we know what this class
+      # responds to
+      def respond_to?(*args)
+        unless self.instance_variable_defined?(:@class_data)
+          self.instance_variable_set(:@class_data, true)
+          self.set_class_attributes_upon_load
+        end
+        super
+      end
       
       def reload_class_attributes
         # clear the public_attribute_names, protected_attribute_names
@@ -473,7 +483,8 @@ module ApiResource
     end
     
     def reload
-      self.load(self.class.find(to_param, :params => @prefix_options).attributes)
+      remove_instance_variable(:@assoc_attributes) if instance_variable_defined?(:@assoc_attributes)
+      self.load(self.class.find(to_param, :params => @prefix_options).attributes_without_proxies)
     end
     
     def to_param

data/spec/lib/associations_spec.rb

@@ -411,6 +411,35 @@ describe "Associations" do
       end
       
     end
+
+    it "should be able to reload a single-object association" do
+      ap = Associations::SingleObjectProxy.new("TestResource",{:service_uri => '/single_object_association', :active => {:active => true}, :scopes_only => true})
+
+      old_name = ap.name
+
+      str = "krdflkjsd"
+
+      ap.name = str
+      ap.name.should eql str
+      ap.reload
+
+      ap.name.should eql old_name
+    end
+
+    it "should be able to reload a multi-object association" do
+      ap = Associations::MultiObjectProxy.new("TestResource",{:service_uri => '/multi_object_association', :active => {:active => false}, :inactive => {:active => false}, :with_birthday => {:birthday => true}})
+
+      old_name = ap.first.name
+
+      str = "krdflkjsd"
+
+      ap.first.name = str
+      ap.first.name.should eql str
+
+      ap.reload
+
+      ap.first.name.should eql old_name
+    end
     
     context "Multi Object" do
       
@@ -547,10 +576,22 @@ describe "Associations" do
           tr.belongs_to_object.internal_object.should be_instance_of BelongsToObject
         end
         
+        it "should be able to reload a single-object association" do
+          ApiResource::Associations::SingleObjectProxy.any_instance.stubs(:remote_path => "/has_one_objects")
+          HasOneObject.connection.stubs(:get => nil)
+
+          tr = TestResource.new()
+
+          tr.has_one_object = {:color => "Blue"}
+
+          tr.has_one_object.reload
+
+          tr.has_one_object.should be_blank
+        end
         
       end
       
-      context "Single Object Association" do
+      context "Multi Object Association" do
         before(:all) do
           TestResource.has_many(:has_many_objects)
         end
@@ -570,7 +611,17 @@ describe "Associations" do
           tr.has_many_objects.internal_object.first.should be_instance_of HasManyObject
         end
         
-        
+        it "should be able to reload a multi-object association" do
+          ApiResource::Associations::MultiObjectProxy.any_instance.stubs(:remote_path => "/has_many_objects")
+          ApiResource::Connection.any_instance.stubs(:get => [])
+
+          tr = TestResource.new(:has_many_objects => [{:color => "blue"}])
+
+          tr.has_many_objects.reload
+
+          tr.has_many_objects.should be_blank
+        end
+
       end
       
       context "ActiveModel" do

data/spec/lib/attributes_spec.rb

@@ -51,6 +51,14 @@ describe "Attributes" do
         tst.scope?(:active).should be_true
       end
 
+      it "should provide attributes without proxies if attributes_without_proxies is called" do
+        tst = TestResource.new({:has_many_objects => []})
+        tst.attributes_without_proxies.each do |k,v|
+          [ApiResource::Associations::SingleObjectProxy, ApiResource::Associations::MultiObjectProxy]
+            .include?(v.class).should be_false
+        end
+      end
+
     end
 
     context "Attributes" do

data/spec/lib/base_spec.rb

@@ -549,6 +549,33 @@ describe "Base" do
       tr = TestResource.new(:name => "Ethan")
       tr.persisted?.should be_false
     end
+
+    it "should know how to reload attributes" do
+      tr = TestResource.find(1)
+
+      tr.age = 47
+      tr.name = "Ethan"
+
+      tr.reload
+
+      tr.age.should eql "age"
+      tr.name.should eql "name"
+    end
+
+    it "should know how to reload associations" do
+      tr = TestResource.find(1)
+
+      tr.has_one_object.size = "small"
+      tr.has_many_objects.first.name = "Ethan"
+
+      tr.has_one_object.size.should eql "small"
+      tr.has_many_objects.first.name.should eql "Ethan"
+
+      tr.reload
+
+      tr.has_one_object.size.should eql "large"
+      tr.has_many_objects.first.name.should eql "name"
+    end
     
   end
   
@@ -597,5 +624,21 @@ describe "Base" do
     end
 
   end
+
+  context ".respond_to?" do
+
+    it "should load the resouce definition when respond_to? is called" do
+      # remove our attribute that denotes that the definition was loaded
+      TestResource.send(:remove_instance_variable, :@class_data)
+      TestResource.expects(:set_class_attributes_upon_load)
+      TestResource.respond_to?(:test)
+    end
+
+    it "should not load the resource definition when respond_to? is called
+      if the definition has already been loaded"
+
+  end
+
+
   
 end

data/spec/support/mocks/test_resource_mocks.rb

@@ -14,7 +14,7 @@ Mocks.define do
   end
   
   endpoint("/test_resources/:id") do
-    get(HashDealer.roll(:test_resource)) do |params|
+    get(HashDealer.roll(:test_resource_with_proxies)) do |params|
       self.merge(params)
     end
     delete({})

data/spec/support/requests/association_requests.rb

@@ -11,4 +11,13 @@ end
 
 HashDealer.define(:active_birthday_test_association_resource, :parent => :active_test_association_resource) do
   birthday{Date.today}
+end
+
+HashDealer.define(:has_one_object) do
+	size("large")
+	color("blue")
+end
+
+HashDealer.define(:has_many_object) do
+	name("name")
 end

data/spec/support/requests/test_resource_requests.rb

@@ -25,6 +25,11 @@ HashDealer.define(:test_resource_with_roles) do
   roles([])
 end
 
+HashDealer.define(:test_resource_with_proxies, :parent => :test_resource) do
+  has_one_object{HashDealer.roll(:has_one_object)}
+  has_many_objects{(0..4).to_a.collect{HashDealer.roll(:has_many_object)}}
+end
+
 HashDealer.define(:test_resource_errors) do
   errors({
     :name => ["can't be blank"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337780380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+  version_requirements: *70140337780380
 - !ruby/object:Gem::Dependency
   name: hash_dealer
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337778740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337778740
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337777260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337777260
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337776140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337776140
 - !ruby/object:Gem::Dependency
   name: differ
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337774520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337774520
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337772480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337772480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337771460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337771460
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337767900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337767900
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337763860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337763860
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337760840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337760840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337739640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337739640
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337737220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,15 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337737220
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337735220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,15 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337735220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337733580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -229,15 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337733580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337732020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -245,15 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337732020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337730580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -261,15 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337730580
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337729080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,15 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337729080
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337726760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -293,15 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337726760
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337716360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -309,15 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337716360
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337713780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -325,15 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337713780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337711860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -341,15 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337711860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337710340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -357,15 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337710340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337702880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -373,15 +263,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
+  version_requirements: *70140337702880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337701600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -389,15 +274,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+  version_requirements: *70140337701600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140337700580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -405,12 +285,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140337700580
 description: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
 email: ejl6266@gmail.com
@@ -497,7 +372,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3013751985320501547
+      hash: -1273974691501291187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -506,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A replacement for ActiveResource for RESTful APIs that handles associated