lazy_resource 0.4.0 → 0.5.0

data/spec/lazy_resource/ext/typhoeus_spec.rb

@@ -6,35 +6,66 @@ class SimpleLogger
   end
 end
 
-describe Typhoeus::Hydra do
+describe "Logging added to Typhoeus" do
+  before :each do
+    LazyResource.debug = true
+    LazyResource.logger = SimpleLogger.new
+    @hydra = Thread.current[:request_queue] = Typhoeus::Hydra.new(:max_concurrency => LazyResource.max_concurrency)
+
+    LazyResource::HttpMock.respond_to do |responder|
+      responder.get('http://example.com', '')
+      responder.get('http://example.com/users/1', { :name => 'Andrew' }.to_json)
+    end
+  end
+
   describe '#run_with_logging' do
     before :each do
-      LazyResource.debug = true
-      LazyResource.logger = SimpleLogger.new
-      @hydra = Typhoeus::Hydra.new
       @hydra.stub!(:run_without_logging)
       @multi = @hydra.send(:instance_variable_get, :"@multi")
     end
 
     it 'logs if logging is enabled, there are items to process, and the queue has not yet started processing' do
-      @multi.stub!(:easy_handles).and_return([1,2,3])
-      @multi.stub!(:running_count).and_return(0)
-      LazyResource.logger.should_receive(:info).twice
+      @multi.stub(:easy_handles).and_return([1,2,3])
+      @multi.stub(:running_count).and_return(0)
+      ActiveSupport::Notifications.should_receive(:instrument).twice
       @hydra.run_with_logging
     end
 
     it 'does not log if there are no items to process' do
-      @multi.stub!(:easy_handles).and_return([])
-      @multi.stub!(:running_count).and_return(0)
-      LazyResource.logger.should_not_receive(:info)
+      @multi.stub(:easy_handles).and_return([])
+      @multi.stub(:running_count).and_return(0)
+      ActiveSupport::Notifications.should_not_receive(:instrument)
       @hydra.run_with_logging
     end
 
     it 'does not log if the queue is already being processed' do
-      @multi.stub!(:easy_handles).and_return([1,2,3])
-      @multi.stub!(:running_count).and_return(3)
-      LazyResource.logger.should_not_receive(:info)
+      @multi.stub(:easy_handles).and_return([1,2,3])
+      @multi.stub(:running_count).and_return(3)
+      ActiveSupport::Notifications.should_not_receive(:instrument)
       @hydra.run_with_logging
     end
   end
+
+  describe '#items_queued?' do
+    it 'returns true if there are items queued' do
+      3.times { User.find(1) }
+      @hydra.items_queued?.should == true
+    end
+  end
+
+  describe 'logging' do
+    it 'logs if logging is enabled, there are items to process, and the queue has not yet started processing' do
+      users = []
+      3.times { users << User.find(1) }
+      # twice for the start/end, and once each for every user (3)
+      ActiveSupport::Notifications.should_receive(:instrument).exactly(5).times
+      users.each { |u| u.name }
+    end
+
+    it 'does not log if there are no items to process' do
+      users = User.find(1)
+      users.name
+      ActiveSupport::Notifications.should_not_receive(:instrument)
+    end
+  end
 end

data/spec/lazy_resource/lazy_resource_spec.rb

@@ -22,10 +22,35 @@ describe LazyResource do
 
   describe '#debug' do
     it 'logs when a request completes' do
-      LazyResource.logger.should_receive(:info)
+      ActiveSupport::Notifications.should_receive(:instrument).with('request.lazy_resource', kind_of(Hash))
       request = LazyResource::Request.new('http://example.com', User.new)
       request.response = Typhoeus::Response.new
       request.execute_callbacks
     end
   end
+
+  describe '#deprecate' do
+    it 'logs a message about a deprecation' do
+      LazyResource.logger.should_receive(:info).with("a deprecation from file.rb#123")
+      LazyResource.deprecate('a deprecation', 'file.rb', 123)
+    end
+  end
+
+  describe '#max_concurrency=' do
+    it 'sets the max_concurrency' do
+      LazyResource.max_concurrency = 100
+      LazyResource.max_concurrency.should == 100
+    end
+  end
+
+  describe '#max_concurrency' do
+    before :each do
+      Thread.current[:request_queue] = nil
+    end
+
+    it 'determines the amount of maximum concurrent requests Hydra will make' do
+      LazyResource.max_concurrency = 100
+      User.request_queue.max_concurrency.should == 100
+    end
+  end
 end

