rapidash 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: b62fefb161e5c2171a36bdac90549d2cf41c33cb19b0d76f2738876a27370a91ee9fc5fd76d3df47c18b0c92cb1ccfa8bc3fc3813df78dbbb0a347ed8c784fe5
-  metadata.gz: 0f553c52c3d89edc685e192726661b10116898ae01b2735172116f8e4144a2d35c8c501eb68af322da925abf10f8578b61aa205e9b9b61c7fba9582f21bc3872
-SHA1: 
-  data.tar.gz: ec0208f74c6ac0a9d02691baf5727dc1d4d2330d
-  metadata.gz: a6adad2e79593a67d205b702b2e05e489a37d9cc
+---
+SHA1:
+  metadata.gz: 9a7084f2f5d2446b0e2de5aa33217e617df67a8a
+  data.tar.gz: c9010836f7f1e8da5846ba6fb3aad103a5b8d1c4
+SHA512:
+  metadata.gz: e2fca5a4cae9cd85ef8910e6a814e8e5d8a79ca57c9f77c5fedf8823ef996df5fa1606aba6a5a03306d633c435540ffe7be2bb14c4491267d2317a28fccd672d
+  data.tar.gz: 7fb3cdde9f95808b38dcd54033beac4979e325626b100dee1644a531764cc510b753385b12a9b218bf4170d102b204c50ad7bfb7064b7cfc3e959bc9cfd4bd16

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - jruby-18mode
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
+  - jruby-20mode
+  - jruby-21mode

data/lib/rapidash/http_client.rb

@@ -4,11 +4,15 @@ require 'faraday_middleware/multi_json'
 
 module Rapidash
   module HTTPClient
-    attr_accessor :login, :password
+    attr_accessor :login, :password, :request_default_options
     attr_writer :connection
 
+    # Provide login and password fields for basic HTTP authentication
+    # Provide request_default_options field for default options to be provided on each http request
+    # To set a default User-agent which identifies your application, provide
+    # { request_default_options: { header: { user_agent: 'My great new App V.0.1   Contact: me@me.com'} } }
     def initialize(options = {})
-      [:login, :password].each do |key|
+      [:login, :password, :request_default_options].each do |key|
         self.send("#{key.to_s}=".to_sym, options[key])
       end
     end
@@ -26,6 +30,7 @@ module Rapidash
     end
 
     def request(verb, url, options = {})
+      options.merge!(self.request_default_options) if self.request_default_options
       url = connection.build_url(normalize_url(url), options[:params]).to_s
       response = connection.run_request(verb, url, options[:body], options[:header])
 

data/lib/rapidash/version.rb

@@ -1,3 +1,3 @@
 module Rapidash
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/rapidash.gemspec

@@ -18,22 +18,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  if RUBY_VERSION < "1.9.3"
-    spec.add_dependency "activesupport", "~> 3.0"
-    spec.add_dependency "mime-types", "~> 1.25.0"
-  else
-    spec.add_dependency "activesupport", ">= 3.0.0"
-  end
+  spec.add_dependency "activesupport", ">= 3.0.0"
   spec.add_development_dependency "bundler", "~> 1.0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.8"
-  spec.add_development_dependency "simplecov", "~> 0.7"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "json"
   spec.add_development_dependency "coveralls"
 
   spec.add_dependency "faraday", "~> 0.8"
   spec.add_dependency "faraday_middleware", "~> 0.9"
   spec.add_dependency "faraday_middleware-multi_json", "~> 0.0"
-  spec.add_dependency "oauth2", "~>0.6"
-  spec.add_dependency "hashie", "~>1.2"
+  spec.add_dependency "oauth2", ">= 0.6", "< 2.0"
+  spec.add_dependency "hashie", ">1.2", "< 4.0"
 end

data/spec/faraday/raise_rapidash_error_spec.rb

