twitter 4.1.0 → 4.1.1

data/spec/twitter/base_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe Twitter::Base do
 
-  context 'identity map enabled' do
+  context "identity map enabled" do
     before do
       Twitter.identity_map = Twitter::IdentityMap
       object = Twitter::Base.new(:id => 1)
@@ -13,70 +13,68 @@ describe Twitter::Base do
       Twitter.identity_map = false
     end
 
-    describe '.identity_map' do
-      it 'returns an instance of the identity map' do
-        Twitter::Base.identity_map.should be_a Twitter::IdentityMap
+    describe ".identity_map" do
+      it "returns an instance of the identity map" do
+        expect(Twitter::Base.identity_map).to be_a Twitter::IdentityMap
       end
     end
 
-    describe '.fetch' do
-      it 'returns existing objects' do
-        Twitter::Base.fetch(:id => 1).should be
+    describe ".fetch" do
+      it "returns existing objects" do
+        expect(Twitter::Base.fetch(:id => 1)).to be
       end
 
       it "raises an error on objects that don't exist" do
-        lambda {
-          Twitter::Base.fetch(:id => 6)
-        }.should raise_error(Twitter::Error::IdentityMapKeyError)
+        expect{Twitter::Base.fetch(:id => 6)}.to raise_error(Twitter::Error::IdentityMapKeyError)
       end
     end
 
-    describe '.store' do
-      it 'stores Twitter::Base objects' do
+    describe ".store" do
+      it "stores Twitter::Base objects" do
         object = Twitter::Base.new(:id => 4)
-        Twitter::Base.store(object).should be_a Twitter::Base
+        expect(Twitter::Base.store(object)).to be_a Twitter::Base
       end
     end
 
-    describe '.fetch_or_new' do
-      it 'returns existing objects' do
-        Twitter::Base.fetch_or_new(:id => 1).should be
+    describe ".fetch_or_new" do
+      it "returns existing objects" do
+        expect(Twitter::Base.fetch_or_new(:id => 1)).to be
       end
-      it 'creates new objects and stores them' do
-        Twitter::Base.fetch_or_new(:id => 2).should be
-        Twitter::Base.fetch(:id => 2).should be
+      it "creates new objects and stores them" do
+        expect(Twitter::Base.fetch_or_new(:id => 2)).to be
+        expect(Twitter::Base.fetch(:id => 2)).to be
       end
     end
 
     describe "#[]" do
       it "calls methods using [] with symbol" do
-        @base[:object_id].should be_an Integer
+        expect(@base[:object_id]).to be_an Integer
       end
       it "calls methods using [] with string" do
-        @base['object_id'].should be_an Integer
+        expect(@base['object_id']).to be_an Integer
       end
       it "returns nil for missing method" do
-        @base[:foo].should be_nil
-        @base['foo'].should be_nil
+        expect(@base[:foo]).to be_nil
+        expect(@base['foo']).to be_nil
       end
     end
 
     describe "#to_hash" do
       it "returns a hash" do
-        @base.to_hash.should be_a Hash
-        @base.to_hash[:id].should eq 1
+        expect(@base.to_hash).to be_a Hash
+        expect(@base.to_hash[:id]).to eq 1
       end
     end
 
     describe "identical objects" do
       it "have the same object_id" do
-        @base.object_id.should eq Twitter::Base.fetch(:id => 1).object_id
+        expect(@base.object_id).to eq Twitter::Base.fetch(:id => 1).object_id
       end
     end
 
   end
 
-  context 'identity map disabled' do
+  context "identity map disabled" do
     before(:all) do
       Twitter.identity_map = false
     end
@@ -84,28 +82,28 @@ describe Twitter::Base do
       Twitter.identity_map = Twitter::IdentityMap
     end
 
-    describe '.identity_map' do
-      it 'returns nil' do
-        Twitter::Base.identity_map.should be_nil
+    describe ".identity_map" do
+      it "returns nil" do
+        expect(Twitter::Base.identity_map).to be_nil
       end
     end
 
-    describe '.fetch' do
-      it 'returns nil' do
-        Twitter::Base.fetch(:id => 1).should be_nil
+    describe ".fetch" do
+      it "returns nil" do
+        expect(Twitter::Base.fetch(:id => 1)).to be_nil
       end
     end
 
-    describe '.store' do
-      it 'returns an instance of the object' do
-        Twitter::Base.store(Twitter::Base.new(:id => 1)).should be_a Twitter::Base
+    describe ".store" do
+      it "returns an instance of the object" do
+        expect(Twitter::Base.store(Twitter::Base.new(:id => 1))).to be_a Twitter::Base
       end
     end
 
