twitter 5.5.1 → 5.6.0

data/spec/twitter/geo_factory_spec.rb

@@ -12,7 +12,7 @@ describe Twitter::GeoFactory do
       expect(geo).to be_a Twitter::Geo::Polygon
     end
     it 'raises an IndexError when type is not specified' do
-      expect { Twitter::GeoFactory.new }.to raise_error IndexError
+      expect { Twitter::GeoFactory.new }.to raise_error(IndexError)
     end
   end
 

data/spec/twitter/identifiable_spec.rb

@@ -4,7 +4,7 @@ describe Twitter::Identity do
 
   describe '#initialize' do
     it 'raises an IndexError when id is not specified' do
-      expect { Twitter::Identity.new }.to raise_error IndexError
+      expect { Twitter::Identity.new }.to raise_error(IndexError)
     end
   end
 

data/spec/twitter/media_factory_spec.rb

@@ -8,7 +8,7 @@ describe Twitter::MediaFactory do
       expect(media).to be_a Twitter::Media::Photo
     end
     it 'raises an IndexError when type is not specified' do
-      expect { Twitter::MediaFactory.new }.to raise_error IndexError
+      expect { Twitter::MediaFactory.new }.to raise_error(IndexError)
     end
   end
 

data/spec/twitter/rest/api/favorites_spec.rb

