tumblr_client 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fb916023da1ac6153753773ea107bf135b116a
-  data.tar.gz: 412324235c0ef3d931e2a67f8ee486520c354bb4
+  metadata.gz: a6f882c0459f4fa220a6e1fabf01e06fea93f0d5
+  data.tar.gz: 6dbefc136aac9e58b6d8a8f74a789f358b17e6a3
 SHA512:
-  metadata.gz: 17f177b214ca0771a21a8dbc05f4c39a948809a908d961fbad94e0cf2682a2b395db221c856129cfb5a76c5956b6e7982b1c62f7f668cf0be4d4c9056980226c
-  data.tar.gz: 4ba339f9432656da293aa6412739a32a63b409429c7f23f84b3065c36314996a610dee3efcd8cdb3733161315649317e88a6b165273ffb5efaf61a922e1ff5a5
+  metadata.gz: 1082142f48eda16cd1fc58bcf9f406f2b6bc8b3450399cb8d41e01405ed691e86914ee6e89f3f5ba12889e9e8e42b887e65c904a82f1584d3fe2cb79ee33563e
+  data.tar.gz: ac903bc1b8be3373ac5c9f9de917cb3d32cad5993288c3bf1a2ce99e1f176a8de0c8baabfbb8f93df842c8a3779efcfe7f6bc5d18fd9ba87076f6c5056e1f8c8

data/lib/tumblr/client.rb

@@ -34,6 +34,10 @@ module Tumblr
       self.class.default_api_host
     end
 
+    def api_scheme
+      @api_scheme || 'https'
+    end
+
     def credentials
       {
         :consumer_key => @consumer_key,

data/lib/tumblr/config.rb

@@ -6,7 +6,8 @@ module Tumblr
       :consumer_secret,
       :oauth_token,
       :oauth_token_secret,
-      :client
+      :client,
+      :api_scheme
     ]
 
     attr_accessor *VALID_OPTIONS_KEYS

data/lib/tumblr/connection.rb

@@ -12,13 +12,13 @@ module Tumblr
           :accept => 'application/json',
           :user_agent => "tumblr_client (ruby) - #{Tumblr::VERSION}"
         },
-        :url => "http://#{api_host}/"
+        :url => "#{api_scheme}://#{api_host}/"
       }
 
       client = Faraday.default_adapter
 
-      Faraday.new("http://#{api_host}/", default_options.merge(options)) do |conn|
-        data = { :api_host => api_host }.merge(credentials)
+      Faraday.new(default_options.merge(options)) do |conn|
+        data = { :api_host => api_host, :ignore_extra_keys => true}.merge(credentials)
         unless credentials.empty?
           conn.request :oauth, data
         end

data/lib/tumblr/version.rb

@@ -1,5 +1,5 @@
 module Tumblr
 
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 
 end

data/spec/examples/blog_spec.rb

@@ -11,19 +11,19 @@ describe Tumblr::Blog do
   describe :blog_info do
 
     it 'should make the proper request' do
