harpy 0.4.5 → 0.5.0

data/Gemfile.lock

@@ -1,46 +1,51 @@
 PATH
   remote: .
   specs:
-    harpy (0.4.3)
+    harpy (0.5.0)
       activemodel (>= 3.1.0)
       activesupport (>= 3.1.0)
       hash-deep-merge (~> 0.1.1)
-      typhoeus (~> 0.4.2)
+      typhoeus (= 0.6.5)
       yajl-ruby (~> 1.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    hash-deep-merge (0.1.1)
-    i18n (0.6.0)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    mustache (0.99.4)
-    rake (0.9.2.2)
-    redcarpet (2.1.0)
-    rocco (0.8.2)
-      mustache
-      redcarpet
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    typhoeus (0.4.2)
-      ffi (~> 1.0)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.13)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
+    ethon (0.6.1)
+      ffi (>= 1.3.0)
       mime-types (~> 1.18)
+    ffi (1.9.0)
+    hash-deep-merge (0.1.1)
+    i18n (0.6.5)
+    mime-types (1.24)
+    minitest (4.7.5)
+    multi_json (1.7.9)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    thread_safe (0.1.2)
+      atomic
+    typhoeus (0.6.5)
+      ethon (~> 0.6.1)
+    tzinfo (0.3.37)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -49,5 +54,4 @@ PLATFORMS
 DEPENDENCIES
   harpy!
   rake (>= 0.8.7)
-  rocco (~> 0.7)
-  rspec (~> 2.6.0)
+  rspec

data/harpy.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "harpy/version"
 
 Gem::Specification.new do |s|
   s.name        = "harpy"
-  s.version     = Harpy::VERSION
+  s.version     = "0.5.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
@@ -18,13 +17,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("typhoeus", ["~> 0.4.2"])
-  s.add_runtime_dependency("activesupport", [">= 3.1.0"])
-  s.add_runtime_dependency("activemodel", [">= 3.1.0"])
-  s.add_runtime_dependency("hash-deep-merge", ["~> 0.1.1"])
-  s.add_runtime_dependency("yajl-ruby", ["~> 1.1.0"])
+  s.add_runtime_dependency "typhoeus", ["0.6.5"]
+  s.add_runtime_dependency "activesupport", [">= 3.1.0"]
+  s.add_runtime_dependency "activemodel", [">= 3.1.0"]
+  s.add_runtime_dependency "hash-deep-merge", ["~> 0.1.1"]
+  s.add_runtime_dependency "yajl-ruby", ["~> 1.1.0"]
 
-  s.add_development_dependency("rake", [">= 0.8.7"])
-  s.add_development_dependency("rspec", ["~> 2.6.0"])
-  s.add_development_dependency("rocco", ["~> 0.7"])
+  s.add_development_dependency "rake", [">= 0.8.7"]
+  s.add_development_dependency "rspec"
 end

data/lib/harpy/client.rb

@@ -59,8 +59,8 @@ module Harpy
           Typhoeus::Request.new url, opts.merge(:method => method)
         end
       else
-        Typhoeus::Request.run urls, opts.merge(:method => method)
+        Typhoeus::Request.send method, urls, opts
       end
     end
   end
-end
+end

data/spec/harpy/client_spec.rb

@@ -19,35 +19,35 @@ describe Harpy::Client do
       context "with one url" do
         before do
           @expected = Typhoeus::Response.new :code => 200
-          Typhoeus::Hydra.hydra.stub(method, entry_url).and_return(@expected)
+          Typhoeus.stub(entry_url, method: method){@expected}
         end
         it "sends a #{method.to_s.upcase} to the url" do
           subject.send(method, entry_url).should == @expected
         end
         it "merges options" do
           client = Harpy::Client.new :headers => {"Authorization" => "spec"}
-          Typhoeus::Hydra.hydra.stub(method, entry_url).and_return(Typhoeus::Response.new :code => 200)
+          Typhoeus.stub(entry_url, method: method){Typhoeus::Response.new :code => 200}
           response = client.send method, entry_url, :headers => {"X-Files" => "Harpy"}
-          response.request.headers.should include({"X-Files" => "Harpy", "Authorization" => "spec"})
+          response.request.options[:headers].should include({"X-Files" => "Harpy", "Authorization" => "spec"})
         end
       end
       context "with multiple urls" do
         it "does not execute requests" do
           lambda {
             subject.send method, [entry_url, users_url]
-          }.should_not raise_error Typhoeus::Hydra::NetConnectNotAllowedError
+          }.should_not raise_error
         end
         it "returns one requests per url" do
           requests = subject.send method, [entry_url, users_url]
           requests.size.should == 2