@@ -151,7 +151,7 @@ describe Twitter::REST::API::Favorites do
         stub_post('/1.1/favorites/create.json').with(:body => {:id => '25938088801'}).to_return(:status => 403, :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises a Forbidden error' do
-        expect { @client.favorite!(25_938_088_801) }.to raise_error Twitter::Error::Forbidden
+        expect { @client.favorite!(25_938_088_801) }.to raise_error(Twitter::Error::Forbidden)
       end
     end
     context 'already favorited' do
@@ -159,7 +159,7 @@ describe Twitter::REST::API::Favorites do
         stub_post('/1.1/favorites/create.json').with(:body => {:id => '25938088801'}).to_return(:status => 403, :body => fixture('already_favorited.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises an AlreadyFavorited error' do
-        expect { @client.favorite!(25_938_088_801) }.to raise_error Twitter::Error::AlreadyFavorited
+        expect { @client.favorite!(25_938_088_801) }.to raise_error(Twitter::Error::AlreadyFavorited)
       end
     end
     context 'with a URI object passed' do

data/spec/twitter/rest/api/tweets_spec.rb

@@ -223,7 +223,7 @@ describe Twitter::REST::API::Tweets do
         stub_post('/1.1/statuses/update.json').to_return(:status => 403, :body => fixture('already_posted.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises an AlreadyPosted error' do
-        expect { @client.update("The problem with your code is that it's doing exactly what you told it to do.") }.to raise_error Twitter::Error::AlreadyPosted
+        expect { @client.update("The problem with your code is that it's doing exactly what you told it to do.") }.to raise_error(Twitter::Error::AlreadyPosted)
       end
     end
     context 'with an in-reply-to status' do
@@ -333,7 +333,7 @@ describe Twitter::REST::API::Tweets do
         stub_post('/1.1/statuses/retweet/25938088801.json').to_return(:status => 403, :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises a Forbidden error' do
-        expect { @client.retweet!(25_938_088_801) }.to raise_error Twitter::Error::Forbidden
+        expect { @client.retweet!(25_938_088_801) }.to raise_error(Twitter::Error::Forbidden)
       end
     end
     context 'already retweeted' do
@@ -341,7 +341,7 @@ describe Twitter::REST::API::Tweets do
         stub_post('/1.1/statuses/retweet/25938088801.json').to_return(:status => 403, :body => fixture('already_retweeted.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises an AlreadyRetweeted error' do
-        expect { @client.retweet!(25_938_088_801) }.to raise_error Twitter::Error::AlreadyRetweeted
+        expect { @client.retweet!(25_938_088_801) }.to raise_error(Twitter::Error::AlreadyRetweeted)
       end
     end
     context 'with a URI object passed' do
@@ -410,7 +410,7 @@ describe Twitter::REST::API::Tweets do
         stub_post('/1.1/statuses/update_with_media.json').to_return(:status => 403, :body => fixture('already_posted.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises an AlreadyPosted error' do
-        expect { @client.update_with_media("The problem with your code is that it's doing exactly what you told it to do.", fixture('pbjt.gif')) }.to raise_error Twitter::Error::AlreadyPosted
+        expect { @client.update_with_media("The problem with your code is that it's doing exactly what you told it to do.", fixture('pbjt.gif')) }.to raise_error(Twitter::Error::AlreadyPosted)
       end
     end
   end

data/spec/twitter/rest/client_spec.rb

@@ -43,26 +43,6 @@ describe Twitter::REST::Client do
     expect(user1).not_to eq(user2)
   end
 
-  describe '#delete' do
-    before do
-      stub_delete('/custom/delete').with(:query => {:deleted => 'object'})
-    end
-    it 'allows custom delete requests' do
-      @client.delete('/custom/delete', :deleted => 'object')
-      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'})
-    end
-    it 'allows custom put requests' do
-      @client.put('/custom/put', :updated => 'object')
-      expect(a_put('/custom/put').with(:body => {:updated => 'object'})).to have_been_made
-    end
-  end
-
   describe '#user_token?' do
     it 'returns true if the user token/secret are present' do
       client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :access_token => 'AT', :access_token_secret => 'AS')
@@ -117,13 +97,21 @@ describe Twitter::REST::Client do
       @client.update_with_media('Update', fixture('pbjt.gif'))
       expect(a_post('/1.1/statuses/update_with_media.json')).to have_been_made
     end
-    it 'catches Faraday errors' do
-      allow(@client).to receive(:connection).and_raise(Faraday::Error::ClientError.new('Oops'))
-      expect { @client.send(:request, :get, '/path') }.to raise_error Twitter::Error
+    it 'catches and reraises Faraday timeout errors' do
+      allow(@client).to receive(:connection).and_raise(Faraday::Error::TimeoutError.new('execution expired'))
+      expect { @client.send(:request, :get, '/path') }.to raise_error(Twitter::Error::RequestTimeout)
+    end
+    it 'catches and reraises Timeout errors' do
+      allow(@client).to receive(:connection).and_raise(Timeout::Error.new('execution expired'))
+      expect { @client.send(:request, :get, '/path') }.to raise_error(Twitter::Error::RequestTimeout)
+    end
+    it 'catches and reraises Faraday client errors' do
+      allow(@client).to receive(:connection).and_raise(Faraday::Error::ClientError.new('connection failed'))
+      expect { @client.send(:request, :get, '/path') }.to raise_error(Twitter::Error)
     end
-    it 'catches JSON::ParserError errors' do
+    it 'catches and reraises JSON::ParserError errors' do
       allow(@client).to receive(:connection).and_raise(JSON::ParserError.new('unexpected token'))
-      expect { @client.send(:request, :get, '/path') }.to raise_error Twitter::Error
+      expect { @client.send(:request, :get, '/path') }.to raise_error(Twitter::Error)
     end
   end
 

data/spec/twitter/tweet_spec.rb

@@ -156,6 +156,20 @@ describe Twitter::Tweet do
     end
   end
 
+  describe '#hashtags?' do
+    it 'returns true when the tweet includes hashtags entities' do
+      entities = {
+        :hashtags => [{:text => 'twitter', :indices => [10, 33]}]
+      }
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => entities)
+      expect(tweet.hashtags?).to be_true
+    end
+    it 'returns false when no entities are present' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.hashtags?).to be_false
+    end
+  end
+
   describe '#media' do
     it 'returns media' do
       media = Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:media => [{:id => 1, :type => 'photo'}]}).media
@@ -172,6 +186,20 @@ describe Twitter::Tweet do
     end
   end
 
+  describe '#media?' do
+    it 'returns true when the tweet includes media entities' do
+      entities = {
+        :media => [{:id => '1', :type => 'photo'}]
+      }
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => entities)
+      expect(tweet.media?).to be_true
+    end
+    it 'returns false when no entities are present' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.media?).to be_false
+    end
+  end
+
   describe '#metadata' do
     it 'returns a Twitter::Metadata when metadata is set' do
       tweet = Twitter::Tweet.new(:id => 28_669_546_014, :metadata => {})
@@ -284,6 +312,20 @@ describe Twitter::Tweet do
     end
   end
 
+  describe '#symbols?' do
+    it 'returns true when the tweet includes symbols entities' do
+      entities = {
+        :symbols => [{:text => 'PEP'}]
+      }
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => entities)
+      expect(tweet.symbols?).to be_true
+    end
+    it 'returns false when no entities are present' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.symbols?).to be_false
+    end
+  end
+
   describe '#uris' do
     it 'returns an array of Entity::URIs when entities are set' do
       urls_array = [
@@ -334,6 +376,20 @@ describe Twitter::Tweet do
     end
   end
 
+  describe '#uris?' do
+    it 'returns true when the tweet includes urls entities' do
+      entities = {
+        :urls => [{:url => 'http://with_underscore.example.com/t.co'}]
+      }
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => entities)
+      expect(tweet.uris?).to be_true
+    end
+    it 'returns false when no entities are present' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.uris?).to be_false
+    end
+  end
+
   describe '#user' do
     it 'returns a User when user is set' do
       tweet = Twitter::Tweet.new(:id => 28_669_546_014, :user => {:id => 7_505_382})
@@ -388,4 +444,17 @@ describe Twitter::Tweet do
     end
   end
 
+  describe '#user_mentions?' do
+    it 'returns true when the tweet includes user_mention entities' do
+      entities = {
+        :user_mentions => [{:screen_name => 'sferik'}]
+      }
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => entities)
+      expect(tweet.user_mentions?).to be_true
+    end
+    it 'returns false when no entities are present' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.user_mentions?).to be_false
+    end
+  end
 end

data/twitter.gemspec