-    describe '.fetch_or_new' do
-      it 'creates new objects' do
-        Twitter::Base.fetch_or_new(:id => 2).should be
-        Twitter.identity_map.should be_false
+    describe ".fetch_or_new" do
+      it "creates new objects" do
+        expect(Twitter::Base.fetch_or_new(:id => 2)).to be
+        expect(Twitter.identity_map).to be_false
       end
     end
   end

data/spec/twitter/basic_user_spec.rb

@@ -6,17 +6,17 @@ describe Twitter::BasicUser do
     it "returns true when objects IDs are the same" do
       saved_search = Twitter::BasicUser.new(:id => 1, :name => "foo")
       other = Twitter::BasicUser.new(:id => 1, :name => "bar")
-      (saved_search == other).should be_true
+      expect(saved_search == other).to be_true
     end
     it "returns false when objects IDs are different" do
       saved_search = Twitter::BasicUser.new(:id => 1)
       other = Twitter::BasicUser.new(:id => 2)
-      (saved_search == other).should be_false
+      expect(saved_search == other).to be_false
     end
     it "returns false when classes are different" do
       saved_search = Twitter::BasicUser.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      (saved_search == other).should be_false
+      expect(saved_search == other).to be_false
     end
   end
 

data/spec/twitter/client_spec.rb

@@ -25,7 +25,7 @@ describe Twitter::Client do
     it "inherits the module configuration" do
       client = Twitter::Client.new
       Twitter::Configurable.keys.each do |key|
-        client.instance_variable_get(:"@#{key}").should eq key
+        expect(client.instance_variable_get(:"@#{key}")).to eq key
       end
     end
 
@@ -48,12 +48,12 @@ describe Twitter::Client do
         it "overrides the module configuration" do
           client = Twitter::Client.new(@configuration)
           Twitter::Configurable.keys.each do |key|
-            client.instance_variable_get(:"@#{key}").should eq @configuration[key]
+            expect(client.instance_variable_get(:"@#{key}")).to eq @configuration[key]
           end
         end
       end
 
-      context "after initilization" do
+      context "after initialization" do
         it "overrides the module configuration after initialization" do
           client = Twitter::Client.new
           client.configure do |config|
@@ -62,7 +62,7 @@ describe Twitter::Client do
             end
           end
           Twitter::Configurable.keys.each do |key|
-            client.instance_variable_get(:"@#{key}").should eq @configuration[key]
+            expect(client.instance_variable_get(:"@#{key}")).to eq @configuration[key]
           end
         end
       end
@@ -71,91 +71,73 @@ describe Twitter::Client do
   end
 
   it "does not cache the screen name across clients" do
-    stub_get("/1.1/account/verify_credentials.json").
-      to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     client1 = Twitter::Client.new
-    client1.verify_credentials.id.should eq 7505382
-    stub_get("/1.1/account/verify_credentials.json").
-      to_return(:body => fixture("pengwynn.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    expect(client1.verify_credentials.id).to eq 7505382
+    stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("pengwynn.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     client2 = Twitter::Client.new
-    client2.verify_credentials.id.should eq 14100886
+    expect(client2.verify_credentials.id).to eq 14100886
   end
 
   describe "#delete" do
     before do
-      stub_delete("/custom/delete").
-        with(:query => {:deleted => "object"})
+      stub_delete("/custom/delete").with(:query => {:deleted => "object"})
     end
     it "allows custom put requests" do
       subject.delete("/custom/delete", {:deleted => "object"})
-      a_delete("/custom/delete").
-        with(:query => {:deleted => "object"}).
-        should have_been_made
+      expect(a_delete("/custom/delete").with(:query => {:deleted => "object"})).to have_been_made
     end
   end
 
   describe "#put" do
     before do
-      stub_put("/custom/put").
-        with(:body => {:updated => "object"})
+      stub_put("/custom/put").with(:body => {:updated => "object"})
     end
     it "allows custom put requests" do
       subject.put("/custom/put", {:updated => "object"})
-      a_put("/custom/put").
-        with(:body => {:updated => "object"}).
-        should have_been_made
+      expect(a_put("/custom/put").with(:body => {:updated => "object"})).to have_been_made
     end
   end
 
   describe "#credentials?" do
     it "returns true if all credentials are present" do
       client = Twitter::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :oauth_token => 'OT', :oauth_token_secret => 'OS')
-      client.credentials?.should be_true
+      expect(client.credentials?).to be_true
     end
     it "returns false if any credentials are missing" do
       client = Twitter::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :oauth_token => 'OT')
-      client.credentials?.should be_false
+      expect(client.credentials?).to be_false
     end
   end
 
   describe "#connection" do
     it "looks like Faraday connection" do
-      subject.connection.should respond_to(:run_request)
+      expect(subject.connection).to respond_to(:run_request)
     end
     it "memoizes the connection" do
       c1, c2 = subject.connection, subject.connection
-      c1.object_id.should eq c2.object_id
+      expect(c1.object_id).to eq c2.object_id
     end
   end
 
   describe "#request" do
     it "encodes the entire body when no uploaded media is present" do
-      stub_post("/1.1/statuses/update.json").
-        with(:body => {:status => "Update"}).
-        to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/statuses/update.json").with(:body => {:status => "Update"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       subject.update("Update")
-      a_post("/1.1/statuses/update.json").
-        with(:body => {:status => "Update"}).
-        should have_been_made
+      expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Update"})).to have_been_made
     end
     it "encodes none of the body when uploaded media is present" do
-      stub_post("/1.1/statuses/update_with_media.json").
-        to_return(:body => fixture("status_with_media.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/statuses/update_with_media.json").to_return(:body => fixture("status_with_media.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       subject.update_with_media("Update", fixture("pbjt.gif"))
-      a_post("/1.1/statuses/update_with_media.json").
-        should have_been_made
+      expect(a_post("/1.1/statuses/update_with_media.json")).to have_been_made
     end
     it "catches Faraday errors" do
       subject.stub!(:connection).and_raise(Faraday::Error::ClientError.new("Oups"))
-      lambda do
-        subject.request(:get, "/path")
-      end.should raise_error(Twitter::Error::ClientError, "Oups")
+      expect{subject.request(:get, "/path")}.to raise_error(Twitter::Error::ClientError, "Oups")
     end
     it "catches MultiJson::DecodeError errors" do
       subject.stub!(:connection).and_raise(MultiJson::DecodeError.new("unexpected token", [], "<!DOCTYPE html>"))
-      lambda do
-        subject.request(:get, "/path")
-      end.should raise_error(Twitter::Error::DecodeError, "unexpected token")
+      expect{subject.request(:get, "/path")}.to raise_error(Twitter::Error::DecodeError, "unexpected token")
     end
   end
 
@@ -163,12 +145,12 @@ describe Twitter::Client do
     it "creates the correct auth headers" do
       uri = URI("https://api.twitter.com/1.1/direct_messages.json")
       authorization = subject.auth_header(:get, uri)
-      authorization.options[:signature_method].should eq "HMAC-SHA1"
-      authorization.options[:version].should eq "1.0"
-      authorization.options[:consumer_key].should eq "CK"
-      authorization.options[:consumer_secret].should eq "CS"
-      authorization.options[:token].should eq "OT"
-      authorization.options[:token_secret].should eq "OS"
+      expect(authorization.options[:signature_method]).to eq "HMAC-SHA1"
+      expect(authorization.options[:version]).to eq "1.0"
+      expect(authorization.options[:consumer_key]).to eq "CK"
+      expect(authorization.options[:consumer_secret]).to eq "CS"
+      expect(authorization.options[:token]).to eq "OT"
+      expect(authorization.options[:token_secret]).to eq "OS"
     end
   end
 

data/spec/twitter/configuration_spec.rb

@@ -5,12 +5,12 @@ describe Twitter::Configuration do
   describe "#photo_sizes" do
     it "returns a hash of sizes when photo_sizes is set" do
       photo_sizes = Twitter::Configuration.new(:photo_sizes => {:small => {:h => 226, :w => 340, :resize => 'fit'}, :large => {:h => 466, :w => 700, :resize => 'fit'}, :medium => {:h => 399, :w => 600, :resize => 'fit'}, :thumb => {:h => 150, :w => 150, :resize => 'crop'}}).photo_sizes
-      photo_sizes.should be_a Hash
-      photo_sizes[:small].should be_a Twitter::Size
+      expect(photo_sizes).to be_a Hash
+      expect(photo_sizes[:small]).to be_a Twitter::Size
     end
     it "is empty when photo_sizes is not set" do
       photo_sizes = Twitter::Configuration.new.photo_sizes
-      photo_sizes.should be_empty
+      expect(photo_sizes).to be_empty
     end
   end
 

data/spec/twitter/cursor_spec.rb

@@ -5,59 +5,43 @@ describe Twitter::Cursor do
   describe "#collection" do
     it "returns a collection" do
       collection = Twitter::Cursor.new({:ids => [1, 2, 3, 4, 5]}, :ids, nil, Twitter::Client.new, :follower_ids, {}).collection
-      collection.should be_an Array
-      collection.first.should be_a Fixnum
+      expect(collection).to be_an Array
+      expect(collection.first).to be_a Fixnum
     end
   end
 
   describe "#all" do
     before do
       @client = Twitter::Client.new
-      stub_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-        to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).
-        to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resources" do
       @client.follower_ids("sferik").all
-      a_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-        should have_been_made
-      a_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).
-        should have_been_made
+      expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
+      expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
     end
     it "fetches all" do
       follower_ids = @client.follower_ids("sferik").all
-      follower_ids.size.should == 5993
+      expect(follower_ids.size).to eq 5993
     end
   end
 
   describe "#each" do
     before do
       @client = Twitter::Client.new
-      stub_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-        to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).
-        to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resources" do
       @client.follower_ids("sferik").each{}
-      a_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-        should have_been_made
-      a_get("/1.1/followers/ids.json").
-        with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).
-        should have_been_made
+      expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
+      expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
     end
     it "iterates" do
       count = 0
       @client.follower_ids("sferik").each{count += 1}
