api_resource 0.6.0 → 0.6.1

data/.gitignore

@@ -21,6 +21,10 @@ pkg
 .swp
 .swo
 
+
+*.gem
+pkg/
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    api_resource (0.5.1)
-      activemodel
-      activesupport
+    api_resource (0.6.0)
+      colorize
+      differ
       json
       log4r
       rails
@@ -12,12 +12,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -25,18 +25,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -106,17 +106,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.10)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -162,8 +162,6 @@ PLATFORMS
 
 DEPENDENCIES
   api_resource!
-  colorize
-  differ
   faker
   flay
   flog

data/README.md

@@ -1,6 +1,6 @@
 # ApiResource
 
-TODO: Write a gem description
+[![Build Status](https://travis-ci.org/LifebookerInc/api_resource.png)](https://travis-ci.org/LifebookerInc/api_resource)
 
 ## Installation
 

data/api_resource.gemspec

@@ -33,14 +33,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rb-fsevent"
   gem.add_development_dependency "simplecov"
   # stuff that seems like crap
-  gem.add_development_dependency "differ"
-  gem.add_development_dependency "colorize"
   gem.add_development_dependency "sqlite3"
 
   gem.add_dependency "rails"
-  gem.add_dependency "activemodel"
-  gem.add_dependency "activesupport"
   gem.add_dependency "json"
   gem.add_dependency "rest-client"
   gem.add_dependency "log4r"
+  gem.add_dependency "differ"
+  gem.add_dependency "colorize"
 end

data/lib/api_resource/associations.rb

@@ -183,10 +183,19 @@ module ApiResource
           if self.ancestors.include?(ApiResource::Base)
             define_attribute_method(assoc_name)
           end
+
+          id_method_name = assoc_name.to_s.singularize + "_id"
+
+          if assoc_type.to_s == "has_many"
+            id_method_name += "s"
+          end
         
           # TODO: Come up with a better implementation for the foreign key thing
           # implement the rest of the active record methods, refactor this into something
-          # a littel bit more sensible
+          # a little bit more sensible
+
+          # TODO: This should support saving the ids when they are modified and saving anything
+          # that is not created, associations need to be their own object
           self.class_eval <<-EOE, __FILE__, __LINE__ + 1
             def #{assoc_name}
               @attributes_cache[:#{assoc_name}] ||= begin
@@ -200,17 +209,28 @@ module ApiResource
                 instance
               end
             end
-            def #{assoc_name}=(val)
-              # get old internal object
-              unless self.#{assoc_name}.internal_object == val
-                #{assoc_name}_will_change! 
+            def #{assoc_name}=(val, force = true)
+              if !force
+                #{assoc_name}_will_change!
+              elsif self.#{assoc_name}.internal_object != val
+                #{assoc_name}_will_change!
               end
+              # This should not force a load
               self.#{assoc_name}.internal_object = val
             end
             def #{assoc_name}?
               self.#{assoc_name}.internal_object.present?
             end
 
+            def #{id_method_name}
+              @attributes_cache[:#{id_method_name}] ||= 
+                  @attributes[:#{id_method_name}] || self.#{assoc_name}.collect(&:id)
+            end
+
+            def #{id_method_name}=(val)
+              @attributes_cache[:#{id_method_name}] = val
+            end
+
           EOE
         end
         

data/lib/api_resource/associations/has_one_remote_object_proxy.rb

@@ -17,8 +17,9 @@ module ApiResource
       end
       
       def load(opts = {})
+        res = Array.wrap(self.to_condition.load).first
         @loaded = true
-        Array.wrap(self.to_condition.find).first
+        res
       end
 
     end

data/lib/api_resource/associations/multi_object_proxy.rb

@@ -32,13 +32,19 @@ module ApiResource
 
         def internal_object=(contents)
           # if we were passed in a service uri, stop here
-          return true if self.set_remote_path(contents)
+          # but if we have a service uri already then don't overwrite
+          unless self.remote_path.present?
+            return true if self.set_remote_path(contents)
+          end
 
           if contents.try(:first).is_a?(self.klass)
-            return @internal_object = contents 
+            @loaded = true
+            return @internal_object = contents
           elsif contents.instance_of?(self.class)
+            @loaded = true
             return @internal_object = contents.internal_object
           elsif contents.is_a?(Array)
+            @loaded = true
             return @internal_object = self.klass.instantiate_collection(
               contents
             )
@@ -70,12 +76,15 @@ module ApiResource
         protected
 
         def to_condition
-          ApiResource::Conditions::MultiObjectAssociationCondition.new(self.klass, self.remote_path)
+          obj = nil
+          obj = self.internal_object if self.loaded?
+          ApiResource::Conditions::MultiObjectAssociationCondition.new(self.klass, self.remote_path, obj)
         end
 
         def load(opts = {})
+          res = self.to_condition.load
           @loaded = true
-          self.to_condition.find
+          res
         end
 
         def set_remote_path(opts)

data/lib/api_resource/associations/single_object_proxy.rb

@@ -22,8 +22,10 @@ module ApiResource
       
       def internal_object=(contents)
         if contents.is_a?(self.klass) || contents.nil?
+          @loaded = true
           return @internal_object = contents 
         elsif contents.is_a?(self.class)
+          @loaded = true
           return @internal_object = contents.internal_object
         # a Hash may be attributes and/or a service_uri
         elsif contents.is_a?(Hash) 
@@ -32,6 +34,7 @@ module ApiResource
             self.class.remote_path_element.to_sym
           )
           if contents.present?
+            @loaded = true
             return @internal_object = self.klass.instantiate_record(contents)
           end
         else
@@ -58,13 +61,17 @@ module ApiResource
       protected
 
       def to_condition
-        ApiResource::Conditions::SingleObjectAssociationCondition.new(self.klass, self.remote_path)
+        obj = nil
+        obj = self.internal_object if self.loaded?
+        ApiResource::Conditions::SingleObjectAssociationCondition.new(self.klass, self.remote_path, obj)
       end
 
       # Should make a proper conditions object and call find on it
+      # It MUST set loaded to true after calling load
       def load(opts = {})
+        res = self.to_condition.load
         @loaded = true
-        @internal_object = self.to_condition.find
+        res
       end
 
       

data/lib/api_resource/base.rb

@@ -341,6 +341,18 @@ module ApiResource
         connection.delete(element_path(id, options))
       end
 
+      # split an option hash into two hashes, one containing the prefix options,
+        # and the other containing the leftovers.
+      def split_options(options = {})
+        prefix_options, query_options = {}, {}
+        (options || {}).each do |key, value|
+          next if key.blank?
+          (prefix_parameters.include?(key.to_sym) ? prefix_options : query_options)[key.to_sym] = value
+        end
+
+        [ prefix_options, query_options ]
+      end
+
       protected
         def method_missing(meth, *args, &block)
           # make one attempt to load remote attrs
@@ -372,18 +384,6 @@ module ApiResource
           "?#{options.to_query}" unless options.nil? || options.empty?
         end
 
-        # split an option hash into two hashes, one containing the prefix options,
-        # and the other containing the leftovers.
-        def split_options(options = {})
-          prefix_options, query_options = {}, {}
-          (options || {}).each do |key, value|
-            next if key.blank?
-            (prefix_parameters.include?(key.to_sym) ? prefix_options : query_options)[key.to_sym] = value
-          end
-
-          [ prefix_options, query_options ]
-        end
-
         def uri_parser
           @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
         end

data/lib/api_resource/conditions.rb

@@ -16,6 +16,8 @@ module ApiResource
 
 			def includes(*args)
 
+				self.load_resource_definition
+
 				# everything in args must be an association
 				args.each do |arg|
 					unless self.association?(arg)

data/lib/api_resource/conditions/abstract_condition.rb

@@ -21,6 +21,8 @@ module ApiResource
 				@klass = klass
 
 				@conditions = args.with_indifferent_access
+
+				@klass.load_resource_definition
 			end
 
 			def each(&block)
@@ -48,14 +50,31 @@ module ApiResource
 			end
 
 			def internal_object
-				@internal_object ||= begin
-					@loaded = true
-					self.instantiate_finder.find
+				return @internal_object if @loaded
+				@internal_object = self.instantiate_finder.load
+				@loaded = true
+				@internal_object
+			end
+
+			def all(*args)
+				if args.blank?
+					self.internal_object
+				else
+					self.find(*([:all] + args))
 				end
 			end
 
-			alias_method :find, :internal_object
-			alias_method :all, :internal_object
+			# implement find that accepts an optional
+			# condition object 
+			def find(*args)
+				self.klass.find(*(args + [self]))
+			end
+
+			# TODO: review the hierarchy that makes this necessary
+			# consider changing it to alias method
+			def load
+				self.internal_object
+			end
 
 			def loaded?
 				@loaded == true

data/lib/api_resource/conditions/association_condition.rb

@@ -4,11 +4,12 @@ module ApiResource
 
 		class AssociationCondition < AbstractCondition
 
-			def initialize(klass, service_uri)
+			def initialize(klass, service_uri, internal_object= nil)
 				super({}, klass)
 
 				@assocaiton = true
 				@remote_path = service_uri
+				@internal_object = internal_object
 			end
 
 		end

data/lib/api_resource/conditions/multi_object_association_condition.rb

@@ -7,7 +7,7 @@ module ApiResource
 			protected
 
 			def instantiate_finder
-				ApiResource::Finders::MultiObjectAssociationFinder.new(self.klass, self)
+				ApiResource::Finders::MultiObjectAssociationFinder.new(self.klass, self, @internal_object)
 			end
 
 		end

data/lib/api_resource/conditions/single_object_association_condition.rb

@@ -9,7 +9,7 @@ module ApiResource
 			protected
 
 			def instantiate_finder
-				ApiResource::Finders::SingleObjectAssociationFinder.new(self.klass, self)
+				ApiResource::Finders::SingleObjectAssociationFinder.new(self.klass, self, @internal_object)
 			end
 
 		end

data/lib/api_resource/connection.rb

@@ -119,8 +119,7 @@ module ApiResource
           ActiveSupport::Notifications.instrument("request.api_resource") do |payload|
             
             # debug logging
-            ApiResource.logger.debug("#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}")
-            
+            ApiResource.logger.info("#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}")
             payload[:method]      = method
             payload[:request_uri] = "#{site.scheme}://#{site.host}:#{site.port}#{path}"
             payload[:result]      = http(path).send(method, *arguments)

data/lib/api_resource/finders.rb

@@ -7,6 +7,7 @@ module ApiResource
 
 		autoload :AbstractFinder
 		autoload :ResourceFinder
+    autoload :SingleFinder
 		autoload :SingleObjectAssociationFinder
 		autoload :MultiObjectAssociationFinder
 
@@ -16,22 +17,54 @@ module ApiResource
       # It accepts arguments of the form "scope", "options={}"
       # where options can be standard rails options or :expires_in. 
       # If :expires_in is set, it caches it for expires_in seconds.
-      def find(*arguments)
 
+      # Need to support the following cases
+      # => 1) Klass.find(1)
+      # => 2) Klass.find(:all, :params => {a => b})
+      # => 3) Klass.find(:first, :params => {a => b})
+      # => 4) Klass.includes(:assoc).find(1)
+      # => 5) Klass.active.find(1)
+      # => 6) Klass.includes(:assoc).find(:all, a => b)
+      def find(*arguments)
         # make sure we have class data before loading
         self.load_resource_definition
 
         scope   = arguments.slice!(0)
         options = arguments.slice!(0) || {}
-        
-        expiry = options.delete(:expires_in) || ApiResource::Base.ttl || 0
+        cond    = arguments.slice!(0)
+
+        # TODO: Make this into a class attribute properly (if it isn't already)
+        # this is a little bit of a hack because options can sometimes be a Condition
+        expiry = (options.is_a?(Hash) ? options.delete(:expires_in) : nil) || ApiResource::Base.ttl || 0
         ApiResource.with_ttl(expiry.to_f) do
           case scope
-            when :all   then find_every(options)
-            when :first then find_every(options).first
-            when :last  then find_every(options).last
-            when :one   then find_one(options)
-            else             find_single(scope, options)
+          when :all, :first, :last
+            final_cond = ApiResource::Conditions::ScopeCondition.new({}, self)
+            # we need new conditions here to take into account options, which could
+            # either be a Condition object or a hash
+            if options.is_a?(Hash)
+              opts = options.with_indifferent_access.delete(:params) || options || {}
+              final_cond = ApiResource::Conditions::ScopeCondition.new(opts, self)
+              # cond may be nil
+              unless cond == nil # THIS MUST BE == NOT nil?
+                final_cond = cond.merge!(final_cond)
+              end
+            elsif options.is_a?(ApiResource::Conditions::AbstractCondition)
+              final_cond = options
+            end
+            # now final cond contains all the conditions we should need to pass to the finder
+            fnd = ApiResource::Finders::ResourceFinder.new(self, final_cond)
+            fnd.send(scope)
+          else
+            # in this case scope is the id we want to find, and options should be a condition object or nil
+            final_cond = ApiResource::Conditions::ScopeCondition.new({:id => scope}, self)
+            if options.is_a?(ApiResource::Conditions::AbstractCondition)
+              final_cond = options.merge!(final_cond)
+            elsif options.is_a?(Hash)
+              opts = options.with_indifferent_access.delete(:params) || options || {}
+              final_cond = ApiResource::Conditions::ScopeCondition.new(opts, self).merge!(final_cond)
+            end
+            ApiResource::Finders::SingleFinder.new(self, final_cond).load
           end
         end
       end
@@ -75,47 +108,6 @@ module ApiResource
         ret
       end
 
-      private
-
-        # Find every resource
-        def find_every(options)
-          begin
-            case from = options[:from]
-            when Symbol
-              instantiate_collection(get(from, options[:params]))
-            when String
-              path = "#{from}#{query_string(options[:params])}"
-              instantiate_collection(connection.get(path, headers) || [])
-            else
-              prefix_options, query_options = split_options(options[:params])
-              path = collection_path(prefix_options, query_options)
-              instantiate_collection( (connection.get(path, headers) || []))
-            end
-          rescue ApiResource::ResourceNotFound
-            # Swallowing ResourceNotFound exceptions and return nil - as per
-            # ActiveRecord.
-            nil
-          end
-        end
-
-        # Find a single resource from a one-off URL
-        def find_one(options)
-          case from = options[:from]
-          when Symbol
-            instantiate_record(get(from, options[:params]))
-          when String
-            path = "#{from}#{query_string(options[:params])}"
-            instantiate_record(connection.get(path, headers))
-          end
-        end
-
-        # Find a single resource from the default URL
-        def find_single(scope, options)
-          prefix_options, query_options = split_options(options[:params])
-          path = element_path(scope, prefix_options, query_options)
-          instantiate_record(connection.get(path, headers))
-        end
-
 		end 
 	end
 

data/lib/api_resource/finders/abstract_finder.rb

@@ -9,16 +9,17 @@ module ApiResource
 			attr_reader :found, :internal_object
 
 			# TODO: Make this list longer since there are for sure more methods to delegate
-			delegate :to_s, :inspect, :reload, :present?, :blank?, :size, :to => :internal_object
+			delegate :to_s, :inspect, :reload, :present?, :blank?, :size, :count, :to => :internal_object
 
 			def initialize(klass, condition)
 				@klass = klass
 				@condition = condition
 				@found = false
-				@internal_object = nil
+
+				@klass.load_resource_definition
 			end
 
-			def find
+			def load
 				raise NotImplementedError("Must be defined in a subclass")
 			end
 
@@ -27,8 +28,16 @@ module ApiResource
 				if instance_variable_defined?(:@internal_object)
 					return instance_variable_get(:@internal_object)
 				end
-				# If we haven't tried to load then just call find
-				self.find
+				# If we haven't tried to load then just call load
+				self.load
+			end
+
+			def all(*args)
+				if args.blank?
+					self.internal_object
+				else
+					self.klass.send(:all, *args)
+				end
 			end
 
 			# proxy unknown methods to the internal_object
@@ -51,9 +60,10 @@ module ApiResource
 				id_hash = HashWithIndifferentAccess.new(id_hash)
 				# load each individually
 				self.condition.included_objects.inject(hsh) do |accum, assoc|
-					accum[assoc.to_sym] = self.klass.association_class(assoc).find(
-						:all, 
-						:id => id_hash[assoc])
+					accum[assoc.to_sym] = self.klass.association_class(assoc).all( 
+						:params => {:ids => id_hash[assoc]}
+					)
+					accum
 				end
 
 				hsh
@@ -62,9 +72,15 @@ module ApiResource
 			def apply_includes(objects, includes)
 				Array.wrap(objects).each do |obj|
 					includes.each_pair do |assoc, vals|
-						ids_to_keep = obj.send(obj.class.association_foreign_key_field(assoc))
+						ids_to_keep = Array.wrap(obj.send(obj.class.association_foreign_key_field(assoc)))
 						to_keep = vals.select{|elm| ids_to_keep.include?(elm.id)}
-						obj.send("#{assoc}=", to_keep)
+						# if this is a single association take the first
+						# TODO: subclass instead of this
+						if self.klass.has_many?(assoc)
+							obj.send("#{assoc}=", to_keep, false)
+						else
+							obj.send("#{assoc}=", to_keep.first, false)
+						end
 					end
 				end
 			end

data/lib/api_resource/finders/multi_object_association_finder.rb

@@ -4,17 +4,28 @@ module ApiResource
 
 		class MultiObjectAssociationFinder < AbstractFinder
 
-			def find
+			# If they pass in the internal object just skip the first
+			# step and apply the includes
+			def initialize(klass, condition, internal_object = nil)
+				super(klass, condition)
+
+				@internal_object = internal_object
+			end
+
+			def load
 				# otherwise just instantiate the record
 				unless self.condition.remote_path
 					raise "Tried to load association without a remote path"
 				end
 
-				data = self.klass.connection.get(self.build_load_path)
-				@loaded = true
-				return [] if data.blank?
+				unless @internal_object
+					data = self.klass.connection.get(self.build_load_path)
+					return [] if data.blank?
 
-				@internal_object = self.klass.instantiate_collection(data)
+					@internal_object = self.klass.instantiate_collection(data)
+				end
+
+				@loaded = true
 
 				id_hash = self.condition.included_objects.inject({}) do |accum, assoc|
 					accum[assoc] = @internal_object.collect do |obj|

data/lib/api_resource/finders/resource_finder.rb

@@ -6,26 +6,42 @@ module ApiResource
 
 			# this is a little bit simpler, it's always a collection and does
 			# not require a remote path
-			def find
-				@loaded = true
-				@internal_object = self.klass.find(:all, self.condition.to_hash)
-				return [] if @internal_object.blank?
-
-				id_hash = self.condition.included_objects.inject({}) do |accum, assoc|
-					accum[assoc] = @internal_object.collect do |obj|
-						obj.send(self.klass.association_foreign_key_field(assoc))
+			def load
+				begin
+					@loaded = true
+					@internal_object = self.klass.connection.get(self.build_load_path)
+					return [] if @internal_object.blank?
+
+					@internal_object = self.klass.instantiate_collection(@internal_object)
+
+					id_hash = self.condition.included_objects.inject({}) do |accum, assoc|
+						accum[assoc] = @internal_object.collect do |obj|
+							obj.send(self.klass.association_foreign_key_field(assoc))
+						end
+						accum[assoc].flatten!
+						accum[assoc].uniq!
+						accum
 					end
-					accum[assoc].flatten!
-					accum[assoc].uniq!
-					accum
-				end
-				included_objects = self.load_includes(id_hash)
+					included_objects = self.load_includes(id_hash)
 
-				self.apply_includes(@internal_object, included_objects)
+					self.apply_includes(@internal_object, included_objects)
 
-				return @internal_object
+					return @internal_object
+				rescue ApiResource::ResourceNotFound
+					nil
+				end
+				@internal_object
 			end
 
+			protected
+
+
+        # Find every resource
+        def build_load_path
+        	prefix_opts, query_opts = self.klass.split_options(self.condition.to_hash)
+	        self.klass.collection_path(prefix_opts, query_opts)
+        end
+
 		end
 
 	end

data/lib/api_resource/finders/single_finder.rb

@@ -0,0 +1,45 @@
+module ApiResource
+
+	module Finders
+
+		class SingleFinder < AbstractFinder
+
+			def load
+				data = self.klass.connection.get(self.build_load_path)
+				@loaded = true
+				return nil if data.blank?
+				@internal_object = self.klass.instantiate_record(data)
+				# now that the object is loaded, resolve the includes
+				id_hash = self.condition.included_objects.inject({}) do |accum, assoc|
+					accum[assoc] = Array.wrap(
+						@internal_object.send(
+							@internal_object.class.association_foreign_key_field(assoc)
+						)
+					)
+					accum
+				end
+
+				included_objects = self.load_includes(id_hash)
+
+				self.apply_includes(@internal_object, included_objects)
+
+				return @internal_object
+			end
+
+			protected
+
+			def build_load_path
+				if self.condition.to_hash["id"].nil?
+					raise "Invalid evaluation of a SingleFinder without an ID"
+				end
+				args = self.condition.to_hash
+				id = args.delete("id")
+				prefix_opts, query_opts = self.klass.split_options(args)
+	      self.klass.element_path(id, prefix_opts, query_opts)
+	    end
+
+		end
+
+	end
+
+end

data/lib/api_resource/finders/single_object_association_finder.rb

@@ -4,18 +4,28 @@ module ApiResource
 
 		class SingleObjectAssociationFinder < AbstractFinder
 
+			def initialize(klass, condition, internal_object = nil)
+				super(klass, condition)
+
+				@internal_object = internal_object
+			end
+
 			# since it is only a single object we can just load from
 			# the service_uri and deal with includes
-			def find
+			def load
 				# otherwise just instantiate the record
 				unless self.condition.remote_path
 					raise "Tried to load association without a remote path"
 				end
 
-				data = self.klass.connection.get(self.build_load_path)
+				unless @internal_object
+					data = self.klass.connection.get(self.build_load_path)
+					
+					return nil if data.blank?
+					@internal_object = self.klass.instantiate_record(data)
+				end
+
 				@loaded = true
-				return nil if data.blank?
-				@internal_object = self.klass.instantiate_record(data)
 				# now that the object is loaded, resolve the includes
 				id_hash = self.condition.included_objects.inject({}) do |accum, assoc|
 					accum[assoc] = Array.wrap(

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/lib/associations_spec.rb

@@ -729,6 +729,7 @@ describe "Associations" do
           TestAR.class_eval do 
             belongs_to_remote :my_favorite_thing, :class_name => "TestClassYay"
           end
+          HasManyObject.reload_resource_definition
         end
         it "should define remote association types for AR" do
           [:has_many_remote, :belongs_to_remote, :has_one_remote].each do |assoc|
@@ -788,6 +789,7 @@ describe "Associations" do
           it "should attempt to load a collection of remote objects for a has_many relationship" do
             tar = TestAR.new
             tar.stubs(:id).returns(1)
+            HasManyObject.load_resource_definition
             HasManyObject.connection.expects(:get).with("/has_many_objects.json?test_ar_id=1").once.returns([{"name" => "testing"}])
             # load the test resource
             tar.has_many_objects.first.name.should eql "testing"

data/spec/lib/base_spec.rb

@@ -7,6 +7,8 @@ describe "Base" do
   
   before(:each) do
     TestResource.reload_resource_definition
+    HasOneObject.reload_resource_definition
+    HasManyObject.reload_resource_definition
   end
 
   context ".new_element_path" do
@@ -795,6 +797,7 @@ describe "Base" do
 
     before(:all) do
       HasOneObject.reload_resource_definition
+      HasManyObject.load_resource_definition
     end
     
     it "should know if it is persisted" do

data/spec/lib/conditions/abstract_conditions_spec.rb

@@ -61,7 +61,7 @@ describe "Conditions" do
 	it "should create a resource finder when forced to load, and cache the result" do
 		obj = TestResource.includes(:has_many_objects)
 
-		ApiResource::Finders::ResourceFinder.expects(:new).with(TestResource, obj).returns(mock(:find => [1]))
+		ApiResource::Finders::ResourceFinder.expects(:new).with(TestResource, obj).returns(mock(:load => [1]))
 		obj.internal_object.should eql([1])
 		obj.all.should eql([1])
 		obj.first.should eql(1)
@@ -70,7 +70,7 @@ describe "Conditions" do
 	it "should proxy calls to enumerable and array methods to the loaded object" do
 		obj = TestResource.includes(:has_many_objects)
 
-		ApiResource::Finders::ResourceFinder.expects(:new).with(TestResource, obj).returns(mock(:find => [1,2]))
+		ApiResource::Finders::ResourceFinder.expects(:new).with(TestResource, obj).returns(mock(:load => [1,2]))
 
 		obj.collect{|o| o * 2}.should eql([2,4])
 	end

data/spec/lib/finders/multi_object_association_finder_spec.rb

@@ -12,7 +12,7 @@ describe "MultiObjectAssociationFinder" do
 		ApiResource::Finders::MultiObjectAssociationFinder.new(
 			TestResource,
 			stub(:remote_path => "test_resources", :to_query => "id[]=1&id[]=2", :blank_conditions? => false)
-		).find
+		).load
 	end
 
 	it "should load a has many association properly" do
@@ -37,7 +37,7 @@ describe "MultiObjectAssociationFinder" do
 		finder.expects(:load_includes).with(:has_many_objects => [1,2]).returns(5)
 		finder.expects(:apply_includes).with([tr], 5).returns(6)
 
-		finder.find.should eql([tr])
+		finder.load.should eql([tr])
 	end
 
 end

data/spec/lib/finders/resource_finder_spec.rb

@@ -4,83 +4,72 @@ describe "ResourceFinder" do
 
 	before(:each) do
 		TestResource.reload_resource_definition
+
 	end
 
-	it "should call find on the class normally without includes" do
-		TestResource.expects(:find).with(:all, {})
+	it "should load normally without includes using connection.get" do
+		TestResource.connection.expects(:get).with("/test_resources.json")
 
 		ApiResource::Finders::ResourceFinder.new(
 			TestResource,
 			mock(:to_hash => {})
-		).find
+		).load
 	end
 
-	it "should pass conditions into the finder method" do
-		TestResource.expects(:find).with(:all, {:id => [1,2,3]})
+	it "should pass conditions into the connection get method" do
+		TestResource.connection.expects(:get).with("/test_resources.json?ids%5B%5D=1&ids%5B%5D=2&ids%5B%5D=3")
 
 		ApiResource::Finders::ResourceFinder.new(
 			TestResource, 
-			mock(:to_hash => {:id => [1,2,3]})
-		).find
+			mock(:to_hash => {:ids => [1,2,3]})
+		).load
 	end
 
 	it "should try to load includes if it finds an object" do
-		obj_mock = mock(:id => 1)
+		obj_mock = {:id => 1}
 
-		TestResource.expects(:find).with(:all, {}).returns([obj_mock])
+		TestResource.connection.expects(:get).with("/test_resources.json").returns([obj_mock])
 
 		obj = ApiResource::Finders::ResourceFinder.new(
 			TestResource,
 			stub(:to_hash => {}, :eager_load? => false, :included_objects => [])
-		).find
+		).load
 
-		obj.first.id.should eql(1)
+	#	obj.first.id.should eql(1)
 	end
 
 	it "should load and distribute includes among the returned objects" do
-		inc_mock = stub(:id => 1)
-		inc_mock2 = stub(:id => 2)
-
-		tr = TestResource.new
-		tr.stubs(:id).returns(1)
-		tr.stubs(:has_many_object_ids).returns([1,2])
-		tr.expects(:has_many_objects=).with([inc_mock, inc_mock2])
-		tr.expects(:has_many_objects).returns([inc_mock, inc_mock2])
+		inc_mock = {:id => 1}
+		inc_mock2 = {:id => 2}
 
-		TestResource.expects(:find).with(:all, {}).returns([tr])
+		TestResource.connection.expects(:get)
+				.with("/test_resources.json")
+				.returns([{:id => 1, :has_many_object_ids => [1,2]}])
 
-		HasManyObject.expects(:find).with(:all, :id => [1,2]).returns([inc_mock, inc_mock2])
+		HasManyObject.connection.expects(:get)
+				.with("/has_many_objects.json?ids%5B%5D=1&ids%5B%5D=2")
+				.returns([inc_mock, inc_mock2])
 
 		obj = ApiResource::Finders::ResourceFinder.new(
 			TestResource,
 			stub(:to_hash => {}, :eager_load? => true, :included_objects => [:has_many_objects])
-		).find
+		).load
 		obj.first.has_many_objects.collect(&:id).should eql([1,2])
 	end
 
 	it "should work with loading for multiple objects" do
-		inc_mock = stub(:id => 1)
-		inc_mock2 = stub(:id => 2)
-
-		tr = TestResource.new
-		tr.stubs(:id).returns(1)
-		tr.stubs(:has_many_object_ids).returns([1])
-		tr.expects(:has_many_objects=).with([inc_mock]).returns([inc_mock])
-		tr.expects(:has_many_objects).returns([inc_mock])
-
-		tr2 = TestResource.new
-		tr2.stubs(:id).returns(2)
-		tr2.stubs(:has_many_object_ids).returns([2])
-		tr2.expects(:has_many_objects=).with([inc_mock2]).returns([inc_mock2])
-		tr2.expects(:has_many_objects).returns([inc_mock2])
-
-		TestResource.expects(:find).with(:all, {}).returns([tr, tr2])
-		HasManyObject.expects(:find).with(:all, :id => [1,2]).returns([inc_mock2, inc_mock])
+		TestResource.connection.expects(:get).with("/test_resources.json").returns([
+			{:id => 1, :has_many_object_ids => [1]},
+			{:id => 2, :has_many_object_ids => [2]}
+		])
+		HasManyObject.connection.expects(:get)
+								 .with("/has_many_objects.json?ids%5B%5D=1&ids%5B%5D=2")
+								 .returns([{:id => 1}, {:id => 2}])
 
 		obj = ApiResource::Finders::ResourceFinder.new(
 			TestResource,
 			stub(:to_hash => {}, :eager_load? => true, :included_objects => [:has_many_objects])
-		).find
+		).load
 
 		obj.first.has_many_objects.collect(&:id).should eql([1])
 		obj.second.has_many_objects.collect(&:id).should eql([2])

