lazy_resource 0.3.3 → 0.4.0

data/README.md

@@ -46,7 +46,6 @@ Or install it yourself as:
 
     me = User.find(1)                                                    # => GET /users/1
     bobs = User.where(:first_name => 'Bob')                              # => GET /users?first_name=Bob
-    sam = User.find_by_first_name('Sam')                                 # => GET /users?first_name=Sam
     terry = User.new(:first_name => 'Terry', :last_name => 'Simpson')
     terry.save                                                           # => POST /users
     terry.last_name = 'Jackson'
@@ -96,6 +95,39 @@ was saved. Pretty neat, eh?
 Sure thing! Take a look at the files in the `examples` directory, or
 read through the specs.
 
+### How about a section of random features?
+
+Here you go:
+
+Fetch associations without hitting the URL generation code.
+
+    class Photo
+      include LazyResource::Resource
+
+      attribute :id, Fixnum
+      attribute :photographer_url, String
+      attribute :photographer, User, :using => :photographer_url
+
+      # or define it yourself
+      def photographer_url
+        "/path/to/photographer"
+      end
+    end
+
+Parsing responses like { 'photo': ... }
+
+    class Photo
+      include LazyResource::Resource
+
+      self.root_node_name = 'photo'
+    end
+
+or multiple options
+
+    class Photo
+      self.root_node_name = ['photo', 'photos']
+    end
+
 ## Contributing
 
 1. Fork it
@@ -129,5 +161,4 @@ Thanks to:
 ## TODO
 
  * Clean up `LazyResource::Attributes#create_setter`
- * Add more specs for associations
 

data/lazy_resource.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/lazy_resource/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Andrew Latimer"]
   gem.email         = ["andrew@elpasoera.com"]