data/spec/lazy_resource/log_subscriber_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe LazyResource::LogSubscriber do
+  let(:event) do
+    OpenStruct.new({
+      payload: {
+        code: 200,
+        time: 5,
+        url: "http://google.com"
+      }
+    })
+  end
+
+  describe '#request' do
+    subject { LazyResource::LogSubscriber.new }
+
+    before do
+      LazyResource::LogSubscriber.attach_to(:lazy_resource)
+
+      subject.stub(:info) do |message|
+        message
+      end
+    end
+
+    it 'logs the request using the info level' do
+      subject.should_receive(:info).with(any_args)
+      subject.request(event)
+    end
+
+    it 'includes the response code' do
+      subject.request(event).should =~ /200/
+    end
+
+    it 'includes the response time' do
+      subject.request(event).should =~ /5000ms/
+    end
+
+    it 'includes the request url' do
+      subject.request(event).should =~ /http:\/\/google\.com/
+    end
+
+    after do
+      ActiveSupport::LogSubscriber.log_subscribers.clear
+    end
+  end
+end

data/spec/lazy_resource/relation_spec.rb

@@ -173,5 +173,30 @@ describe LazyResource::Relation do
       relation = LazyResource::Relation.new(User)
       lambda { relation.foo }.should raise_error(NoMethodError)
     end
+
+    it 'raises an error if request_error is set' do
+      relation = LazyResource::Relation.new(User, fetched: true)
+      relation.request_error = StandardError.new
+      lambda { relation.to_a }.should raise_error(StandardError)
+    end
+  end
+
+  describe '#method' do
+    it 'returns the provided method as a symbol' do
+      relation = LazyResource::Relation.new(User)
+      relation.method = 'post'
+      relation.method.should == :post
+    end
+
+    it 'downcases the returned method' do
+      relation = LazyResource::Relation.new(User)
+      relation.method = 'POST'
+      relation.method.should == :post
+    end
+
+    it 'returns nil when no method has been provided' do
+      relation = LazyResource::Relation.new(User)
+      relation.method.should be_nil
+    end
   end
 end

data/spec/lazy_resource/request_spec.rb

@@ -18,6 +18,7 @@ describe LazyResource::Request do
 
     after :each do
       Thread.current[:default_headers] = nil
+      Thread.current[:default_params] = nil
     end
 
     it 'sets a default Accept header of application/json' do
@@ -35,6 +36,12 @@ describe LazyResource::Request do
       request = LazyResource::Request.new('http://example.com/api', nil)
       request.options[:headers][:"X-Access-Token"].should == 'abc'
     end
+
+    it 'merged the params from the current thread' do
+      Thread.current[:default_params] = { :"access_token" => 'abc' }
+      request = LazyResource::Request.new('https://example.com/api', nil)
+      request.options[:params][:"access_token"].should == 'abc'
+    end
   end
 
   describe '#parse' do
@@ -86,7 +93,7 @@ describe LazyResource::Request do
     end
   end
 
-  describe '#handle_errors' do
+  describe '#error' do
     [
       [301, LazyResource::Redirection],
       [400, LazyResource::BadRequest],
@@ -100,11 +107,11 @@ describe LazyResource::Request do
       [500, LazyResource::ServerError]
     ].each do |error|
       describe "status: #{error[0]}" do
-        it "raises #{error[1]}" do
+        it "returns #{error[1]}" do
           request = LazyResource::Request.new('http://example.com', nil)
           response = Typhoeus::Response.new(:code => error[0], :headers => {}, :body => '', :time => 0.3)
           request.response = response
-          lambda { request.handle_errors }.should raise_error(error[1])
+          request.error.should be_a(error[1])
         end
       end
     end
@@ -114,7 +121,7 @@ describe LazyResource::Request do
         request = LazyResource::Request.new('http://example.com', nil)
         response = Typhoeus::Response.new(:code => 402, :headers => {}, :body => '', :time => 0.3)
         request.response = response
-        lambda { request.handle_errors }.should raise_error(LazyResource::ClientError)
+        request.error.should be_a(LazyResource::ClientError)
       end
     end
   end

data/spec/lazy_resource/resource_queue_spec.rb

@@ -44,6 +44,7 @@ describe LazyResource::ResourceQueue do
     it 'sends the requests to the request queue and runs the request queue' do
       @queue.queue(@relation)
       @queue.should_receive(:send_to_request_queue!)
+      @queue.request_queue.stub(:items_queued?).and_return(true)
       @queue.request_queue.should_receive(:run)
       @queue.run
     end
@@ -56,11 +57,57 @@ describe LazyResource::ResourceQueue do
       @queue.send_to_request_queue!
       @queue.instance_variable_get("@queue").should == []
     end
+
+    it 'sends the request to the queue using the relation\'s specified method' do
+      LazyResource::Request
+        .should_receive(:new)
+        .with(anything(), anything(), hash_including(:method => :post))
+        .and_call_original
+
+      @relation.method = :post
+      @queue.queue(@relation)
+      @queue.send_to_request_queue!
+    end
   end
 
   describe '#url_for' do
     it 'creates a URL for the given resource' do
       @queue.url_for(@relation).should == 'http://example.com/users'
     end
+
+    it 'respects the "from" option when set on a Relation object' do
+      @relation.from = 'people'
+      @queue.url_for(@relation).should == 'http://example.com/people'
+    end
+
+    it 'respects the "from" option when set on a Resource class' do
+      User.from = 'people'
+      @queue.url_for(@relation).should == 'http://example.com/people'
+      User.from = nil
+    end
+
+    context 'using Relation#route' do
+      before :each do
+        @relation = User.where(:_route => '/people/:name')
+      end
+
+      it 'respects the route' do
+        @queue.url_for(@relation).should == 'http://example.com/people/:name'
+      end
+
+      it 'interpolates the route with where_values' do
+        @relation.where(:name => 'Andrew')
+        @queue.url_for(@relation).should == 'http://example.com/people/Andrew'
+      end
+
+      it 'adds the Relation\'s host if one is not already present' do
+        @queue.url_for(@relation).should == 'http://example.com/people/:name'
+      end
+
+      it 'does not add the Relation\'s host if one is already present' do
+        @relation = User.where(:_route => 'http://another_example.com/people/:name')
+        @queue.url_for(@relation).should == 'http://another_example.com/people/:name'
+      end
+    end
   end
 end

data/spec/lazy_resource/resource_spec.rb

@@ -117,7 +117,7 @@ describe LazyResource::Resource do
       user = User.new(:name => 'Andrew')
       params = ['http://example.com/users', user, {
         :method => :post,
-        :params => { :user => { 'name' => 'Andrew' } }
+        :body => { 'user' => { 'name' => 'Andrew' } }.to_json
       }]
       request = LazyResource::Request.new(*params)
       LazyResource::Request.should_receive(:new).with(*params).and_return(request)
@@ -148,7 +148,7 @@ describe LazyResource::Resource do
       user.name = 'James'
       params = ['http://example.com/users/1', user, {
         :method => :put,
-        :params => { :user => { 'name' => 'James' } }
+        :body => { 'user' => { 'name' => 'James' } }.to_json
       }]
       request = LazyResource::Request.new(*params)
       LazyResource::Request.should_receive(:new).with(*params).and_return(request)
@@ -185,7 +185,7 @@ describe LazyResource::Resource do
       user = User.load(:name => 'Andrew', :id => 1)
       params = ['http://example.com/users/1', user, {
         :method => :put,
-        :params => { :user => { 'name' => 'James' } }
+        :body => { 'user' => { 'name' => 'James' } }.to_json
       }]
       request = LazyResource::Request.new(*params)
       LazyResource::Request.should_receive(:new).with(*params).and_return(request)
@@ -243,8 +243,7 @@ describe LazyResource::Resource do
 
       params = { :id => 1, :created_at => DateTime.now.to_s }
       user = User.load(params)
-      params[:created_at_in_words] = "1 second ago"
-      user.as_json(:include_time_ago_in_words => true).should == params
+      user.as_json(:include_time_ago_in_words => true)[:created_at_in_words].should =~ /\d second(s)? ago/
     end
   end
 