data/spec/lib/finders/single_object_association_finder_spec.rb

@@ -12,7 +12,7 @@ describe "SingleObjectAssociationFinder" do
 		ApiResource::Finders::SingleObjectAssociationFinder.new(
 			TestResource,
 			stub(:remote_path => "test_resources", :to_query => "id[]=1&id[]=2", :blank_conditions? => false)
-		).find
+		).load
 	end
 
 	it "should load a has many association properly" do
@@ -37,7 +37,7 @@ describe "SingleObjectAssociationFinder" do
 		finder.expects(:load_includes).with(:has_many_objects => [1,2]).returns(5)
 		finder.expects(:apply_includes).with(tr, 5).returns(6)
 
-		finder.find.should eql(tr)
+		finder.load.should eql(tr)
 	end
 
 end

data/spec/lib/finders_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ApiResource::Finders do
+
+	before(:each) do
+		TestResource.reload_resource_definition
+	end
+
+	it "should be able to find a single object" do
+		TestResource.connection.expects(:get).with("/test_resources/1.json")
+
+		TestResource.find(1)
+	end
+
+	it "should be able to find with parameters, params syntax" do
+		TestResource.connection.expects(:get).with("/test_resources.json?active=true")
+		TestResource.all(:params => {:active => true})
+	end
+
+	it "should be able to find with parameters without the params syntax" do
+		TestResource.connection.expects(:get).with("/test_resources.json?active=true&passive=false")
+
+		TestResource.all(:active => true, :passive => false)
+	end
+
+	it "should be able to chain find on top of a scope" do
+		TestResource.connection.expects(:get).with("/test_resources.json?active=true&passive=true")
+		TestResource.active.all(:passive => true)
+	end
+
+	it "should be able to chain find on top of an includes call" do
+		TestResource.connection.expects(:get).with("/test_resources/1.json").returns({"id" => 1, "has_many_object_ids" => [1,2]})
+		HasManyObject.connection.expects(:get).with("/has_many_objects.json?ids%5B%5D=1&ids%5B%5D=2").returns([])
+
+		TestResource.includes(:has_many_objects).find(1)
+	end
+
+end