@@ -7,7 +7,7 @@ describe Faraday::Response::RaiseRapidashError do
     it "should not raise an exception" do
       expect {
         subject.on_complete(env)
-      }.to_not raise_exception(Rapidash::ResponseError)
+      }.to_not raise_exception
     end
   end
 

data/spec/rapidash/base_spec.rb

@@ -26,15 +26,15 @@ describe Rapidash::Base do
   describe ".initialize" do
 
     it "should assume a default based on the class name" do
-      Base.new.instance_variable_get(:@url).should eql("bases")
+      expect(Base.new.instance_variable_get(:@url)).to eql("bases")
     end
 
     it "should ignore any modules when infering the URL" do
-      Rapidash::Resource.new.instance_variable_get(:@url).should eql("resources")
+      expect(Rapidash::Resource.new.instance_variable_get(:@url)).to eql("resources")
     end
 
     it "should override the URL if set" do
-        BaseTester.new.instance_variable_get(:@url).should eql("tester")
+        expect(BaseTester.new.instance_variable_get(:@url)).to eql("tester")
     end
   end
 
@@ -56,9 +56,9 @@ describe Rapidash::Base do
 
   describe ".create!" do
     it "should set the method to post and set the body" do
-      subject.should_receive(:call!)
+      allow(subject).to receive(:call!)
       subject.create!(post)