-          requests.collect(&:method).should =~ [method, method]
+          requests.collect{|r| r.options[:method]}.should =~ [method, method]
           requests.collect(&:url).should =~ [entry_url, users_url]
         end
         it "merges options" do
           client = Harpy::Client.new :headers => {"Authorization" => "spec"}
           requests = client.send method, [entry_url, users_url], :headers => {"X-Files" => "Harpy"}
           requests.each do |request|
-            request.headers.should include({"X-Files" => "Harpy", "Authorization" => "spec"})
+            request.options[:headers].should include({"X-Files" => "Harpy", "Authorization" => "spec"})
           end
         end
       end
@@ -57,9 +57,9 @@ describe Harpy::Client do
     before do
       @entry_response = Typhoeus::Response.new :code => 200, :body => "entry"
       @users_response = Typhoeus::Response.new :code => 200, :body => "users"
-      
-      Typhoeus::Hydra.hydra.stub(:get, entry_url).and_return @entry_response
-      Typhoeus::Hydra.hydra.stub(:get, users_url).and_return @users_response
+
+      Typhoeus.stub(entry_url, method: :get){ @entry_response }
+      Typhoeus.stub(users_url, method: :get){ @users_response }
     end
     it "executes requests in parallel" do
       Typhoeus::Hydra.hydra.should_receive(:run).once
@@ -79,18 +79,18 @@ describe Harpy::Client do
   describe "#invalid_code(response)" do
     it "raises Harpy::ClientTimeout on request timeout" do
       lambda {
-        subject.invalid_code mock("Response", :timed_out? => true)
+        subject.invalid_code double("Response", :timed_out? => true)
       }.should raise_error Harpy::ClientTimeout
     end
     it "raises Harpy::ClientError on code 0" do
       lambda {
-        subject.invalid_code mock("Response", :timed_out? => false, :code => 0, :curl_error_message => "Could not connect to server")
+        subject.invalid_code double("Response", :timed_out? => false, :code => 0, :curl_error_message => "Could not connect to server")
       }.should raise_error Harpy::ClientError, "Could not connect to server"
     end
     it "raises Harpy::InvalidResponseCode with code otherwise" do
       lambda {
-        subject.invalid_code mock("Response", :timed_out? => false, :code => 404)
+        subject.invalid_code double("Response", :timed_out? => false, :code => 404)
       }.should raise_error Harpy::InvalidResponseCode, "404"
     end
   end
-end
+end

data/spec/harpy/entry_point_spec.rb

@@ -31,7 +31,7 @@ describe Harpy::EntryPoint do
       subject.resource_url("company_url")
     end
   end
-  
+
   describe "#urn(urn)" do
     let(:urn) { "urn:harpy:company:1" }
     let(:company_url) { "#{url}/company/1"}
@@ -52,5 +52,5 @@ describe Harpy::EntryPoint do
       subject.urn(urn)
     end
   end
-  
-end
+
+end

data/spec/harpy/resource_spec.rb

@@ -6,7 +6,7 @@ describe Harpy::Resource do
     let(:json_response) { %Q|{"name": "Harpy ltd", "link": [{"rel": "self", "href": "#{company_url}"}]}| }
     let(:success_response) { Typhoeus::Response.new :code => 200, :body => json_response}
     it "queries multiple resources in parallel and return instances" do
-      Typhoeus::Hydra.hydra.stub(:get, company_url).and_return success_response
+      Typhoeus.stub(company_url, method: :get){ success_response }
       responses = Harpy::Resource.from_url({ Harpy::Spec::Company => [company_url] })
       responses.should have(1).keys
       responses[Harpy::Spec::Company].should have(1).item
@@ -105,8 +105,8 @@ describe "class including Harpy::Resource" do
             ]
           }
         eos
-        Typhoeus::Hydra.hydra.stub(:get, url1).and_return response1
-        Typhoeus::Hydra.hydra.stub(:get, url2).and_return response2
+        Typhoeus.stub(url1, method: :get){ response1 }
+        Typhoeus.stub(url2, method: :get){ response2 }
         results = Harpy::Spec::Company.from_url [url1, url2]
         results.should have(2).items
         results[0].should be_kind_of Harpy::Spec::Company
@@ -131,18 +131,18 @@ describe "class including Harpy::Resource" do
       let(:url) { "http://localhost/company/1" }
       it "asks Harpy.entry_point to convert urn to url then call .from_url" do
         # urn:harpy:company:1 -> http://localhost/company/1
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn).and_return url
 
         # http://localhost/company/1 -> Harpy::Spec::Company instance