-      client.should_receive(:get).once.with("v2/blog/#{blog_name}/info", {
+      expect(client).to receive(:get).once.with("v2/blog/#{blog_name}/info", {
         :api_key => consumer_key
       }).and_return 'response'
       r = client.blog_info blog_name
-      r.should == 'response'
+      expect(r).to eq('response')
     end
 
     it 'should make the proper request with a short blog name' do
-      client.should_receive(:get).once.with("v2/blog/b.tumblr.com/info", {
+      expect(client).to receive(:get).once.with("v2/blog/b.tumblr.com/info", {
         :api_key => consumer_key
       }).and_return 'response'
       r = client.blog_info 'b'
-      r.should == 'response'
+      expect(r).to eq('response')
     end
 
   end
@@ -33,13 +33,13 @@ describe Tumblr::Blog do
     context 'when supplying a size' do
 
       before do
-        client.should_receive(:get_redirect_url).once.with("v2/blog/#{blog_name}/avatar/128").
+        expect(client).to receive(:get_redirect_url).once.with("v2/blog/#{blog_name}/avatar/128").
         and_return('url')
       end
 
       it 'should construct the request properly' do
         r = client.avatar blog_name, 128
-        r.should == 'url'
+        expect(r).to eq('url')
       end
 
     end
@@ -47,13 +47,13 @@ describe Tumblr::Blog do
     context 'when no size is specified' do
 
       before do
-        client.should_receive(:get_redirect_url).once.with("v2/blog/#{blog_name}/avatar").
+        expect(client).to receive(:get_redirect_url).once.with("v2/blog/#{blog_name}/avatar").
         and_return('url')
       end
 
       it 'should construct the request properly' do
         r = client.avatar blog_name
-        r.should == 'url'
+        expect(r).to eq('url')
       end
 
     end
@@ -65,9 +65,9 @@ describe Tumblr::Blog do
     context 'with invalid parameters' do
 
       it 'should raise an error' do
-        lambda {
+        expect(lambda {
           client.followers blog_name, :not => 'an option'
-        }.should raise_error ArgumentError
+        }).to raise_error ArgumentError
       end
 
     end
@@ -75,14 +75,14 @@ describe Tumblr::Blog do
     context 'with valid parameters' do
 
       before do
-        client.should_receive(:get).once.with("v2/blog/#{blog_name}/followers", {
+        expect(client).to receive(:get).once.with("v2/blog/#{blog_name}/followers", {
           :limit => 1
         }).and_return('response')
       end
 
       it 'should construct the request properly' do
         r = client.followers blog_name, :limit => 1
-        r.should == 'response'
+        expect(r).to eq'response'
       end
 
     end
@@ -94,9 +94,9 @@ describe Tumblr::Blog do
     context 'with invalid parameters' do
 
       it 'should raise an error' do
-        lambda {
+        expect(lambda {
           client.blog_likes blog_name, :not => 'an option'
-        }.should raise_error ArgumentError
+        }).to raise_error ArgumentError
       end
 
     end
@@ -104,7 +104,7 @@ describe Tumblr::Blog do
     context 'with valid parameters' do
 
       before do
-        client.should_receive(:get).once.with("v2/blog/#{blog_name}/likes", {
+        expect(client).to receive(:get).once.with("v2/blog/#{blog_name}/likes", {
           :limit => 1,
           :api_key => consumer_key
         }).and_return('response')
@@ -112,7 +112,7 @@ describe Tumblr::Blog do
 
       it 'should construct the request properly' do
         r = client.blog_likes blog_name, :limit => 1
-        r.should == 'response'
+        expect(r).to eq('response')
       end
 
     end
@@ -124,7 +124,7 @@ describe Tumblr::Blog do
     context 'without a type supplied' do
 
       before do
-        client.should_receive(:get).once.with("v2/blog/#{blog_name}/posts", {
+        expect(client).to receive(:get).once.with("v2/blog/#{blog_name}/posts", {
           :limit => 1,
           :api_key => consumer_key
         }).and_return('response')
@@ -132,7 +132,7 @@ describe Tumblr::Blog do
 
       it 'should construct the request properly' do
         r = client.posts blog_name, :limit => 1
-        r.should == 'response'
+        expect(r).to eq('response')
       end
 
     end
@@ -140,7 +140,7 @@ describe Tumblr::Blog do
     context 'when supplying a type' do
 
       before do
-        client.should_receive(:get).once.with("v2/blog/#{blog_name}/posts/audio", {
+        expect(client).to receive(:get).once.with("v2/blog/#{blog_name}/posts/audio", {
           :limit => 1,
           :api_key => consumer_key,
           :type => 'audio'
@@ -149,7 +149,7 @@ describe Tumblr::Blog do
 
       it 'should construct the request properly' do
         r = client.posts blog_name, :limit => 1, :type => 'audio'
-        r.should == 'response'
+        expect(r).to eq('response')
       end
 
     end
@@ -166,9 +166,9 @@ describe Tumblr::Blog do
       context 'when using parameters other than limit & offset' do
 
         it 'should raise an error' do
-          lambda {
+          expect(lambda {
             client.send type, blog_name, :not => 'an option'
-          }.should raise_error ArgumentError
+          }).to raise_error ArgumentError
         end
 
       end
@@ -177,11 +177,11 @@ describe Tumblr::Blog do
 
         it 'should construct the call properly' do
           limit = 5
-          client.should_receive(:get).once.with("v2/blog/#{blog_name}/posts/#{ext}", {
+          expect(client).to receive(:get).once.with("v2/blog/#{blog_name}/posts/#{ext}", {
             :limit => limit
           }).and_return('response')
           r = client.send type, blog_name, :limit => limit
-          r.should == 'response'
+          expect(r).to eq('response')
         end
 
       end

data/spec/examples/client_spec.rb

@@ -13,16 +13,16 @@ describe Tumblr::Client do
 
     it 'should give new clients those credentials' do
       client = Tumblr::Client.new
-      client.credentials[:consumer_key].should == @key
+      expect(client.credentials[:consumer_key]).to eq(@key)
     end
 
     it 'should have it\'s own credentials' do
-      Tumblr.credentials[:consumer_key].should == @key
+      expect(Tumblr.credentials[:consumer_key]).to eq(@key)
     end
 
     it 'should be able to make a new client (using these credentials)' do
-      Tumblr.new.should be_a(Tumblr::Client)
-      Tumblr.new.credentials[:consumer_key].should == @key
+      expect(Tumblr.new).to be_a(Tumblr::Client)
+      expect(Tumblr.new.credentials[:consumer_key]).to eq(@key)
     end
 
   end
@@ -35,10 +35,30 @@ describe Tumblr::Client do
     end
 
     it 'should keep them separate' do
-      [
+      expect([
         @client1.credentials[:consumer_key],
         @client2.credentials[:consumer_key]
-      ].uniq.count.should == 2
+      ].uniq.count).to eq(2)
+    end
+
+  end
+
+  describe :api_scheme do
+
+    it 'defaults to https' do
+      expect(Tumblr::Client.new.api_scheme).to eq('https')
+    end
+
+    it 'can be set by the initializer' do
+      client = Tumblr::Client.new(:api_scheme => 'http')
+      expect(client.api_scheme).to eq('http')
+    end
+
+    it 'can be set globally' do
+      Tumblr.configure do |c|
+        c.api_scheme = 'http'
+      end
+      expect(Tumblr::Client.new.api_scheme).to eq('http')
     end
 
   end

data/spec/examples/post_spec.rb

@@ -14,7 +14,7 @@ describe Tumblr::Post do
     context 'when deleting a post' do
 
       before do
-        client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/delete", {
+        expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post/delete", {
           :id => post_id
         })
       end
@@ -33,8 +33,8 @@ describe Tumblr::Post do
         context 'when passing data as an array of filepaths' do
           before do
             fakefile = OpenStruct.new :read => file_data
-            File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
-            client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
+            allow(File).to receive(:open).with(file_path + '.jpg').and_return(fakefile)
+            expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
               'data[0]' => kind_of(Faraday::UploadIO),
                 :id => 123,
                 :type => type
@@ -43,12 +43,12 @@ describe Tumblr::Post do
 
           it 'should be able to pass data as an array of filepaths' do
             r = client.edit blog_name, :data => [file_path + ".jpg"], :id => 123, :type => type
-            r.should == 'response'
+            expect(r).to eq('response')
           end
 
           it 'should be able to pass data as an array of uploadios' do
             r = client.edit blog_name, :data => [Faraday::UploadIO.new(StringIO.new, 'image/jpeg')], :id => 123, :type => type
-            r.should == 'response'
+            expect(r).to eq('response')
           end
 
         end
@@ -57,8 +57,8 @@ describe Tumblr::Post do
 
           before do
             fakefile = OpenStruct.new :read => file_data
-            File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
-            client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
+            allow(File).to receive(:open).with(file_path + '.jpg').and_return(fakefile)
+            expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
               'data' => kind_of(Faraday::UploadIO),
                 :id => 123,
                 :type => type
@@ -67,12 +67,12 @@ describe Tumblr::Post do
 
           it 'should be able to pass data as a single filepath' do
             r = client.edit blog_name, :data => file_path + ".jpg", :id => 123, :type => type
-            r.should == 'response'
+            expect(r).to eq('response')
           end
 
           it 'should be able to pass data as a single uploadio' do
             r = client.edit blog_name, :data => Faraday::UploadIO.new(StringIO.new, 'image/jpeg'), :id => 123, :type => type
-            r.should == 'response'
+            expect(r).to eq('response')
           end
 
         end
@@ -80,22 +80,22 @@ describe Tumblr::Post do
     end
 
     it 'should make the correct call' do
-      client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
+      expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
         :id => 123
       }).and_return('response')
       r = client.edit blog_name, :id => 123
-      r.should == 'response'
+      expect(r).to eq('response')
     end
   end
 
   describe :reblog do
 
     it 'should make the correct call' do
-      client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/reblog", {
+      expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post/reblog", {
         :id => 123
       }).and_return('response')
       r = client.reblog blog_name, :id => 123
-      r.should == 'response'
+      expect(r).to eq('response')
     end
 
   end
@@ -110,9 +110,9 @@ describe Tumblr::Post do
       context 'when passing an option which is not allowed' do
 
         it 'should raise an error' do
-          lambda {
+          expect(lambda {
             client.send type, blog_name, :not => 'an option'
-          }.should raise_error ArgumentError
+          }).to raise_error ArgumentError
         end
 
       end
@@ -121,7 +121,7 @@ describe Tumblr::Post do
 
         before do
           @val = 'hello world'
-          client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
+          expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post", {
             field.to_sym => @val,
             :type => type.to_s
           }).and_return('response')
@@ -129,7 +129,7 @@ describe Tumblr::Post do
 
         it 'should set up the call properly' do
           r = client.send type, blog_name, field.to_sym => @val
-          r.should == 'response'
+          expect(r).to eq('response')
         end
 
       end
@@ -146,11 +146,11 @@ describe Tumblr::Post do
     context 'with a valid post type' do
 
       before do
-        client.should_receive(:photo).with(blog_name, args).and_return 'hi'
+        expect(client).to receive(:photo).with(blog_name, args).and_return 'hi'
       end
 
       it 'should call the right method and grab the return' do
-        client.create_post(:photo, blog_name, args).should == 'hi'
+        expect(client.create_post(:photo, blog_name, args)).to eq('hi')
       end
 
     end
@@ -158,9 +158,9 @@ describe Tumblr::Post do
     context 'with an invalid post type' do
 
       it 'should raise an error' do
-        lambda do
+        expect(lambda do
           client.create_post(:fake, blog_name, args)
-        end.should raise_error ArgumentError, '"fake" is not a valid post type'
+        end).to raise_error ArgumentError, '"fake" is not a valid post type'
       end
 
     end
@@ -175,9 +175,9 @@ describe Tumblr::Post do
       context 'when passing an option which is not allowed' do
 
         it 'should raise an error' do
-          lambda {
+          expect(lambda {
             client.send type, blog_name, :not => 'an option'
-          }.should raise_error ArgumentError
+          }).to raise_error ArgumentError
         end
 
       end
@@ -185,8 +185,8 @@ describe Tumblr::Post do
       context 'when passing data as an array of filepaths' do
         before do
           fakefile = OpenStruct.new :read => file_data
-          File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
-          client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
+          allow(File).to receive(:open).with(file_path + '.jpg').and_return(fakefile)
+          expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post", {
             'data[0]' => kind_of(Faraday::UploadIO),
             :type => type.to_s
           }).and_return('post')
@@ -194,12 +194,12 @@ describe Tumblr::Post do
         
         it 'should be able to pass data as an array of filepaths' do
           r = client.send type, blog_name, :data => [file_path + ".jpg"]
-          r.should == 'post'
+          expect(r).to eq('post')
         end
 
         it 'should be able to pass data as an array of uploadios' do
           r = client.send type, blog_name, :data => [Faraday::UploadIO.new(StringIO.new, 'image/jpeg')]
-          r.should == 'post'
+          expect(r).to eq('post')
         end
 
       end
@@ -208,8 +208,8 @@ describe Tumblr::Post do
 
         before do
           fakefile = OpenStruct.new :read => file_data
-          File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
-          client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
+          allow(File).to receive(:open).with(file_path + '.jpg').and_return(fakefile)
+          expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post", {
             'data' => kind_of(Faraday::UploadIO),
             :type => type.to_s
           }).and_return('post')
@@ -217,12 +217,12 @@ describe Tumblr::Post do
 
         it 'should be able to pass data as a single filepath' do
           r = client.send type, blog_name, :data => file_path + ".jpg"
-          r.should == 'post'
+          expect(r).to eq('post')
         end
 
         it 'should be able to pass data as a single uploadio' do
           r = client.send type, blog_name, :data => Faraday::UploadIO.new(StringIO.new, 'image/jpeg')
-          r.should == 'post'
+          expect(r).to eq('post')
         end
 
       end
@@ -233,7 +233,7 @@ describe Tumblr::Post do
         context 'when passing source different ways' do
 
           it 'should be able to be passed as a string' do
-            client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
+            expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post", {
               :source => source,
               :type => type.to_s
             })
@@ -241,7 +241,7 @@ describe Tumblr::Post do
           end
 
           it 'should be able to be passed as an array' do
-            client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
+            expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post", {
               'source[0]' => source,
               'source[1]' => source,
               :type => type.to_s
@@ -250,7 +250,7 @@ describe Tumblr::Post do
           end
 
           it 'should be able to be passed as an array on edit' do
-            client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
+            expect(client).to receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
               :id => post_id,
               'source[0]' => source,
               'source[1]' => source
@@ -265,9 +265,9 @@ describe Tumblr::Post do
       context 'when passing colliding options' do
 
         it 'should get an error when passing data & source' do
-          lambda {
+          expect(lambda {
             client.send type, blog_name, :data => 'hi', :source => 'bye'
-          }.should raise_error ArgumentError
+          }).to raise_error ArgumentError
         end
 
       end

data/spec/examples/request_spec.rb

@@ -13,7 +13,7 @@ describe Tumblr::Request do
         it 'should return the meta object' do
           data = { :message => 'ohyes' }
           response = OpenStruct.new(:status => rcode, :body => { 'response' => data })
-          client.respond(response).should == data
+          expect(client.respond(response)).to eq(data)
         end
 
       end
@@ -25,13 +25,13 @@ describe Tumblr::Request do
       it 'should return the meta object (merged with response)' do
         meta = { :message => 'ohno' }
         response = OpenStruct.new(:status => 401, :body => { 'meta' => meta, 'response' => { :also => 'hi' } })
-        client.respond(response).should == { :message => 'ohno', :also => 'hi' }
+        expect(client.respond(response)).to eq({ :message => 'ohno', :also => 'hi' })
       end
 
       it 'should return the meta object even when response is nil' do
         meta = { :message => 'ohno' }
         response = OpenStruct.new(:status => 401, :body => { 'meta' => meta, 'response' => nil })
-        client.respond(response).should == meta
+        expect(client.respond(response)).to eq(meta)
       end
 
     end
@@ -43,7 +43,7 @@ describe Tumblr::Request do
     before do
       @path = '/the/path'
       @params = { :hello => 'world' }
-      client.should_receive(:get_response).once.with(@path, @params).
+      expect(client).to receive(:get_response).once.with(@path, @params).
       and_return(OpenStruct.new({
         :status => 200,
         :body => { 'response' => 'result' }
@@ -51,7 +51,7 @@ describe Tumblr::Request do
     end
 
     it 'should get the response directly' do
-      client.get(@path, @params).should == 'result'
+      expect(client.get(@path, @params)).to eq('result')
     end
 
   end
@@ -64,7 +64,7 @@ describe Tumblr::Request do
         @path = '/the/path'
         @params = { :hello => 'world' }
         @redirect_url = 'redirect-to-here'
-        client.should_receive(:get_response).once.with(@path, @params).
+        expect(client).to receive(:get_response).once.with(@path, @params).
         and_return(OpenStruct.new({
           :status => 301,
           :headers => { 'Location' => @redirect_url }
@@ -72,7 +72,7 @@ describe Tumblr::Request do
       end
 
       it 'should return the redirect url' do
-        client.get_redirect_url(@path, @params).should == @redirect_url
+        expect(client.get_redirect_url(@path, @params)).to eq(@redirect_url)
       end
 
     end
@@ -83,7 +83,7 @@ describe Tumblr::Request do
         @path = '/the/path'
         @params = { :hello => 'world' }
         @meta = { :message => 'ohno' }
-        client.should_receive(:get_response).once.with(@path, @params).
+        expect(client).to receive(:get_response).once.with(@path, @params).
         and_return(OpenStruct.new({
           :status => 401,
           :body => { 'meta' => @meta }
@@ -91,7 +91,7 @@ describe Tumblr::Request do
       end
 
       it 'should return the error meta' do
-        client.get_redirect_url(@path, @params).should == @meta
+        expect(client.get_redirect_url(@path, @params)).to eq(@meta)
       end
 
     end

data/spec/examples/tagged_spec.rb

@@ -15,7 +15,7 @@ describe Tumblr::Tagged do
   describe :tagged do
 
     before do
-      client.should_receive(:get).once.with('v2/tagged', {
+      expect(client).to receive(:get).once.with('v2/tagged', {
         :tag => tag,
         :api_key => consumer_key
       }).and_return('response')
@@ -23,7 +23,7 @@ describe Tumblr::Tagged do
 
     it 'should setup the request properly' do
       r = client.tagged tag
-      r.should == 'response'
+      expect(r).to eq('response')
     end
 
   end

data/spec/examples/user_spec.rb

@@ -7,9 +7,9 @@ describe Tumblr::User do
   describe :info do
 
     it 'should make the request properly' do
-      client.should_receive(:get).with('v2/user/info').and_return('response')
+      expect(client).to receive(:get).with('v2/user/info').and_return('response')
       r = client.info
-      r.should == 'response'
+      expect(r).to eq('response')
     end
 
   end
@@ -19,9 +19,9 @@ describe Tumblr::User do
     context 'when using options that are not allowed' do
 
       it 'should raise an error' do
-        lambda {
+        expect(lambda {
           client.dashboard :not => 'an option'
-        }.should raise_error ArgumentError
+        }).to raise_error ArgumentError
       end
 
     end
@@ -29,11 +29,11 @@ describe Tumblr::User do
     context 'when using valid options' do
 
       it 'should make the correct call' do
-        client.should_receive(:get).with('v2/user/dashboard', {
+        expect(client).to receive(:get).with('v2/user/dashboard', {
           :limit => 25
         }).and_return('response')
         r = client.dashboard :limit => 25
-        r.should == 'response'
+        expect(r).to eq('response')
       end
 
     end
@@ -48,10 +48,10 @@ describe Tumblr::User do
       context 'with defaults' do
 
          it 'should make the reqest properly' do
-           client.should_receive(:get).with("v2/user/#{type}", {}).
+           expect(client).to receive(:get).with("v2/user/#{type}", {}).
            and_return('response')
            r = client.send type
-           r.should == 'response'
+           expect(r).to eq('response')
          end
 
       end
@@ -59,12 +59,12 @@ describe Tumblr::User do
       context 'with custom limit & offset' do
 
          it 'should make the reqest properly' do
-           client.should_receive(:get).with("v2/user/#{type}", {
+           expect(client).to receive(:get).with("v2/user/#{type}", {
              :limit => 10,
              :offset => 5
            }).and_return('response')
            r = client.send type, :offset => 5, :limit => 10
-           r.should == 'response'
+           expect(r).to eq('response')
          end
 
       end
@@ -81,12 +81,12 @@ describe Tumblr::User do
       it 'should make the request properly' do
         id = 123
         reblog_key = 'hello'
-        client.should_receive(:post).with("v2/user/#{type}", {
+        expect(client).to receive(:post).with("v2/user/#{type}", {
           :id => id,
           :reblog_key => reblog_key
         }).and_return('response')
         r = client.send type, id, reblog_key
-        r.should == 'response'
+        expect(r).to eq('response')
       end
 
     end
@@ -100,11 +100,11 @@ describe Tumblr::User do
 
       it 'should make the request properly' do
         url = 'some url'
-        client.should_receive(:post).with("v2/user/#{type}", {
+        expect(client).to receive(:post).with("v2/user/#{type}", {
           :url => url
         }).and_return('response')
         r = client.send type, url
-        r.should == 'response'
+        expect(r).to eq('response')
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_client
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - John Bunting
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday