api_resource 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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.2"
+  s.name = "api_resource"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Langevin"]
-  s.date = %q{2012-01-07}
-  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.date = "2012-01-08"
+  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"
@@ -76,11 +76,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.homepage = "http://github.com/ejlangev/resource"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
+  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

data/lib/api_resource/associations/association_proxy.rb

@@ -3,7 +3,8 @@ module ApiResource
   module Associations
    
     class AssociationProxy
-
+      
+      
       cattr_accessor :remote_path_element; self.remote_path_element = :service_uri
       cattr_accessor :include_class_scopes; self.include_class_scopes = true
 
@@ -23,9 +24,10 @@ module ApiResource
         end
         # Now that we have set up all the scopes with the load method we need to create methods
         self.scopes.each do |key, _|
+          next if self.respond_to?(key)
           self.instance_eval <<-EOE, __FILE__, __LINE__ + 1
             def #{key}(opts = {})
-              ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
+              @#{key} ||= ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
             end
           EOE
         end
@@ -56,16 +58,8 @@ module ApiResource
         self.internal_object.send(method, *args, &block)
       end
 
-      def reload(scope =  nil, opts = {})
-        if scope.nil?
-          self.loaded.clear
-          self.times_loaded = 0
-          # Remove the loaded object to force it to reload
-          remove_instance_variable(:@internal_object) if instance_variable_defined?(:@internal_object)
-        else
-          # Delete this key from the loaded hash which will cause it to be reloaded
-          self.loaded.delete(self.loaded_hash_key(scope, opts))
-        end
+      def reload
+        remove_instance_variable(:@internal_object) if instance_variable_defined?(:@internal_object)
         self
       end
       

data/lib/api_resource/associations/multi_object_proxy.rb

@@ -34,11 +34,12 @@ module ApiResource
         def load_scope_with_options(scope, options)
           scope = self.loaded_hash_key(scope.to_s, options)
           return [] if self.remote_path.blank?
-          unless self.loaded[scope]
+
+          self.loaded[scope] ||= begin
             self.times_loaded += 1
-            self.loaded[scope] = self.load_from_remote(options)
+            self.load_from_remote(options).collect{|item| self.klass.new(item)}
           end
-          self.loaded[scope].collect{|item| self.klass.new(item)}
+          
         end
 
         def load(contents)
@@ -57,7 +58,7 @@ module ApiResource
             raise "Expected the scope #{key} to point to a hash, to #{value}" unless value.is_a?(Hash)
             self.instance_eval <<-EOE, __FILE__, __LINE__ + 1
               def #{key}(opts = {})
-                ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
+                @#{key} ||= ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
               end
             EOE
             self.scopes[key.to_s] = value

data/lib/api_resource/associations/relation_scope.rb

@@ -6,17 +6,10 @@ module ApiResource
     
     class RelationScope < Scope
 
-      def reload
-        remove_instance_variable(:@internal_object) if instance_variable_defined?(:@internal_object)
-        self.klass.reload(self.current_scope, self.scopes[self.current_scope])
-        self
-      end
-
       # Use this method to access the internal data, this guarantees that loading only occurs once per object
       def internal_object
         @internal_object ||= self.klass.send(:load_scope_with_options, self.current_scope, self.to_hash)
       end
-      
       # 
       # class factory
       def self.class_factory(hsh)

data/lib/api_resource/associations/scope.rb

@@ -93,8 +93,10 @@ module ApiResource
         end
         def enhance_current_scope(scp, *args)
           opts = args.extract_options!
-          check_scope(scp)         
-          self.class.class_factory(self.scopes[scp]).new(self.klass, scp, *args, opts.merge(:parent => self))
+          check_scope(scp)
+          cache_key = "a#{Digest::MD5.hexdigest((args.sort + [scp]).to_s)}"
+          return instance_variable_get("@#{cache_key}") if instance_variable_defined?("@#{cache_key}")
+          return instance_variable_set("@#{cache_key}", self.class.class_factory(self.scopes[scp]).new(self.klass, scp, *args, opts.merge(:parent => self)))
         end
         # make sure we have a valid scope
         def check_scope(scp)

data/lib/api_resource/associations/single_object_proxy.rb

@@ -30,11 +30,10 @@ module ApiResource
         scope = self.loaded_hash_key(scope.to_s, options)
         # If the service uri is blank you can't load
         return nil if self.remote_path.blank?
-        unless self.loaded[scope]
+        self.loaded[scope] ||= begin
           self.times_loaded += 1
-          self.loaded[scope] = self.load_from_remote(options)
+          self.klass.new(self.load_from_remote(options))
         end
-        self.klass.new(self.loaded[scope])
       end
 
       def load(contents)
@@ -65,7 +64,7 @@ module ApiResource
             raise "Expected the scope #{key} to have a hash for a value, got #{val}" unless val.is_a?(Hash)
             self.instance_eval <<-EOE, __FILE__, __LINE__ + 1
               def #{key}(opts = {})
-                ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
+                @#{key} ||= ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
               end
             EOE
             self.scopes[key.to_s] = val

data/spec/lib/associations_spec.rb

@@ -374,18 +374,6 @@ describe "Associations" do
         ap.active.with_birthday.birthday.should_not be_blank
       end
       
-      it "should be able to load a chain of scopes with substitution" do
-        ap = Associations::SingleObjectProxy.new("TestResource",{:service_uri => '/single_object_association', :active => {:active => false}, :with_birthday => {:birthday => true}, :scopes_only => true})
-        item = ap.active(:active => true).internal_object
-        item.active.should be_true
-        ap.times_loaded.should eql(1)
-        # This error and incrementing times_loaded means it tried to load again
-        lambda {
-          ap.active.internal_object
-        }.should raise_error
-        ap.times_loaded.should eql(2)
-      end
-      
       it "should proxy unknown methods to the object loading if it hasn't already" do
         ap = Associations::SingleObjectProxy.new("TestResource",{:service_uri => '/single_object_association', :active => {:active => false}, :with_birthday => {:birthday => true}, :scopes_only => true})
         ap.times_loaded.should eql(0)

metadata

@@ -1,246 +1,247 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: api_resource
-version: !ruby/object:Gem::Version
-  version: 0.2.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.3
 platform: ruby
-authors:
+authors: 
 - Ethan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000 -05:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70184031659720 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70184031659720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: hash_dealer
-  requirement: &70184031659140 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70184031659140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &70184031658500 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70184031658500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: log4r
-  requirement: &70184031656140 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70184031656140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: differ
-  requirement: &70184031655400 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70184031655400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: colorize
-  requirement: &70184031654560 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70184031654560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70184031653900 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031653900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &70184031653380 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031653380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: growl
-  requirement: &70184031652400 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031652400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &70184031651600 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031651600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: factory_girl
-  requirement: &70184031650840 !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031650840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &70184031650220 !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031650220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: faker
-  requirement: &70184031649420 !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031649420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: guard
-  requirement: &70184031648740 !ruby/object:Gem::Requirement
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031648740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: guard-rspec
-  requirement: &70184031648080 !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031648080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70184031638420 !ruby/object:Gem::Requirement
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031638420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70184031637880 !ruby/object:Gem::Requirement
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70184031637880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &70184031637120 !ruby/object:Gem::Requirement
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70184031637120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70184031636400 !ruby/object:Gem::Requirement
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 3.0.9
   type: :development
   prerelease: false
-  version_requirements: *70184031636400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70184031635200 !ruby/object:Gem::Requirement
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70184031635200
-description: A replacement for ActiveResource for RESTful APIs that handles associated
-  object and multiple data sources
+  version_requirements: *id020
+description: A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources
 email: ejl6266@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .rspec
 - Gemfile
@@ -299,34 +300,35 @@ files:
 - spec/support/requests/error_resource_requests.rb
 - spec/support/requests/test_resource_requests.rb
 - spec/support/test_resource.rb
-has_rdoc: true
 homepage: http://github.com/ejlangev/resource
-licenses:
+licenses: 
 - MIT
 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'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 4425739189866565812
+      segments: 
       - 0
-      hash: -4465182740306650
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: A replacement for ActiveResource for RESTful APIs that handles associated
-  object and multiple data sources
+summary: A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources
 test_files: []
+