-        Harpy::Spec::Company.should_receive(:from_url).with(url).and_return(expected = mock)
+        Harpy::Spec::Company.should_receive(:from_url).with(url).and_return(expected = double)
         Harpy::Spec::Company.from_urn(urn).should be expected
       end
       it "is nil if urn is not found" do
         # urn:harpy:company:1 -> nil
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn)
-        
+
         Harpy::Spec::Company.from_urn(urn).should be_nil
       end
     end
@@ -160,7 +160,7 @@ describe "class including Harpy::Resource" do
       it "raises Harpy::EntryPointRequired" do
         # 1 -> urn:harpy:company:1
         Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
-        
+
         lambda{
           Harpy::Spec::Company.from_id(1)
         }.should raise_error Harpy::EntryPointRequired
@@ -172,27 +172,27 @@ describe "class including Harpy::Resource" do
       it "asks Harpy.entry_point to convert urn to url then call .from_url" do
         # 1 -> urn:harpy:company:1
         Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
-        
+
         # urn:harpy:company:1 -> http://localhost/company/1
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn).and_return url
-        
+
         # http://localhost/company/1 -> Harpy::Spec::Company instance
-        Harpy::Spec::Company.should_receive(:from_url).with(url).and_return(expected = mock)
+        Harpy::Spec::Company.should_receive(:from_url).with(url).and_return(expected = double)
         Harpy::Spec::Company.from_id(1).should be expected
       end
       it "is nil if urn is not found" do
         # 1 -> urn:harpy:company:1
         Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
-        
+
         # urn:harpy:company:1 -> nil
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn)
-        
+
         Harpy::Spec::Company.from_id(1).should be_nil
       end
     end
-  end  
+  end
   describe ".delete_from_url(url)" do
     context "called with only one url" do
       let(:url){ "http://localhost/company/1" }
@@ -228,16 +228,16 @@ describe "class including Harpy::Resource" do
       let(:url) { "http://localhost/company/1" }
       it "asks Harpy.entry_point to convert urn to url then call .from_url" do
         # urn:harpy:company:1 -> http://localhost/company/1
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn).and_return url
 
         # http://localhost/company/1 -> Harpy::Spec::Company instance
-        Harpy::Spec::Company.should_receive(:delete_from_url).with(url).and_return(expected = mock)
+        Harpy::Spec::Company.should_receive(:delete_from_url).with(url).and_return(expected = double)
         Harpy::Spec::Company.delete_from_urn(urn).should be expected
       end
       it "is nil if urn is not found" do
         # urn:harpy:company:1 -> nil
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn)
 
         Harpy::Spec::Company.delete_from_urn(urn).should be_false
@@ -257,7 +257,7 @@ describe "class including Harpy::Resource" do
       it "raises Harpy::EntryPointRequired" do
         # 1 -> urn:harpy:company:1
         Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
-        
+
         lambda{
           Harpy::Spec::Company.delete_from_id(1)
         }.should raise_error Harpy::EntryPointRequired
@@ -269,23 +269,23 @@ describe "class including Harpy::Resource" do
       it "asks Harpy.entry_point to convert urn to url then call .from_url" do
         # 1 -> urn:harpy:company:1
         Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
-        
+
         # urn:harpy:company:1 -> http://localhost/company/1
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn).and_return url
-        
+
         # http://localhost/company/1 -> Harpy::Spec::Company instance
-        Harpy::Spec::Company.should_receive(:delete_from_url).with(url).and_return(expected = mock)
+        Harpy::Spec::Company.should_receive(:delete_from_url).with(url).and_return(expected = double)
         Harpy::Spec::Company.delete_from_id(1).should be expected
       end
       it "is nil if urn is not found" do
         # 1 -> urn:harpy:company:1
         Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
-        
+
         # urn:harpy:company:1 -> nil
-        Harpy.entry_point = mock
+        Harpy.entry_point = double
         Harpy.entry_point.should_receive(:urn).with(urn)
-        
+
         Harpy::Spec::Company.delete_from_id(1).should be_false
       end
     end
@@ -305,7 +305,7 @@ describe "class including Harpy::Resource" do
   describe ".search(conditions)" do
     let(:url){ "http://localhost/company" }
     before do
-       Harpy.entry_point = mock
+       Harpy.entry_point = double
        Harpy.entry_point.should_receive(:resource_url).with("harpy/spec/company").and_return url
     end
     it "return properly filled instances on 200" do
@@ -435,7 +435,7 @@ describe "class including Harpy::Resource" do
     end
     describe "#url" do
       it "searches url to self inside links" do