-      subject.instance_variable_get(:@options).should eql({
+      expect(subject.instance_variable_get(:@options)).to eql({
         :method => :post,
         :body => post
       })
@@ -66,9 +66,9 @@ describe Rapidash::Base do
 
     it "should use the root element if one is defined" do
       subject = RootTester.new
-      subject.should_receive(:call!)
+      allow(subject).to receive(:call!)
       subject.create!(no_root)
-      subject.instance_variable_get(:@options).should eql({
+      expect(subject.instance_variable_get(:@options)).to eql({
         :method => :post,
         :body => post
       })
@@ -77,9 +77,9 @@ describe Rapidash::Base do
 
   describe ".update!" do
     it "should set the method to put and set the body" do
-      subject.should_receive(:call!)
+      allow(subject).to receive(:call!)
       subject.update!(post)
-      subject.instance_variable_get(:@options).should eql({
+      expect(subject.instance_variable_get(:@options)).to eql({
         :method => :put,
         :body => post
       })
@@ -87,9 +87,9 @@ describe Rapidash::Base do
 
     it "should use the patch verb if set on the client" do
       client.class.patch = true
-      subject.should_receive(:call!)
+      allow(subject).to receive(:call!)
       subject.update!(post)
-      subject.instance_variable_get(:@options).should eql({
+      expect(subject.instance_variable_get(:@options)).to eql({
         :method => :patch,
         :body => post
       })
@@ -97,9 +97,9 @@ describe Rapidash::Base do
 
     it "should use the root element if one is defined" do
       subject = RootTester.new(client)
-      subject.should_receive(:call!)
+      allow(subject).to receive(:call!)
       subject.update!(no_root)
-      subject.instance_variable_get(:@options).should eql({
+      expect(subject.instance_variable_get(:@options)).to eql({
         :method => :patch,
         :body => post
       })
@@ -108,9 +108,9 @@ describe Rapidash::Base do
 
   describe ".delete!" do
     it "should set the method to delete" do
-      subject.should_receive(:call!)
+      allow(subject).to receive(:call!)
       subject.delete!
-      subject.instance_variable_get(:@options).should eql({:method => :delete})
+      expect(subject.instance_variable_get(:@options)).to eql({:method => :delete})
     end
     
   end
@@ -118,13 +118,20 @@ describe Rapidash::Base do
   describe ".call!" do
     it "should call get on the client" do
       subject.url = "tester/1"
-      client.should_receive(:get).with("tester/1", {:headers => headers})
+      allow(client).to receive(:get).with("tester/1", {:headers => headers})
       subject.call!
     end
 
+    it "should set extra headers on the client" do
+      user_agent_header = {header: { user_agent: 'My own Faraday version'}}
+      subject = BaseTester.new(client,user_agent_header)
+      subject.url = "tester/1"
+      allow(client).to receive(:get).with("tester/1", {:headers => headers}.merge(user_agent_header) )
+      subject.call!
+    end
 
     it "should call a post on the client if set" do
-      client.should_receive(:post).with("tester", {:headers => headers})
+      allow(client).to receive(:post).with("tester", {:headers => headers})
       subject.options = {:method => :post}
       subject.url = "tester"
       subject.call!
@@ -133,23 +140,23 @@ describe Rapidash::Base do
 
   describe ".base_url" do
     it "should return an empty string if no previous url is set" do
-      subject.send(:base_url).should eql("")
+      expect(subject.send(:base_url)).to eql("")
     end
 
     it "should return the previous url if set" do
       subject.options = {:previous_url => "users/Gazler"}
-      subject.send(:base_url).should eql("users/Gazler/")
+      expect(subject.send(:base_url)).to eql("users/Gazler/")
     end
   end
 
   describe ".resource_url" do
     it "should return the class name as a url if none is specified" do
-      subject.send(:resource_url).should eql("basetesters")
+      expect(subject.send(:resource_url)).to eql("basetesters")
     end
 
     it "should return the previous url if set" do
       subject.options = {:url => "people"}
-      subject.send(:resource_url).should eql("people")
+      expect(subject.send(:resource_url)).to eql("people")
     end
   end
 

data/spec/rapidash/client_spec.rb

@@ -31,16 +31,16 @@ describe Rapidash::Client do
   describe "#method" do
     it "should include the HTTPClient" do
       client = HTTPClientTester.new
-      client.class.ancestors.should include(Rapidash::HTTPClient)
+      expect(client.class.ancestors).to include(Rapidash::HTTPClient)
     end
 
     it "should include the OAuthClient" do
       client = OAuthClientTester.new({:uid => "foo", :secret => "bar", :site => "baz"})
-      client.class.ancestors.should include(Rapidash::OAuthClient)
+      expect(client.class.ancestors).to include(Rapidash::OAuthClient)
     end
 
     it "should include the OAuthClient" do
-      test_client.class.ancestors.should include(Rapidash::TestClient)
+      expect(test_client.class.ancestors).to include(Rapidash::TestClient)
     end
 
     it "should raise an error on anything else" do
@@ -54,19 +54,19 @@ describe Rapidash::Client do
 
   describe "#use_patch" do
     it "should set the patch variable to true" do
-      HTTPClientPatchTester.new.class.instance_variable_get(:@patch).should eql(true)
+      expect(HTTPClientPatchTester.new.class.instance_variable_get(:@patch)).to eql(true)
     end
   end
 
   describe "#extension" do
     it "should set the url_extension variable" do
-      HTTPClientExtensionTester.new.class.instance_variable_get(:@extension).should eql(:js)
+      expect(HTTPClientExtensionTester.new.class.instance_variable_get(:@extension)).to eql(:js)
     end
   end
 
   describe "#raise_errors" do
     it "should set the raise_error variable" do
-      HTTPClientErrorTester.new.class.instance_variable_get(:@raise_error).should eql(true)
+      expect(HTTPClientErrorTester.new.class.instance_variable_get(:@raise_error)).to eql(true)
     end
   end
 
@@ -79,18 +79,18 @@ describe Rapidash::Client do
 
   describe ".site=" do
     it "should clear the connection variable after set new site" do
-      test_client.instance_variable_get(:@connection).should eql(nil)
+      expect(test_client.instance_variable_get(:@connection)).to eql(nil)
       test_client.site = "foo"
       test_client.instance_variable_set(:@connection, "Not nil")
 
       test_client.site = "bar"
-      test_client.instance_variable_get(:@connection).should eql(nil)
+      expect(test_client.instance_variable_get(:@connection)).to eql(nil)
     end
 
     it "should set the site variable" do
-      test_client.instance_variable_get(:@site).should eql(nil)
+      expect(test_client.instance_variable_get(:@site)).to eql(nil)
       test_client.site = "foo"
-      test_client.instance_variable_get(:@site).should eql("foo")
+      expect(test_client.instance_variable_get(:@site)).to eql("foo")
     end
   end
 
@@ -111,35 +111,35 @@ describe Rapidash::Client do
 
   describe ".get" do
     it "should call request" do
-      test_client.should_receive(:request).with(:get, "foo", {})
+      allow(test_client).to receive(:request).with(:get, "foo", {})
       test_client.get("foo")
     end
   end
 
   describe ".post" do
     it "should call request" do
-      test_client.should_receive(:request).with(:post, "foo", {})
+      allow(test_client).to receive(:request).with(:post, "foo", {})
       test_client.post("foo")
     end
   end
 
   describe ".put" do
     it "should call request" do
-      test_client.should_receive(:request).with(:put, "foo", {})
+      allow(test_client).to receive(:request).with(:put, "foo", {})
       test_client.put("foo")
     end
   end
 
   describe ".patch" do
     it "should call request" do
-      test_client.should_receive(:request).with(:patch, "foo", {})
+      allow(test_client).to receive(:request).with(:patch, "foo", {})
       test_client.patch("foo")
     end
   end
 
   describe ".delete" do
     it "should call request" do
-      test_client.should_receive(:request).with(:delete, "foo", {})
+      allow(test_client).to receive(:request).with(:delete, "foo", {})
       test_client.delete("foo")
     end
   end
@@ -147,15 +147,15 @@ describe Rapidash::Client do
   describe ".normalize_url" do
     it "should use the instance extension if set" do
       test_client.extension = :json
-      test_client.normalize_url("users").should eql("users.json")
+      expect(test_client.normalize_url("users")).to eql("users.json")
     end
 
     it "should use the class extension if set" do
-      HTTPClientExtensionTester.new.normalize_url("users").should eql("users.js")
+      expect(HTTPClientExtensionTester.new.normalize_url("users")).to eql("users.js")
     end
 
     it "should return the url if no extension if set" do
-      test_client.normalize_url("users").should eql("users")
+      expect(test_client.normalize_url("users")).to eql("users")
     end
   end
 end

data/spec/rapidash/http_client_spec.rb

@@ -23,7 +23,7 @@ describe Rapidash::HTTPClient do
   describe ".connection" do
     it "should create a Faraday object" do
       subject.site = "http://example.com/"
-      subject.connection.class.should eql(Faraday::Connection)
+      expect(subject.connection.class).to eql(Faraday::Connection)
     end
 
     it "should raise Configuration error if site nil" do
@@ -33,7 +33,7 @@ describe Rapidash::HTTPClient do
     end
 
     it "should use the site variable if set" do
-      Faraday.should_receive(:new).with("http://example.com/")
+      allow(Faraday).to receive(:new).with("http://example.com/")
       subject.site = "http://example.com/"
       subject.connection
     end
@@ -63,8 +63,19 @@ describe Rapidash::HTTPClient do
 
     it "should call response" do
       response = double(:body => "response")
-      subject.connection.should_receive(:run_request).with(:get, "http://example.com/foo", nil, nil).and_return(response)
+      allow(subject.connection).to receive(:run_request).with(:get, "http://example.com/foo", nil, nil).and_return(response)
       subject.request(:get, "foo")
     end
+
+    describe "default options" do
+      let!(:subject) { HTTPTester.new(request_default_options: { header: { user_agent: 'New app v1.0'} } ) }
+
+      it "should provide default headers in the request" do
+        response = double(:body => "response")
+        allow(subject.connection).to receive(:run_request).with(:get, "http://example.com/foo", nil, {:user_agent=>"New app v1.0"}).and_return(response)
+        subject.request(:get, "foo")
+      end
+    end
+
   end
 end

data/spec/rapidash/integration/test_client_spec.rb

@@ -26,10 +26,10 @@ describe "An actual Rapidash Client" do
   let(:client) { Integration::Client.new(responses, :json => true) }
 
   it "should get the user from the API" do
-    client.users!("Gazler").name.should eql("Gary Rennie")
+    expect(client.users!("Gazler").name).to eql("Gary Rennie")
   end
 
   it "should get the repos from A user" do
-    client.users("Gazler").repos![0].name.should eql("Githug")
+    expect(client.users("Gazler").repos![0].name).to eql("Githug")
   end
 end

data/spec/rapidash/oauth_client_spec.rb

@@ -27,7 +27,7 @@ describe Rapidash::OAuthClient do
     it "should not raise an error with the correct options" do
       expect {
         OAuthTester.new(options)
-      }.to_not raise_error(Rapidash::ConfigurationError)
+      }.to_not raise_error
     end
 
     it "should raise an error if the correct options are not set" do
@@ -40,39 +40,39 @@ describe Rapidash::OAuthClient do
 
  describe ".access_token_from_code" do
     it "should call localhost for the access token" do
-      auth_code = mock
-      client = mock
-      subject.stub(:client).and_return(client)
-      client.should_receive(:auth_code).and_return(auth_code)
-      auth_code.should_receive(:get_token).with("123", :redirect_uri => "http://localhost").and_return(OpenStruct.new(:token => "token"))
-      subject.access_token_from_code("123", "http://localhost").should eql("token")
+      auth_code = double
+      client = double
+      allow(subject).to receive(:client).and_return(client)
+      expect(client).to receive(:auth_code).and_return(auth_code)
+      expect(auth_code).to receive(:get_token).with("123", :redirect_uri => "http://localhost").and_return(OpenStruct.new(:token => "token"))
+      expect(subject.access_token_from_code("123", "http://localhost")).to eql("token")
     end
   end
 
   describe ".client" do
     it "should be an OAuth2::Client" do
-      subject.send(:client).class.should eql(OAuth2::Client)
+      expect(subject.send(:client).class).to eql(OAuth2::Client)
     end
   end
 
   describe ".oauth_access_token" do
     it "should be an OAuth2::AccessToken" do
-      subject.send(:oauth_access_token).class.should eql(OAuth2::AccessToken)
+      expect(subject.send(:oauth_access_token).class).to eql(OAuth2::AccessToken)
     end
   end
 
   describe ".request" do
-    let(:request) { mock(:body => 'data') }
+    let(:request) { double(:body => 'data') }
 
     describe "object returned from API call" do
       before(:each) do
-        subject.stub(:oauth_access_token).and_return(request)
-        subject.stub(:normalize_url).with("me").and_return("me")
-        request.stub(:get) { request }
+        allow(subject).to receive(:oauth_access_token).and_return(request)
+        allow(subject).to receive(:normalize_url).with("me").and_return("me")
+        allow(request).to receive(:get) { request }
       end
 
       it "should return a Hashie::Mash" do
-        subject.request(:get, "me").should eq 'data'
+        expect(subject.request(:get, "me")).to eq 'data'
       end
     end
   end

data/spec/rapidash/resourceable/collection_spec.rb

@@ -28,7 +28,7 @@ describe Rapidash::Client do
     end
 
     it "should call with the updated URL" do
-      client.should_receive(:get).with('users/active', { :headers => { "content-type" => "application/json" }})
+      expect(client).to receive(:get).with('users/active', { :headers => { "content-type" => "application/json" }})
       resource.active!
     end
 
@@ -46,7 +46,7 @@ describe Rapidash::Client do
     end
 
     it "should call with the updated URL" do
-      client.should_receive(:post).with('people/deactivate', { :headers => { "content-type" => "application/json" }})
+      expect(client).to receive(:post).with('people/deactivate', { :headers => { "content-type" => "application/json" }})
       resource.suspend_all!
     end
 

data/spec/rapidash/resourceable_spec.rb

@@ -53,7 +53,7 @@ describe Rapidash::Resourceable do
 
   describe "#included" do
     it "should include the resource method" do
-      Rapidash::ClientTester.methods.map { |m| m.to_sym }.should include(:resource)
+      expect(Rapidash::ClientTester.methods.map { |m| m.to_sym }).to include(:resource)
     end
   end
 
@@ -62,17 +62,17 @@ describe Rapidash::Resourceable do
 
     describe ".resource" do
       it "should create a Rapidash::Base" do
-        client.resource(:users, 1).class.should eql(Rapidash::Base)
+        expect(client.resource(:users, 1).class).to eql(Rapidash::Base)
       end
 
       it "should set the url to the resource name" do
         resource = client.resource(:users)
-        resource.url.should eql("users")
+        expect(resource.url).to eql("users")
       end
 
       it "should pass the id through if specified" do
         resource = client.resource(:users, 1)
-        resource.url.should eql("users/1")
+        expect(resource.url).to eql("users/1")
       end
 
       it "should pass the previous url through" do
@@ -80,31 +80,31 @@ describe Rapidash::Resourceable do
           "base"
         end
         resource = client.resource(:users, 1)
-        resource.url.should eql("base/users/1")
+        expect(resource.url).to eql("base/users/1")
       end
 
       it "should pass the client through" do
         resource = client.resource(:users, 1)
-        resource.client.should eql(client)
+        expect(resource.client).to eql(client)
       end
 
       it "should allow an explicit url to be sent" do
         resource = client.resource(:users, 1, :url => "people")
-        resource.url.should eql("people/1")
+        expect(resource.url).to eql("people/1")
       end
 
       it "should be chainable" do
         resource = client.resource(:users, 1).resource(:comments, 2)
-        resource.url.should eql("users/1/comments/2")
-        resource.client.should eql(client)
+        expect(resource.url).to eql("users/1/comments/2")
+        expect(resource.client).to eql(client)
       end
     end
 
     describe ".resource!" do
       it "should call the call! method on a resource" do
-        resource = mock
-        Rapidash::Base.stub(:new).and_return(resource)
-        resource.should_receive(:call!)
+        resource = double
+        allow(Rapidash::Base).to receive(:new).and_return(resource)
+        expect(resource).to receive(:call!)
         client.resource!(:users, 1)
       end
     end
@@ -112,7 +112,7 @@ describe Rapidash::Resourceable do
 
   describe "#resource" do
     it "should add a method with the name of the argument" do
-      Rapidash::ClientTester.new.methods.map { |m| m.to_sym }.should include(:users)
+      expect(Rapidash::ClientTester.new.methods.map { |m| m.to_sym }).to include(:users)
     end
 
     it "should not fail when presented with a multi-word resource" do
@@ -120,71 +120,71 @@ describe Rapidash::Resourceable do
         class ClientTester
           resource :admin_users
         end
-      }.to_not raise_error(NameError)
+      }.to_not raise_error
     end
 
     it "should load the plural class with a warning if the singular is not defined" do
-      Kernel.should_receive(:warn).with("[DEPRECATED] - RAPIDASH WARNING using CoreMembers instead of CoreMember - please either use `CoreMember` or set the class name with `resource core_members, :class_name => CoreMembers` implicit plural naming will be deprecated in Rapidash 1.0")
+      expect(Kernel).to receive(:warn).with("[DEPRECATED] - RAPIDASH WARNING using CoreMembers instead of CoreMember - please either use `CoreMember` or set the class name with `resource core_members, :class_name => CoreMembers` implicit plural naming will be deprecated in Rapidash 1.0")
       class ClientTester
         resource :core_members
       end
     end
 
     it "should add a bang method with the name of the argument" do
-      Rapidash::ClientTester.new.methods.map { |m| m.to_sym }.should include(:users!)
+      expect(Rapidash::ClientTester.new.methods.map { |m| m.to_sym }).to include(:users!)
     end
 
     it "should add a method for each resource is an array is passed" do
       methods = Rapidash::MultiResourceTester.new.methods.map { |m| m.to_sym }
-      (methods & [:users, :users!, :repos, :repos!]).length.should eql(4)
+      expect((methods & [:users, :users!, :repos, :repos!]).length).to eql(4)
     end
   end
 
   describe ".users" do
     it "should return an instance of the resource" do
-      Rapidash::ClientTester.new.users.class.should eql(Rapidash::User)
+      expect(Rapidash::ClientTester.new.users.class).to eql(Rapidash::User)
     end
 
     it "should not use a namespace if not in a module" do
-      ClientTester.new.users.class.should eql(User)
+      expect(ClientTester.new.users.class).to eql(User)
     end
   end
 
   describe ".tickets!" do
     it "should return an instance of the resource and call it" do
-      users = mock
-      Rapidash::User.should_receive(:new).and_return(users)
-      users.should_receive(:call!)
+      users = double
+      expect(Rapidash::User).to receive(:new).and_return(users)
+      expect(users).to receive(:call!)
       Rapidash::ClientTester.new.users!
     end
   end
 
   describe "chaining resources" do
     it "should allow resources to be nested" do
-      client = mock
+      client = double
       users = Rapidash::User.new(client)
-      users.methods.map { |m| m.to_sym }.should include(:repos)
-      users.methods.map { |m| m.to_sym }.should include(:repos!)
+      expect(users.methods.map { |m| m.to_sym }).to include(:repos)
+      expect(users.methods.map { |m| m.to_sym }).to include(:repos!)
     end
 
     it "should maintain the client across resources " do
-      client = mock
+      client = double
       users = Rapidash::User.new(client)
-      users.repos.instance_variable_get(:@client).should eql(client)
+      expect(users.repos.instance_variable_get(:@client)).to eql(client)
     end
 
     it "should maintain the URL when chaining" do
-      client = mock
+      client = double
       users = Rapidash::User.new(client)
-      users.repos.instance_variable_get(:@args)[0].keys.should include(:previous_url)
+      expect(users.repos.instance_variable_get(:@args)[0].keys).to include(:previous_url)
     end
 
     it "should maintain the URL as well as the options when chaining" do
-      client = mock
+      client = double
       users = Rapidash::User.new(client)
       repos = users.repos(:params => {:foo => :bar})
-      repos.instance_variable_get(:@args)[0].should include(:params)
-      repos.instance_variable_get(:@args)[0].should include(:previous_url)
+      expect(repos.instance_variable_get(:@args)[0]).to include(:params)
+      expect(repos.instance_variable_get(:@args)[0]).to include(:previous_url)
     end
   end
 
@@ -224,19 +224,19 @@ describe Rapidash::Resourceable do
     end
 
     it "should find user in another module" do
-      ModuleTester.new.users.class.should eql(Facebook::User)
+      expect(ModuleTester.new.users.class).to eql(Facebook::User)
     end
 
     it "should allow a plural class name" do
-      ModuleTester.new.posts.class.should eql(Facebook::Posts)
+      expect(ModuleTester.new.posts.class).to eql(Facebook::Posts)
     end
 
     it "should find deep_users in a nested module" do
-      ModuleTester.new.deep_users.class.should eql(SomeModule::SomeSubModule::User)
+      expect(ModuleTester.new.deep_users.class).to eql(SomeModule::SomeSubModule::User)
     end
 
     it "should find deep_posts in a nested class name" do
-      ModuleTester.new.deep_posts.class.should eql(SomeModule::SomeSubModule::Post)
+      expect(ModuleTester.new.deep_posts.class).to eql(SomeModule::SomeSubModule::Post)
     end
 
     it "should not raise a wrong constant NameError" do
@@ -248,7 +248,7 @@ describe Rapidash::Resourceable do
             end
           end
         end
-      }.to_not raise_error(NameError)
+      }.to_not raise_error
     end
 
   end

data/spec/rapidash/response_error_spec.rb

@@ -42,7 +42,7 @@ describe Rapidash::ResponseError do
     let(:env) { { :status => '404', :method => 'post', :url => 'http://acme.com/api/posts', :body => ['name cannot be blank', 'content cannot be blank'] } }
 
     it "should call #errors" do
-      response.should_receive(:errors)
+      expect(response).to receive(:errors)
       response.send(:message)
     end
 

data/spec/rapidash/urlable_spec.rb

@@ -18,35 +18,42 @@ end
 
 describe Rapidash::Urlable do
 
-  let!(:client) { mock }
+  let!(:client) { double }
+  let(:custom_header) { { :header => { user_agent: 'Experimentation v3.14'} } }
 
   describe "#included" do
     it "should add the url method" do
-      ApiTester.methods.map { |m| m.to_sym}.should include(:url)
+      expect(ApiTester.methods.map { |m| m.to_sym}).to include(:url)
     end
   end
 
   describe "#url" do
     it "should override the initialize to set a url" do
-      ApiTesterNoUrl.new.instance_variable_get(:@url).should eql("apitesternourls")
-      ApiTester.new.instance_variable_get(:@url).should eql("foo")
+      expect(ApiTesterNoUrl.new.instance_variable_get(:@url)).to eql("apitesternourls")
+      expect(ApiTester.new.instance_variable_get(:@url)).to eql("foo")
     end
 
     it "should set options on the class" do
       api = ApiTester.new(client, :option1 => "foo")
-      api.instance_variable_get(:@options).should eql({:option1 => "foo"})
-      api.instance_variable_get(:@url).should eql("foo")
+      expect(api.instance_variable_get(:@options)).to eql({:option1 => "foo"})
+      expect(api.instance_variable_get(:@url)).to eql("foo")
+    end
+
+    it "should allow custom headers" do
+      api = ApiTester.new(client,custom_header)
+      expect(api.instance_variable_get(:@options)).to eql(custom_header)
+      expect(api.instance_variable_get(:@url)).to eql("foo")
     end
 
     it "should let an id be set on initialization" do
       api = ApiTester.new(client, 1, :option1 => "foo")
-      api.instance_variable_get(:@options).should eql({:option1 => "foo"})
-      api.instance_variable_get(:@url).should eql("foo/1")
+      expect(api.instance_variable_get(:@options)).to eql({:option1 => "foo"})
+      expect(api.instance_variable_get(:@url)).to eql("foo/1")
     end
 
     it "should call base_url on when constructing the url" do
       api = BaseUrlTester.new(client, 1)
-      api.instance_variable_get(:@url).should eql("BASE_URL/foo/1")
+      expect(api.instance_variable_get(:@url)).to eql("BASE_URL/foo/1")
     end
   end
 

metadata

@@ -1,153 +1,202 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rapidash
-version: !ruby/object:Gem::Version 
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Gary 'Gazler' Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-07-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.25.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id007 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.8"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: coveralls
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware-multi_json
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.0"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware-multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: oauth2
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: hashie
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id014
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Evolve your API
-email: 
+email:
 - gazler@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -181,29 +230,30 @@ files:
 - spec/rapidash/urlable_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/Gazler/rapidash
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An opinionated core for creating clients for RESTful APIs quickly
-test_files: 
+test_files:
 - spec/faraday/raise_rapidash_error_spec.rb
 - spec/rapidash/base_spec.rb
 - spec/rapidash/client_spec.rb