@@ -290,13 +289,28 @@ describe LazyResource::Resource do
       LazyResource::Request.should_receive(:new).with(anything, anything, :headers => { :foo => 'buzz' }).and_return(request)
       User.find(1, {}, { :headers => { :foo => 'buzz' } })
     end
+
+    it 'does not trigger fetch_all' do
+      User.should_not_receive(:fetch_all)
+      10.times { User.find(1) }
+    end
   end
 
   describe '.where' do
+    after :each do
+      User.from = nil
+    end
+
     it 'creates a new relation with the passed where values' do
       users = User.where(:name => 'Andrew')
       users.where_values.should == { :name => 'Andrew' }
     end
+
+    it 'forwards the from value' do
+      User.from = :bars
+      users = User.where(:foo => 'bar')
+      users.from.should == :bars
+    end
   end
 
   describe '.order' do
@@ -350,7 +364,7 @@ describe LazyResource::Resource do
       user = User.new(:name => 'Andrew')
       params = ['http://example.com/users', user, {
         :method => :post,
-        :params => { :user => { 'name' => 'Andrew' } }
+        :body => { 'user' => { 'name' => 'Andrew' } }.to_json
       }]
       request = LazyResource::Request.new(*params)
       LazyResource::Request.should_receive(:new).with(*params).and_return(request)

data/spec/lazy_resource/url_generation_spec.rb

@@ -13,15 +13,16 @@ class Item
     def site
       'http://example.com/'
     end
+
+    def primary_key_name
+      'id'
+    end
   end
 
   def initialize
+    @id = 1
     @attributes = {} 
   end
-
-  def primary_key
-    1
-  end
 end
 
 describe LazyResource::UrlGeneration do
@@ -151,5 +152,10 @@ describe LazyResource::UrlGeneration do
       prefix_options.should == { :comment_id => 1 }
       query_options.should == { :name => 'Andrew' }
     end
+
+    it 'ignores _ids params' do
+      prefix_options, query_options = Item.split_options(:name => 'Andrew', :comment_ids => '1,2')
+      query_options.should == { :name => 'Andrew', :comment_ids => '1,2' }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -21,5 +21,5 @@ LazyResource.configure do |config|
 end
 
 RSpec.configure do |config|
-  config.mock_with nil
+  config.mock_with :rspec
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: lazy_resource
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Latimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,19 +55,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.6
 description: ActiveResource with its feet up. The write less, do more consumer of
   delicious APIs.
 email:
@@ -86,9 +77,11 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
+- NOTES.md
 - README.md
 - Rakefile
 - examples/github.rb
@@ -99,6 +92,7 @@ files:
 - lib/lazy_resource/errors.rb
 - lib/lazy_resource/ext/typhoeus.rb
 - lib/lazy_resource/http_mock.rb
+- lib/lazy_resource/log_subscriber.rb
 - lib/lazy_resource/mapping.rb
 - lib/lazy_resource/relation.rb
 - lib/lazy_resource/request.rb
@@ -115,6 +109,7 @@ files:
 - spec/lazy_resource/errors_spec.rb
 - spec/lazy_resource/ext/typhoeus_spec.rb
 - spec/lazy_resource/lazy_resource_spec.rb
+- spec/lazy_resource/log_subscriber_spec.rb
 - spec/lazy_resource/mapping_spec.rb
 - spec/lazy_resource/relation_spec.rb
 - spec/lazy_resource/request_spec.rb
@@ -125,33 +120,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/ahlatimer/lazy_resource
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3444122050560505401
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3444122050560505401
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveResource with its feet up. The write less, do more consumer of delicious
   APIs.
 test_files:
@@ -163,6 +151,7 @@ test_files:
 - spec/lazy_resource/errors_spec.rb
 - spec/lazy_resource/ext/typhoeus_spec.rb
 - spec/lazy_resource/lazy_resource_spec.rb
+- spec/lazy_resource/log_subscriber_spec.rb
 - spec/lazy_resource/mapping_spec.rb
 - spec/lazy_resource/relation_spec.rb
 - spec/lazy_resource/request_spec.rb