-        subject.should_receive(:link).with("self").and_return (expected = mock)
+        subject.should_receive(:link).with("self").and_return (expected = double)
         subject.url.should be expected
       end
       it "is nil when no link to self can be found" do
@@ -445,8 +445,8 @@ describe "class including Harpy::Resource" do
     end
     describe "#url_collection" do
       it "defaults to entry_point link which rel matches resource name" do
-        Harpy.entry_point = mock
-        Harpy.entry_point.should_receive(:resource_url).with("harpy/spec/company").and_return (expected = mock)
+        Harpy.entry_point = double
+        Harpy.entry_point.should_receive(:resource_url).with("harpy/spec/company").and_return (expected = double)
         subject.url_collection.should be expected
       end
     end
@@ -533,14 +533,14 @@ describe "class including Harpy::Resource" do
   end
   describe "#as_json" do
     let(:url) { "http://localhost/user/1" }
-    subject do 
+    subject do
       Harpy::Spec::User.new({
-        "urn" => "urn:harpy:user:1", 
-        "company_name" => "Stark Enterprises", 
+        "urn" => "urn:harpy:user:1",
+        "company_name" => "Stark Enterprises",
         "link" => [{"rel" => "self", "href" => url}],
       })
     end
-  
+
     it "exclude link and urn from attributes" do
       subject.as_json.should == {"company_name" => "Stark Enterprises"}
     end
@@ -633,8 +633,8 @@ describe "class including Harpy::Resource" do
       let(:body) { '{"company_name":"Stark Enterprises"}' }
       subject do
         Harpy::Spec::User.new({
-          "urn" => "urn:harpy:user:1", 
-          "company_name" => "Stark Enterprises", 
+          "urn" => "urn:harpy:user:1",
+          "company_name" => "Stark Enterprises",
           "link" => [{"rel" => "self", "href" => url}],
         })
       end
@@ -710,8 +710,8 @@ describe "class including Harpy::Resource" do
       let(:url) { "http://localhost/user/1" }
       subject do
         Harpy::Spec::User.new({
-          "urn" => "urn:harpy:user:1", 
-          "company_name" => "Stark Enterprises", 
+          "urn" => "urn:harpy:user:1",
+          "company_name" => "Stark Enterprises",
           "link" => [{"rel" => "self", "href" => url}],
         })
       end
@@ -794,4 +794,4 @@ describe "class including Harpy::Resource" do
       company1.should_not == company2
     end
   end
-end
+end

data/spec/harpy_spec.rb

@@ -8,7 +8,7 @@ describe Harpy do
   end
 
   it "does allow using another client" do
-    custom_client = mock
+    custom_client = double
     Harpy.client = custom_client
     Harpy.client.should be custom_client
   end
@@ -33,7 +33,7 @@ describe Harpy do
   end
 
   it "does allow setting entry_point manually" do
-    Harpy.entry_point = (entry_point = mock)
+    Harpy.entry_point = (entry_point = double)
     Harpy.entry_point.should be entry_point
     entry_point.should_receive(:url).and_return "http://localhost"
     Harpy.entry_point_url.should == "http://localhost"
@@ -41,7 +41,7 @@ describe Harpy do
 
   it "Harpy.reset clears both client and entry_point" do
     Harpy.entry_point_url = "http://localhost"
-    Harpy.client = (custom_client = mock)
+    Harpy.client = (custom_client = double)
     Harpy.reset
     Harpy.entry_point_url.should be_nil
     Harpy.client.should_not be custom_client
@@ -94,4 +94,4 @@ describe Harpy::InvalidResponseCode do
   it "is an Harpy::Exception" do
     Harpy::InvalidResponseCode.ancestors.should include Harpy::Exception
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,11 +3,8 @@ require "typhoeus"
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each{|f| require f}
 
-# Do not allow external connections
-Typhoeus::Hydra.allow_net_connect = false
-
 RSpec.configure do |config|
   config.after(:each) do
-    Typhoeus::Hydra.hydra.clear_stubs
+    Typhoeus::Expectation.clear
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harpy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -113,33 +113,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: rocco
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: Client for REST API with HATEOAS
 email:
 - joseph.halter@thetalentbox.com
@@ -162,7 +146,6 @@ files:
 - lib/harpy/collection.rb
 - lib/harpy/entry_point.rb
 - lib/harpy/resource.rb
-- lib/harpy/version.rb
 - spec/harpy/client_spec.rb
 - spec/harpy/entry_point_spec.rb
 - spec/harpy/resource_spec.rb
@@ -181,12 +164,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3317959473737263468
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3317959473737263468
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/harpy/version.rb

@@ -1,3 +0,0 @@
-module Harpy
-  VERSION = "0.4.5"
-end