-      count.should == 5993
+      expect(count).to eq 5993
     end
   end
 
@@ -67,7 +51,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:previous_cursor => 0}, :ids, nil, Twitter::Client.new, :follower_ids, {})
       end
       it "returns true" do
-        @cursor.first?.should be_true
+        expect(@cursor.first?).to be_true
       end
     end
     context "when previous cursor does not equal zero" do
@@ -75,7 +59,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:previous_cursor => 1}, :ids, nil, Twitter::Client.new, :follower_ids, {})
       end
       it "returns true" do
-        @cursor.first?.should be_false
+        expect(@cursor.first?).to be_false
       end
     end
   end
@@ -86,7 +70,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:next_cursor => 0}, :ids, nil, Twitter::Client.new, :follower_ids, {})
       end
       it "returns true" do
-        @cursor.last?.should be_true
+        expect(@cursor.last?).to be_true
       end
     end
     context "when next cursor does not equal zero" do
@@ -94,7 +78,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:next_cursor => 1}, :ids, nil, Twitter::Client.new, :follower_ids, {})
       end
       it "returns false" do
-        @cursor.last?.should be_false
+        expect(@cursor.last?).to be_false
       end
     end
   end

data/spec/twitter/direct_message_spec.rb

@@ -6,50 +6,50 @@ describe Twitter::DirectMessage do
     it "returns true when objects IDs are the same" do
       direct_message = Twitter::DirectMessage.new(:id => 1, :text => "foo")
       other = Twitter::DirectMessage.new(:id => 1, :text => "bar")
-      (direct_message == other).should be_true
+      expect(direct_message == other).to be_true
     end
     it "returns false when objects IDs are different" do
       direct_message = Twitter::DirectMessage.new(:id => 1)
       other = Twitter::DirectMessage.new(:id => 2)
-      (direct_message == other).should be_false
+      expect(direct_message == other).to be_false
     end
     it "returns false when classes are different" do
       direct_message = Twitter::DirectMessage.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      (direct_message == other).should be_false
+      expect(direct_message == other).to be_false
     end
   end
 
   describe "#created_at" do
     it "returns a Time when created_at is set" do
       direct_message = Twitter::DirectMessage.new(:id => 1825786345, :created_at => "Mon Jul 16 12:59:01 +0000 2007")
-      direct_message.created_at.should be_a Time
+      expect(direct_message.created_at).to be_a Time
     end
     it "returns nil when created_at is not set" do
       direct_message = Twitter::DirectMessage.new(:id => 1825786345)
-      direct_message.created_at.should be_nil
+      expect(direct_message.created_at).to be_nil
     end
   end
 
   describe "#recipient" do
     it "returns a User when recipient is set" do
       recipient = Twitter::DirectMessage.new(:id => 1825786345, :recipient => {:id => 7505382}).recipient
-      recipient.should be_a Twitter::User
+      expect(recipient).to be_a Twitter::User
     end
     it "returns nil when recipient is not set" do
       recipient = Twitter::DirectMessage.new(:id => 1825786345).recipient
-      recipient.should be_nil
+      expect(recipient).to be_nil
     end
   end
 
   describe "#sender" do
     it "returns a User when sender is set" do
       sender = Twitter::DirectMessage.new(:id => 1825786345, :sender => {:id => 7505382}).sender
-      sender.should be_a Twitter::User
+      expect(sender).to be_a Twitter::User
     end
     it "returns nil when sender is not set" do
       sender = Twitter::DirectMessage.new(:id => 1825786345).sender
-      sender.should be_nil
+      expect(sender).to be_nil
     end
   end