data/spec/lib/prefixes_spec.rb

@@ -15,8 +15,7 @@ describe "With Prefixes" do
     it "should use the prefix to find a single record when given as a param" do
       PrefixModel.connection.expects(:get)
         .with(
-          "/foreign/123/prefix_models/456.json",
-          instance_of(Hash)
+          "/foreign/123/prefix_models/456.json"
         )
         .returns({})
       PrefixModel.find(456, :params => {:foreign_key_id => 123})
@@ -25,8 +24,7 @@ describe "With Prefixes" do
     it "should not use the prefix to find a single record when not given as a param to avoid automatic failure" do
       PrefixModel.connection.expects(:get)
         .with(
-          "/prefix_models/456.json",
-          instance_of(Hash)
+          "/prefix_models/456.json"
         )
         .returns({})
       PrefixModel.find(456)
@@ -52,8 +50,7 @@ describe "With Prefixes" do
     it "should use the prefix to find records" do
       prefix_model.send(:connection).expects(:get)
         .with(
-          "/foreign/123/prefix_models.json", 
-          instance_of(Hash)
+          "/foreign/123/prefix_models.json"
         )
         .returns([])
       PrefixModel.first(:params => {:foreign_key_id => 123})
@@ -62,8 +59,7 @@ describe "With Prefixes" do
     it "should not use the prefix to find records when not given as a param to avoid automatic failure" do
       prefix_model.send(:connection).expects(:get)
         .with(
-          "/prefix_models.json", 
-          instance_of(Hash)
+          "/prefix_models.json"
         )
         .returns([])
       PrefixModel.first
@@ -94,6 +90,7 @@ describe "With Prefixes" do
       prefix_model.name = "changed name"
       prefix_model.send(:connection).expects(:put)
         .with(
+
           "/foreign/123/prefix_models/456.json", 
           {"prefix_model" => {"name" => "changed name"}}.to_json,
           instance_of(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -237,38 +237,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: differ
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +270,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -318,7 +286,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -334,7 +302,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: log4r
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -350,7 +318,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: differ
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -366,7 +334,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: log4r
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -432,6 +400,7 @@ files:
 - lib/api_resource/finders/abstract_finder.rb
 - lib/api_resource/finders/multi_object_association_finder.rb
 - lib/api_resource/finders/resource_finder.rb
+- lib/api_resource/finders/single_finder.rb
 - lib/api_resource/finders/single_object_association_finder.rb
 - lib/api_resource/formats.rb
 - lib/api_resource/formats/json_format.rb
@@ -464,6 +433,7 @@ files:
 - spec/lib/finders/multi_object_association_finder_spec.rb
 - spec/lib/finders/resource_finder_spec.rb
 - spec/lib/finders/single_object_association_finder_spec.rb
+- spec/lib/finders_spec.rb
 - spec/lib/local_spec.rb
 - spec/lib/mocks_spec.rb
 - spec/lib/model_errors_spec.rb
@@ -523,6 +493,7 @@ test_files:
 - spec/lib/finders/multi_object_association_finder_spec.rb
 - spec/lib/finders/resource_finder_spec.rb
 - spec/lib/finders/single_object_association_finder_spec.rb
+- spec/lib/finders_spec.rb
 - spec/lib/local_spec.rb
 - spec/lib/mocks_spec.rb
 - spec/lib/model_errors_spec.rb