-  gem.description   = %q{ActiveResource with it's feet up. The write less, do more consumer of delicious APIs.}
-  gem.summary       = %q{ActiveResource with it's feet up. The write less, do more consumer of delicious APIs.}
+  gem.description   = %q{ActiveResource with its feet up. The write less, do more consumer of delicious APIs.}
+  gem.summary       = %q{ActiveResource with its feet up. The write less, do more consumer of delicious APIs.}
   gem.homepage      = "http://github.com/ahlatimer/lazy_resource"
 
   gem.files         = `git ls-files`.split($\)
@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activemodel', '>= 3.1.0'
   gem.add_dependency 'activesupport', '>= 3.1.0'
   gem.add_dependency 'json', '>= 1.5.2'
-  gem.add_dependency 'typhoeus', '0.4.2'
+  gem.add_dependency 'typhoeus', '0.6.1'
 end

data/lib/lazy_resource/attributes.rb

@@ -73,8 +73,8 @@ module LazyResource
 
               if @#{name}.nil?
                 @#{name} = LazyResource::Relation.new(#{type.first}, :fetched => true)
+                request = LazyResource::Request.new(self.#{options[:using]}, @#{name}, :headers => @#{name}.headers)
                 @#{name}.fetched = false
-                request = LazyResource::Request.new(self.#{options[:using]}, @#{name})
                 self.class.request_queue.queue(request)
               end
 

data/lib/lazy_resource/ext/typhoeus.rb

@@ -1,7 +1,7 @@
 module Typhoeus
   class Hydra
     def run_with_logging
-      log = LazyResource.debug && LazyResource.logger && @multi.active > 0 && @multi.running <= 0
+      log = LazyResource.debug && LazyResource.logger && @multi.items_queued_but_not_running?
       if log
         LazyResource.logger.info "Processing requests:"
         start_time = Time.now
@@ -17,8 +17,12 @@ module Typhoeus
     alias_method :run_without_logging, :run
     alias_method :run, :run_with_logging
   end
+end
 
+module Ethon
   class Multi
-    attr_reader :active, :running
+    def items_queued_but_not_running?
+      easy_handles.size > 0 && running_count <= 0
+    end
   end
 end

data/lib/lazy_resource/http_mock.rb

@@ -4,14 +4,10 @@ module LazyResource
       [:post, :put, :get, :delete].each do |method|
         module_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{method}(path, body='', status=200, response_headers={})
-            request_queue.stub(:#{method}, path).and_return(Typhoeus::Response.new(:code => status, :headers => response_headers, :body => body, :time => 0.3))
+            Typhoeus.stub(path, :method => :#{method}).and_return(Typhoeus::Response.new(:code => status, :headers => response_headers, :body => body, :time => 0.3))
           end
         RUBY
       end
-
-      def request_queue
-        Thread.current[:request_queue] ||= Typhoeus::Hydra.new
-      end
     end
 
     class << self

data/lib/lazy_resource/mapping.rb

@@ -44,7 +44,7 @@ module LazyResource
       end
 
       def mapped_root_node_name(objects)
-        if self.root_node_name
+        if self.root_node_name && objects.respond_to?(:keys)
           root_node_names = self.root_node_name.is_a?(Array) ? self.root_node_name : [self.root_node_name]
           mapped_name = (root_node_names.map(&:to_s) & objects.keys).first
         end
@@ -53,6 +53,7 @@ module LazyResource
 
     def load(hash, persisted=true)
       hash.fetched = true and return hash if hash.kind_of?(LazyResource::Mapping)
+      return if hash.nil?
 
       self.tap do |resource|
         resource.persisted = persisted

data/lib/lazy_resource/relation.rb

@@ -42,10 +42,10 @@ module LazyResource
     def load(objects)
       @fetched = true
 
-      if @klass.root_node_name && objects.respond_to?(:key?) && objects.key?(@klass.root_node_name.to_s)
-        other_objects = objects.dup
-        objects = other_objects.delete(@klass.root_node_name.to_s)
-        @other_attributes = other_objects
+      if mapped_name = @klass.mapped_root_node_name(objects)
+        other_attributes = objects.dup
+        objects = other_attributes.delete(mapped_name)
+        @other_attributes = other_attributes
       end
 
       @result = objects.map do |object|

data/lib/lazy_resource/request.rb

@@ -14,18 +14,14 @@ module LazyResource
       super(url, options)
 
       @resource = resource
-      self.on_complete = on_complete_proc
-
-      self
-    end
-
-    def on_complete_proc
-      Proc.new do |response|
+      self.on_complete do
         log_response(response) if LazyResource.debug && LazyResource.logger
         @response = response
         handle_errors unless SUCCESS_STATUSES.include?(@response.code)
         parse
       end
+
+      self
     end
 
     def log_response(response)

data/lib/lazy_resource/version.rb

@@ -1,3 +1,3 @@
 module LazyResource
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/spec/lazy_resource/attributes_spec.rb

@@ -91,9 +91,9 @@ describe LazyResource::Attributes do
           end
 
           it 'finds a collection using the specified url' do
-            relation = LazyResource::Relation.new(Post)
+            relation = LazyResource::Relation.new(Post, :headers => {})
             request = LazyResource::Request.new(@foo.posts_url, relation)
-            LazyResource::Request.should_receive(:new).with(@foo.posts_url, relation).and_return(request)
+            LazyResource::Request.should_receive(:new).with(@foo.posts_url, relation, :headers => relation.headers).and_return(request)
             LazyResource::Relation.should_receive(:new).with(Post, :fetched => true).and_return(relation)
             @foo.class.request_queue.should_receive(:queue).with(request)
             @foo.fetched = false

data/spec/lazy_resource/ext/typhoeus_spec.rb

@@ -17,22 +17,22 @@ describe Typhoeus::Hydra do
     end
 
     it 'logs if logging is enabled, there are items to process, and the queue has not yet started processing' do
-      @multi.send(:instance_variable_set, "@active", 10)
-      @multi.send(:instance_variable_set, "@running", 0)
+      @multi.stub!(:easy_handles).and_return([1,2,3])
+      @multi.stub!(:running_count).and_return(0)
       LazyResource.logger.should_receive(:info).twice
       @hydra.run_with_logging
     end
 
     it 'does not log if there are no items to process' do
-      @multi.send(:instance_variable_set, "@active", 0)
-      @multi.send(:instance_variable_set, "@running", 0)
+      @multi.stub!(:easy_handles).and_return([])
+      @multi.stub!(:running_count).and_return(0)
       LazyResource.logger.should_not_receive(:info)
       @hydra.run_with_logging
     end
 
     it 'does not log if the queue is already being processed' do
-      @multi.send(:instance_variable_set, "@active", 10)
-      @multi.send(:instance_variable_set, "@running", 5)
+      @multi.stub!(:easy_handles).and_return([1,2,3])
+      @multi.stub!(:running_count).and_return(3)
       LazyResource.logger.should_not_receive(:info)
       @hydra.run_with_logging
     end

data/spec/lazy_resource/lazy_resource_spec.rb

@@ -24,7 +24,8 @@ describe LazyResource do
     it 'logs when a request completes' do
       LazyResource.logger.should_receive(:info)
       request = LazyResource::Request.new('http://example.com', User.new)
-      request.on_complete_proc.call(Typhoeus::Response.new)
+      request.response = Typhoeus::Response.new
+      request.execute_callbacks
     end
   end
 end

data/spec/lazy_resource/mapping_spec.rb

@@ -75,6 +75,18 @@ describe LazyResource::Mapping do
       user.comments.to_a.should == @comments
     end
 
+    it 'should not attempt to load nil associations' do
+      user = Foo.load({
+        :id => 123,
+        :name => 'Andrew',
+        :post => nil
+      })
+
+      user.id.should == 123
+      user.name.should == 'Andrew'
+      user.post.should == nil
+    end
+
     it 'loads an array of objects' do
       users = Foo.load([
         {
@@ -163,17 +175,44 @@ describe LazyResource::Mapping do
       user.other_attributes.should == { 'length' => 12 }
     end
 
-    it 'supports multiple root node names with a single resource' do
-      Foo.root_node_name = [:data, :datum]
-      user = Foo.new
-      user.load('data' => { :id => 123 })
-      user.id.should == 123
-    end
+    describe 'multiple root node names' do
+      it 'supports multiple root node names with an instantiated object' do
+        Foo.root_node_name = [:data, :datum]
+        user = Foo.new
+        user.load('data' => { :id => 123 })
+        user.id.should == 123
+      end
+
+      it 'suppors multiple root node names with a single resource' do
+        Foo.root_node_name = [:data, :datum]
+        user = Foo.load('data' => { :id => 123 })
+        user.id.should == 123
+      end
+
+      it 'supports multiple root node names with a collection' do
+        Foo.root_node_name = [:data, :datum]
+        users = Foo.load('data' => [{ :id => 123 }, { :id => 124 }])
+        users.map(&:id).should == [123, 124]
+      end
 
-    it 'supports multiple root node names with a collection' do
-      Foo.root_node_name = [:data, :datum]
-      users = Foo.load('data' => [{ :id => 123 }, { :id => 124 }])
-      users.map(&:id).should == [123, 124]
+      it 'sets any other attributes in the hash to #other_attributes for an instantiated object' do
+        Foo.root_node_name = [:data, :datum]
+        user = Foo.new
+        user.load('data' => { :id => 123 }, 'length' => 12)
+        user.other_attributes.should == { 'length' => 12 }
+      end
+
+      it 'sets any other attributes in the hash to #other_attributes for a single resource' do
+        Foo.root_node_name = [:data, :datum]
+        user = Foo.load('data' => { :id => 123 }, 'length' => 12)
+        user.other_attributes.should == { 'length' => 12 }
+      end
+
+      it 'sets any other attributes in the hash to #other_attributes for a collection' do
+        Foo.root_node_name = [:data, :datum]
+        users = Foo.load('data' => [{ :id => 123 }, { :id => 124 }], 'length' => 12)
+        users.other_attributes.should == { 'length' => 12 }
+      end
     end
   end
 

data/spec/lazy_resource/request_spec.rb

@@ -22,40 +22,18 @@ describe LazyResource::Request do
 
     it 'sets a default Accept header of application/json' do
       request = LazyResource::Request.new('http://example.com/api', nil)
-      headers = request.send(:instance_variable_get, "@headers")
-      headers[:Accept].should == 'application/json'
+      request.options[:headers][:Accept].should == 'application/json'
     end
 
     it 'sets the default method of GET' do
       request = LazyResource::Request.new('http://example.com/api', nil)
-      request.send(:instance_variable_get, "@method").should == :get
+      request.options[:method].should == :get
     end
 
     it 'merges the headers from the current thread' do
       Thread.current[:default_headers] = { :"X-Access-Token" => 'abc' }
       request = LazyResource::Request.new('http://example.com/api', nil)
-      headers = request.send(:instance_variable_get, "@headers")
-      headers[:"X-Access-Token"].should == 'abc'
-    end
-  end
-
-  describe '#on_complete_proc' do
-    it 'raises an error unless 200 or 201' do
-      request = LazyResource::Request.new('http://example.com', nil)
-      response = Typhoeus::Response.new(:code => 404, :headers => {}, :body => '', :time => 0.3)
-      lambda { request.on_complete_proc.call(response) }.should raise_error(LazyResource::ConnectionError)
-    end
-
-    it 'does not raise an error on 200' do
-      request = LazyResource::Request.new('http://example.com', SampleResource.new)
-      response = Typhoeus::Response.new(:code => 200)
-      lambda { request.on_complete_proc.call(response) }.should_not raise_error(StandardError)
-    end
-
-    it 'does not raise an error on 201' do
-      request = LazyResource::Request.new('http://example.com', SampleResource.new)
-      response = Typhoeus::Response.new(:code => 201)
-      lambda { request.on_complete_proc.call(response) }.should_not raise_error(StandardError)
+      request.options[:headers][:"X-Access-Token"].should == 'abc'
     end
   end
 

data/spec/lazy_resource/resource_spec.rb

@@ -3,10 +3,6 @@ require 'spec_helper'
 class Admin < User; end
 
 describe LazyResource::Resource do
-  before :each do
-    Thread.current[:request_queue].clear_stubs unless Thread.current[:request_queue].nil?
-  end
-
   describe '#new' do
     it 'creates an object with the specified attributes' do
       user = User.new({ :name => 'Andrew', :id => 123 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_resource
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,8 +74,8 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
-description: ActiveResource with it's feet up. The write less, do more consumer of
+        version: 0.6.1
+description: ActiveResource with its feet up. The write less, do more consumer of
   delicious APIs.
 email:
 - andrew@elpasoera.com
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -809900452515726390
+      hash: -3444122050560505401
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,13 +146,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -809900452515726390
+      hash: -3444122050560505401
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: ActiveResource with it's feet up. The write less, do more consumer of delicious
+summary: ActiveResource with its feet up. The write less, do more consumer of delicious
   APIs.
 test_files:
 - spec/fixtures/comment.rb