@@ -7,11 +7,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'buftok', '~> 0.2.0'
   spec.add_dependency 'descendants_tracker', '~> 0.0.3'
   spec.add_dependency 'equalizer', '~> 0.0.9'
-  spec.add_dependency 'faraday', ['>= 0.8', '< 0.10']
+  spec.add_dependency 'faraday', '~> 0.9.0'
   spec.add_dependency 'http', '~> 0.5.0'
   spec.add_dependency 'http_parser.rb', '~> 0.6.0'
   spec.add_dependency 'json', '~> 1.8'
   spec.add_dependency 'memoizable', '~> 0.4.0'
+  spec.add_dependency 'naught', '~> 1.0'
   spec.add_dependency 'simple_oauth', '~> 0.2.0'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors = ['Erik Michaels-Ober', 'John Nunemaker', 'Wynn Netherland', 'Steve Richert', 'Steve Agalloco']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.6.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -33,7 +33,7 @@ cert_chain:
   Sf3lVKpBCWgRpGTvy45XVpB+59y33PJmEuQ1PTEOYvQyao9UKMAAaAN/7qWQtjl0
   hlw=
   -----END CERTIFICATE-----
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -95,22 +95,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +161,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: naught
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +244,7 @@ files:
 - lib/twitter/error/internal_server_error.rb
 - lib/twitter/error/not_acceptable.rb
 - lib/twitter/error/not_found.rb
+- lib/twitter/error/request_timeout.rb
 - lib/twitter/error/service_unavailable.rb
 - lib/twitter/error/too_many_requests.rb
 - lib/twitter/error/unauthorized.rb
@@ -259,6 +268,7 @@ files:
 - lib/twitter/profile_banner.rb
 - lib/twitter/rate_limit.rb
 - lib/twitter/relationship.rb
+- lib/twitter/request.rb
 - lib/twitter/rest/api/direct_messages.rb
 - lib/twitter/rest/api/favorites.rb
 - lib/twitter/rest/api/friends_and_followers.rb
@@ -385,7 +395,6 @@ files:
 - spec/twitter/list_spec.rb
 - spec/twitter/media/photo_spec.rb
 - spec/twitter/media_factory_spec.rb
-- spec/twitter/null_object_spec.rb
 - spec/twitter/oembed_spec.rb
 - spec/twitter/place_spec.rb
 - spec/twitter/profile_banner_spec.rb
@@ -446,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.
@@ -533,7 +542,6 @@ test_files:
 - spec/twitter/list_spec.rb
 - spec/twitter/media/photo_spec.rb
 - spec/twitter/media_factory_spec.rb
-- spec/twitter/null_object_spec.rb
 - spec/twitter/oembed_spec.rb
 - spec/twitter/place_spec.rb
 - spec/twitter/profile_banner_spec.rb

data/spec/twitter/null_object_spec.rb

@@ -1,90 +0,0 @@
-require 'helper'
-
-describe Twitter::NullObject do
-
-  describe '#nil?' do
-    it 'returns true' do
-      expect(subject.nil?).to be true
-    end
-  end
-
-  describe '#to_a' do
-    it 'returns an empty array' do
-      expect(subject.to_a).to be_an Array
-      expect(subject.to_a).to be_empty
-    end
-  end
-
-  describe '#to_ary' do
-    it 'returns an empty array' do
-      expect(subject.to_ary).to be_an Array
-      expect(subject.to_ary).to be_empty
-    end
-  end
-
-  if RUBY_VERSION >= '1.9'
-    describe '#to_c' do
-      it 'returns zero as a complex number' do
-        expect(subject.to_c).to be_a Complex
-        expect(subject.to_c).to be_zero
-      end
-    end
-
-    describe '#to_r' do
-      it 'returns zero as a rational number' do
-        expect(subject.to_r).to be_a Rational
-        expect(subject.to_r).to be_zero
-      end
-    end
-  end
-
-  if RUBY_VERSION >= '2.0'
-    describe '#to_h' do
-      it 'returns an empty hash' do
-        expect(subject.to_h).to be_a Hash
-        expect(subject.to_h).to be_empty
-      end
-    end
-  end
-
-  describe '#to_f' do
-    it 'returns zero as a floating point number' do
-      expect(subject.to_f).to be_a Float
-      expect(subject.to_f).to be_zero
-    end
-  end
-
-  describe '#to_i' do
-    it 'returns zero' do
-      expect(subject.to_i).to be_an Integer
-      expect(subject.to_i).to be_zero
-    end
-  end
-
-  describe '#to_s' do
-    it 'returns an empty string' do
-      expect(subject.to_s).to be_a String
-      expect(subject.to_s).to be_empty
-    end
-  end
-
-  describe '#to_str' do
-    it 'returns an empty string' do
-      expect(subject.to_str).to be_a String
-      expect(subject.to_str).to be_empty
-    end
-  end
-
-  describe 'calling any method' do
-    it 'returns self' do
-      expect(subject.any).to equal subject
-    end
-  end
-
-  describe '#respond_to?' do
-    it 'returns true' do
-      expect(subject.respond_to?(:any)).to be true
-    end
-  end
-
-end