twitter 5.8.0 → 5.9.0

data/lib/twitter/trend_results.rb

@@ -21,7 +21,7 @@ module Twitter
     # @return [Twitter::TrendResults]
     def initialize(attrs = {})
       @attrs = attrs
-      @collection = Array(@attrs[:trends]).collect do |trend|
+      @collection = @attrs.fetch(:trends, []).collect do |trend|
         Trend.new(trend)
       end
     end

data/lib/twitter/tweet.rb

@@ -6,10 +6,9 @@ module Twitter
   class Tweet < Twitter::Identity
     include Twitter::Creatable
     include Twitter::Entities
-    attr_reader :favorite_count, :favorited, :filter_level,
-                :in_reply_to_screen_name, :in_reply_to_attrs_id,
-                :in_reply_to_status_id, :in_reply_to_user_id, :lang,
-                :retweet_count, :retweeted, :source, :text, :truncated
+    attr_reader :favorite_count, :filter_level, :in_reply_to_screen_name,
+                :in_reply_to_attrs_id, :in_reply_to_status_id, :in_reply_to_user_id,
+                :lang, :retweet_count, :source, :text
     deprecate_alias :favorites_count, :favorite_count
     deprecate_alias :favoriters_count, :favorite_count
     alias_method :in_reply_to_tweet_id, :in_reply_to_status_id
@@ -23,6 +22,7 @@ module Twitter
     alias_method :retweet?, :retweeted_status?
     alias_method :retweeted_tweet?, :retweeted_status?
     object_attr_reader :User, :user, :status
+    predicate_attr_reader :favorited, :retweeted, :truncated
 
     # @note May be > 140 characters.
     # @return [String]

data/lib/twitter/user.rb

@@ -10,36 +10,73 @@ module Twitter
     include Twitter::Creatable
     include Twitter::Profile
     include Memoizable
-    attr_reader :connections, :contributors_enabled, :default_profile,
-                :default_profile_image, :description, :favourites_count,
-                :follow_request_sent, :followers_count, :friends_count,
-                :geo_enabled, :is_translator, :lang, :listed_count, :location,
-                :name, :notifications, :profile_background_color,
+    attr_reader :connections, :description, :favourites_count,
+                :followers_count, :friends_count, :lang, :listed_count,
+                :location, :name, :profile_background_color,
                 :profile_background_image_url,
-                :profile_background_image_url_https, :profile_background_tile,
-                :profile_link_color, :profile_sidebar_border_color,
-                :profile_sidebar_fill_color, :profile_text_color,
-                :profile_use_background_image, :protected, :statuses_count,
-                :time_zone, :utc_offset, :verified
+                :profile_background_image_url_https, :profile_link_color,
+                :profile_sidebar_border_color, :profile_sidebar_fill_color,
+                :profile_text_color, :statuses_count, :time_zone, :utc_offset
     alias_method :favorites_count, :favourites_count
     remove_method :favourites_count
     alias_method :profile_background_image_uri, :profile_background_image_url
     alias_method :profile_background_image_uri_https, :profile_background_image_url_https
-    alias_method :translator?, :is_translator
     alias_method :tweets_count, :statuses_count
     object_attr_reader :Tweet, :status, :user
     alias_method :tweet, :status
     alias_method :tweet?, :status?
     alias_method :tweeted?, :status?
+    predicate_attr_reader :contributors_enabled, :default_profile,
+                          :default_profile_image, :follow_request_sent,
+                          :geo_enabled, :muting, :needs_phone_verification,
+                          :notifications, :protected, :profile_background_tile,
+                          :profile_use_background_image, :suspended, :verified
+    define_predicate_method :translator, :is_translator
+    define_predicate_method :translation_enabled, :is_translation_enabled
 
-    # @return [Array<Twitter::Entity::URI>]
-    def description_uris
-      Array(@attrs[:entities][:description][:urls]).collect do |entity|
-        Entity::URI.new(entity)
+    class << self
+    private
+
+      # Dynamically define a method for entity URIs
+      #
+      # @param key1 [Symbol]
+      # @param key2 [Symbol]
+      def define_entity_uris_methods(key1, key2)
+        array = key1.to_s.split('_')
+        index = array.index('uris')
+        array[index] = 'urls'
+        url_key = array.join('_').to_sym
+        define_entity_uris_method(key1, key2)
+        alias_method(url_key, key1)
+        define_entity_uris_predicate_method(key1)
+        alias_method(:"#{url_key}?", :"#{key1}?")
+      end
+
+      def define_entity_uris_method(key1, key2)
+        define_method(key1) do ||
+          @attrs.fetch(:entities, {}).fetch(key2, {}).fetch(:urls, []).collect do |url|
+            Entity::URI.new(url)
+          end
+        end
+        memoize(key1)
+      end
+
+      def define_entity_uris_predicate_method(key1)
+        define_method(:"#{key1}?") do ||
+          send(:"#{key1}").any?
+        end
+        memoize(:"#{key1}?")
       end
     end
-    memoize :description_uris
-    alias_method :description_urls, :description_uris
+
+    define_entity_uris_methods :description_uris, :description
+    define_entity_uris_methods :website_uris, :url
+
+    # @return [Boolean]
+    def entities?
+      !@attrs[:entities].nil? && @attrs[:entities].any? { |_, hash| hash[:urls].any? }
+    end
+    memoize :entities?
 
     # @return [String] The URL to the user.
     def uri
@@ -50,12 +87,16 @@ module Twitter
 
     # @return [String] The URL to the user's website.
     def website
-      Addressable::URI.parse(@attrs[:url]) unless @attrs[:url].nil?
+      if website_urls?
+        website_urls.first.expanded_url
+      elsif @attrs[:url]
+        Addressable::URI.parse(@attrs[:url])
+      end
     end
     memoize :website
 
     def website?
-      !!@attrs[:url]
+      !!(website_uris? || @attrs[:url])
     end
     memoize :website?
   end

data/lib/twitter/utils.rb

@@ -8,9 +8,13 @@ module Twitter
 
     module ClassMethods
       def deprecate_alias(new_name, old_name)
-        define_method(new_name) do |*args, &block|
+        define_method(new_name) do |*args|
           warn "#{Kernel.caller.first}: [DEPRECATION] ##{new_name} is deprecated. Use ##{old_name} instead."
-          send(old_name, *args, &block)
+          if block_given?
+            send(old_name, *args, &Proc.new)
+          else
+            send(old_name, *args)
+          end
         end
       end
     end
@@ -20,9 +24,12 @@ module Twitter
     #
     # @param enumerable [Enumerable]
     # @return [Array, Enumerator]
-    def flat_pmap(enumerable, &block)
-      return to_enum(:flat_pmap, enumerable) unless block_given?
-      pmap(enumerable, &block).flatten(1)
+    def flat_pmap(enumerable)
+      if block_given?
+        pmap(enumerable, &Proc.new).flatten(1)
+      else
+        to_enum(:flat_pmap, enumerable)
+      end
     end
     module_function :flat_pmap
 

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 5
-    MINOR = 8
+    MINOR = 9
     PATCH = 0
     PRE = nil
 

data/spec/fixtures/following.json

@@ -1 +1 @@
-{"relationship":{"target":{"followed_by":true,"id_str":"14100886","following":false,"screen_name":"pengwynn","id":14100886},"source":{"marked_spam":false,"notifications_enabled":false,"followed_by":false,"want_retweets":true,"id_str":"7505382","blocking":false,"all_replies":false,"following":true,"screen_name":"sferik","id":7505382}}}
+{"relationship":{"target":{"followed_by":true,"id_str":"14100886","following":false,"screen_name":"pengwynn","id":14100886},"source":{"marked_spam":false,"notifications_enabled":false,"muting":false,"followed_by":false,"want_retweets":true,"id_str":"7505382","blocking":false,"all_replies":false,"following":true,"screen_name":"sferik","id":7505382}}}

data/spec/fixtures/sferik.json

@@ -1 +1 @@
-{"id":7505382,"id_str":"7505382","name":"Erik Michaels-Ober","screen_name":"sferik","location":"San Francisco","description":"An ingredient in your recipe.","url":"https:\/\/github.com\/sferik","entities":{"url":{"urls":[{"url":"https:\/\/github.com\/sferik","expanded_url":null,"indices":[0,25]}]},"description":{"urls":[]}},"protected":false,"followers_count":2449,"friends_count":203,"listed_count":130,"created_at":"Mon Jul 16 12:59:01 +0000 2007","favourites_count":4306,"utc_offset":-28800,"time_zone":"Pacific Time (US & Canada)","geo_enabled":true,"verified":false,"statuses_count":8554,"lang":"en","status":{"created_at":"Tue Oct 02 23:21:06 +0000 2012","id":253273430739283969,"id_str":"253273430739283969","text":"@dakami RAM drives are the new SSDs","source":"\u003ca href=\"http:\/\/itunes.apple.com\/us\/app\/twitter\/id409789998?mt=12\" rel=\"nofollow\"\u003eTwitter for Mac\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":253272860473298944,"in_reply_to_status_id_str":"253272860473298944","in_reply_to_user_id":8917142,"in_reply_to_user_id_str":"8917142","in_reply_to_screen_name":"dakami","geo":null,"coordinates":null,"place":null,"contributors":null,"retweet_count":0,"entities":{"hashtags":[],"urls":[],"user_mentions":[{"screen_name":"dakami","name":"Dan Kaminsky","id":8917142,"id_str":"8917142","indices":[0,7]}]},"favorited":false,"retweeted":false},"contributors_enabled":false,"is_translator":false,"profile_background_color":"000000","profile_background_image_url":"http:\/\/a0.twimg.com\/profile_background_images\/665875854\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_image_url_https":"https:\/\/si0.twimg.com\/profile_background_images\/665875854\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_banner_url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1348266581","profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":false,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false}
+{"id":7505382,"id_str":"7505382","name":"Erik Michaels-Ober","screen_name":"sferik","location":"","description":"May contain forward-looking statements.","url":"https:\/\/t.co\/L2xIBazMPf","entities":{"url":{"urls":[{"url":"https:\/\/t.co\/L2xIBazMPf","expanded_url":"https:\/\/github.com\/sferik","display_url":"github.com\/sferik","indices":[0,23]}]},"description":{"urls":[]}},"protected":false,"followers_count":4051,"friends_count":361,"listed_count":238,"created_at":"Mon Jul 16 12:59:01 +0000 2007","favourites_count":8976,"utc_offset":3600,"time_zone":"Berlin","geo_enabled":true,"verified":false,"statuses_count":13844,"lang":"en","status":{"created_at":"Wed Mar 19 00:50:35 +0000 2014","id":446086297866993665,"id_str":"446086297866993665","text":"RT @AntonWSJ: Okean Elzy, #Ukraine's biggest rock band, performed in Berlin tonight amid many \"Glory to Ukraine!\" chants http:\/\/t.co\/dkIF8X\u2026","source":"\u003ca href=\"http:\/\/itunes.apple.com\/us\/app\/twitter\/id409789998?mt=12\" rel=\"nofollow\"\u003eTwitter for Mac\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"geo":null,"coordinates":null,"place":null,"contributors":null,"retweeted_status":{"created_at":"Tue Mar 18 23:56:08 +0000 2014","id":446072592227909632,"id_str":"446072592227909632","text":"Okean Elzy, #Ukraine's biggest rock band, performed in Berlin tonight amid many \"Glory to Ukraine!\" chants http:\/\/t.co\/dkIF8XvFyw","source":"\u003ca href=\"http:\/\/www.apple.com\" rel=\"nofollow\"\u003eiOS\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"geo":null,"coordinates":null,"place":null,"contributors":null,"retweet_count":4,"favorite_count":2,"entities":{"hashtags":[{"text":"Ukraine","indices":[12,20]}],"symbols":[],"urls":[],"user_mentions":[],"media":[{"id":446072592047538176,"id_str":"446072592047538176","indices":[107,129],"media_url":"http:\/\/pbs.twimg.com\/media\/BjDEqLkIAAAIpE4.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/BjDEqLkIAAAIpE4.jpg","url":"http:\/\/t.co\/dkIF8XvFyw","display_url":"pic.twitter.com\/dkIF8XvFyw","expanded_url":"http:\/\/twitter.com\/AntonWSJ\/status\/446072592227909632\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":450,"resize":"fit"},"large":{"w":1024,"h":768,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":255,"resize":"fit"}}}]},"favorited":true,"retweeted":true,"possibly_sensitive":false,"lang":"en"},"retweet_count":4,"favorite_count":0,"entities":{"hashtags":[{"text":"Ukraine","indices":[26,34]}],"symbols":[],"urls":[],"user_mentions":[{"screen_name":"AntonWSJ","name":"Anton Troianovski","id":76773876,"id_str":"76773876","indices":[3,12]}],"media":[{"id":446072592047538176,"id_str":"446072592047538176","indices":[139,140],"media_url":"http:\/\/pbs.twimg.com\/media\/BjDEqLkIAAAIpE4.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/BjDEqLkIAAAIpE4.jpg","url":"http:\/\/t.co\/dkIF8XvFyw","display_url":"pic.twitter.com\/dkIF8XvFyw","expanded_url":"http:\/\/twitter.com\/AntonWSJ\/status\/446072592227909632\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":450,"resize":"fit"},"large":{"w":1024,"h":768,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":255,"resize":"fit"}}}]},"favorited":true,"retweeted":true,"possibly_sensitive":false,"lang":"en"},"contributors_enabled":false,"is_translator":false,"is_translation_enabled":false,"profile_background_color":"000000","profile_background_image_url":"http:\/\/pbs.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_image_url_https":"https:\/\/pbs.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_tile":false,"profile_image_url":"http:\/\/pbs.twimg.com\/profile_images\/378800000757402331\/d8dfba561e2e94112a737f17e7d138ca_normal.jpeg","profile_image_url_https":"https:\/\/pbs.twimg.com\/profile_images\/378800000757402331\/d8dfba561e2e94112a737f17e7d138ca_normal.jpeg","profile_banner_url":"https:\/\/pbs.twimg.com\/profile_banners\/7505382\/1385736840","profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":false,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false,"suspended":false,"needs_phone_verification":false}

data/spec/helper.rb

@@ -1,14 +1,11 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
 
 SimpleCov.start do
   add_filter '/spec/'
-  minimum_coverage(99.39)
+  minimum_coverage(99.15)
 end
 
 require 'twitter'
@@ -65,3 +62,15 @@ end
 def fixture(file)
   File.new(fixture_path + '/' + file)
 end
+
+def capture_warning
+  begin
+    old_stderr = $stderr
+    $stderr = StringIO.new
+    yield
+    result = $stderr.string
+  ensure
+    $stderr = old_stderr
+  end
+  result
+end

data/spec/twitter/base_spec.rb

@@ -7,14 +7,26 @@ describe Twitter::Base do
 
   describe '#[]' do
     it 'calls methods using [] with symbol' do
-      expect(@base[:object_id]).to be_an Integer
+      capture_warning do
+        expect(@base[:object_id]).to be_an Integer
+      end
     end
     it 'calls methods using [] with string' do
-      expect(@base['object_id']).to be_an Integer
+      capture_warning do
+        expect(@base['object_id']).to be_an Integer
+      end
     end
     it 'returns nil for missing method' do
-      expect(@base[:foo]).to be_nil
-      expect(@base['foo']).to be_nil
+      capture_warning do
+        expect(@base[:foo]).to be_nil
+        expect(@base['foo']).to be_nil
+      end
+    end
+    it 'outputs a warning' do
+      warning = capture_warning do
+        @base[:object_id]
+      end
+      expect(warning).to match(/\[DEPRECATION\] #\[:object_id\] is deprecated. Use #object_id to fetch the value./)
     end
   end
 

data/spec/twitter/direct_message_spec.rb

@@ -53,27 +53,26 @@ describe Twitter::DirectMessage do
   end
 
   describe '#entities?' do
-    it 'returns false if there are no entities set' do
-      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345)
-      expect(tweet.entities?).to be false
-    end
-
-    it 'returns false if there are blank lists of entities set' do
-      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => []})
-      expect(tweet.entities?).to be false
-    end
     it 'returns true if there are entities set' do
       urls_array = [
         {
-          :url => 'http://example.com/t.co',
+          :url => 'https://t.co/L2xIBazMPf',
           :expanded_url => 'http://example.com/expanded',
-          :display_url => 'example.com/expandedâ¦',
+          :display_url => 'example.com/expanded…',
           :indices => [10, 33],
         }
       ]
       tweet = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => urls_array})
       expect(tweet.entities?).to be true
     end
+    it 'returns false if there are blank lists of entities set' do
+      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => []})
+      expect(tweet.entities?).to be false
+    end
+    it 'returns false if there are no entities set' do
+      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345)
+      expect(tweet.entities?).to be false
+    end
   end
 
   describe '#recipient' do
@@ -187,7 +186,7 @@ describe Twitter::DirectMessage do
     it 'returns an array of Entity::URIs when entities are set' do
       urls_array = [
         {
-          :url => 'http://example.com/t.co',
+          :url => 'https://t.co/L2xIBazMPf',
           :expanded_url => 'http://example.com/expanded',
           :display_url => 'example.com/expanded…',
           :indices => [10, 33],
@@ -211,7 +210,7 @@ describe Twitter::DirectMessage do
     it 'can handle strange urls' do
       urls_array = [
         {
-          :url => 'http://with_underscore.example.com/t.co',
+          :url => 'https://t.co/L2xIBazMPf',
           :expanded_url => 'http://with_underscore.example.com/expanded',
           :display_url => 'with_underscore.example.com/expanded…',
           :indices => [10, 33],

data/spec/twitter/entity/uri_spec.rb

@@ -29,7 +29,7 @@ describe Twitter::Entity::URI do
   describe '#expanded_uri' do
     it 'returns a URI when the expanded_url is set' do
       uri = Twitter::Entity::URI.new(:expanded_url => 'https://github.com/sferik')
-      expect(uri.expanded_uri).to be_a Addressable::URI
+      expect(uri.expanded_uri).to be_an Addressable::URI
       expect(uri.expanded_uri.to_s).to eq('https://github.com/sferik')
     end
     it 'returns nil when the expanded_url is not set' do
@@ -52,7 +52,7 @@ describe Twitter::Entity::URI do
   describe '#uri' do
     it 'returns a URI when the url is set' do
       uri = Twitter::Entity::URI.new(:url => 'https://github.com/sferik')
-      expect(uri.uri).to be_a Addressable::URI
+      expect(uri.uri).to be_an Addressable::URI
       expect(uri.uri.to_s).to eq('https://github.com/sferik')
     end
     it 'returns nil when the url is not set' do

data/spec/twitter/error_spec.rb

@@ -31,7 +31,7 @@ describe Twitter::Error do
     context "when JSON body contains #{key.inspect}" do
       before do
         body = "{\"#{key}\":\"Internal Server Error\"}" unless body.nil?
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik'}).to_return(:status => 500, :body => body)
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik'}).to_return(:status => 500, :body => body, :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'raises an exception with the proper message' do
         expect { @client.user_timeline('sferik') }.to raise_error(Twitter::Error::InternalServerError)
@@ -42,7 +42,7 @@ describe Twitter::Error do
   Twitter::Error.errors.each do |status, exception|
     context "when HTTP status is #{status}" do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik'}).to_return(:status => status, :body => '{}')
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik'}).to_return(:status => status, :body => '{}', :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it "raises #{exception}" do
         expect { @client.user_timeline('sferik') }.to raise_error(exception)

data/spec/twitter/media/photo_spec.rb

@@ -59,7 +59,7 @@ describe Twitter::Media::Photo do
   describe '#expanded_uri' do
     it 'returns a URI when the expanded_url is set' do
       photo = Twitter::Media::Photo.new(:id => 1, :expanded_url => 'http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
-      expect(photo.expanded_uri).to be_a Addressable::URI
+      expect(photo.expanded_uri).to be_an Addressable::URI
       expect(photo.expanded_uri.to_s).to eq('http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
     end
     it 'returns nil when the expanded_url is not set' do
@@ -82,7 +82,7 @@ describe Twitter::Media::Photo do
   describe '#media_uri' do
     it 'returns a URI when the media_url is set' do
       photo = Twitter::Media::Photo.new(:id => 1, :media_url => 'http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
-      expect(photo.media_uri).to be_a Addressable::URI
+      expect(photo.media_uri).to be_an Addressable::URI
       expect(photo.media_uri.to_s).to eq('http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
     end
     it 'returns nil when the media_url is not set' do
@@ -105,7 +105,7 @@ describe Twitter::Media::Photo do
   describe '#media_uri_https' do
     it 'returns a URI when the media_url_https is set' do
       photo = Twitter::Media::Photo.new(:id => 1, :media_url_https => 'http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
-      expect(photo.media_uri_https).to be_a Addressable::URI
+      expect(photo.media_uri_https).to be_an Addressable::URI
       expect(photo.media_uri_https.to_s).to eq('http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
     end
     it 'returns nil when the media_url_https is not set' do
@@ -128,7 +128,7 @@ describe Twitter::Media::Photo do
   describe '#uri' do
     it 'returns a URI when the url is set' do
       photo = Twitter::Media::Photo.new(:id => 1, :url => 'http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
-      expect(photo.uri).to be_a Addressable::URI
+      expect(photo.uri).to be_an Addressable::URI
       expect(photo.uri.to_s).to eq('http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png')
     end
     it 'returns nil when the url is not set' do

data/spec/twitter/oembed_spec.rb

@@ -5,7 +5,7 @@ describe Twitter::OEmbed do
   describe '#author_uri' do
     it 'returns a URI when the author_url is set' do
       oembed = Twitter::OEmbed.new(:author_url => 'https://twitter.com/sferik')
-      expect(oembed.author_uri).to be_a Addressable::URI
+      expect(oembed.author_uri).to be_an Addressable::URI
       expect(oembed.author_uri.to_s).to eq('https://twitter.com/sferik')
     end
     it 'returns nil when the author_uri is not set' do
@@ -87,7 +87,7 @@ describe Twitter::OEmbed do
   describe '#provider_uri' do
     it 'returns a URI when the provider_url is set' do
       oembed = Twitter::OEmbed.new(:provider_url => 'http://twitter.com')
-      expect(oembed.provider_uri).to be_a Addressable::URI
+      expect(oembed.provider_uri).to be_an Addressable::URI
       expect(oembed.provider_uri.to_s).to eq('http://twitter.com')
     end
     it 'returns nil when the provider_uri is not set' do
@@ -136,7 +136,7 @@ describe Twitter::OEmbed do
   describe '#uri' do
     it 'returns a URI when the url is set' do
       oembed = Twitter::OEmbed.new(:url => 'https://twitter.com/twitterapi/status/133640144317198338')
-      expect(oembed.uri).to be_a Addressable::URI
+      expect(oembed.uri).to be_an Addressable::URI
       expect(oembed.uri.to_s).to eq('https://twitter.com/twitterapi/status/133640144317198338')
     end
     it 'returns nil when the url is not set' do

data/spec/twitter/place_spec.rb

@@ -137,7 +137,7 @@ describe Twitter::Place do
   describe '#uri' do
     it 'returns a URI when the url is set' do
       place = Twitter::Place.new(:woeid => '247f43d441defc03', :url => 'https://api.twitter.com/1.1/geo/id/247f43d441defc03.json')
-      expect(place.uri).to be_a Addressable::URI
+      expect(place.uri).to be_an Addressable::URI
       expect(place.uri.to_s).to eq('https://api.twitter.com/1.1/geo/id/247f43d441defc03.json')
     end
     it 'returns nil when the url is not set' do

data/spec/twitter/rest/client_spec.rb

@@ -65,6 +65,52 @@ describe Twitter::REST::Client do
     end
   end
 
+  describe '#connection_options=' do
+    it 'sets connection options' do
+      capture_warning do
+        @client.connection_options = 'connection options'
+      end
+      expect(@client.connection_options).to eq('connection options')
+    end
+    it 'outputs a warning' do
+      warning = capture_warning do
+        @client.connection_options = nil
+      end
+      expect(warning).to match(/\[DEPRECATION\] Twitter::REST::Client#connection_options= is deprecated and will be removed in version 6\.0\.0\.$/)
+    end
+  end
+
+  describe '#connection_options' do
+    it 'returns the connection options hash with proxy and user_agent' do
+      client = Twitter::REST::Client.new do |config|
+        config.consumer_key        = 'CK'
+        config.consumer_secret     = 'CS'
+        config.access_token        = 'AT'
+        config.access_token_secret = 'ATS'
+        config.proxy               = 'http://localhost:99'
+        config.user_agent          = 'My Twitter Ruby Gem'
+      end
+
+      expect(client.connection_options[:proxy]).to eql('http://localhost:99')
+      expect(client.connection_options[:headers][:user_agent]).to eql('My Twitter Ruby Gem')
+    end
+  end
+
+  describe '#middleware=' do
+    it 'sets middleware' do
+      capture_warning do
+        @client.middleware = 'middleware'
+      end
+      expect(@client.middleware).to eq 'middleware'
+    end
+    it 'outputs a warning' do
+      warning = capture_warning do
+        @client.middleware = nil
+      end
+      expect(warning).to match(/\[DEPRECATION\] Twitter::REST::Client#middleware= is deprecated and will be removed in version 6\.0\.0\.$/)
+    end
+  end
+
   describe '#credentials?' do
     it 'returns true if all credentials are present' do
       client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :access_token => 'AT', :access_token_secret => 'AS')
@@ -128,29 +174,23 @@ describe Twitter::REST::Client do
     end
     it 'submits the correct auth header when no media is present' do
       # We use static values for nounce and timestamp to get a stable signature
-      secret = {:consumer_key => 'CK', :consumer_secret => 'CS',
-                :token => 'OT', :token_secret => 'OS',
-                :nonce => 'b6ebe4c2a11af493f8a2290fe1296965', :timestamp => '1370968658'}
-      header = {'Authorization' => /oauth_signature="FbthwmgGq02iQw%2FuXGEWaL6V6eM%3D"/}
+      secret = {:consumer_key => 'CK', :consumer_secret => 'CS', :token => 'OT', :token_secret => 'OS', :nonce => 'b6ebe4c2a11af493f8a2290fe1296965', :timestamp => '1370968658'}
+      headers = {:authorization => /oauth_signature="FbthwmgGq02iQw%2FuXGEWaL6V6eM%3D"/, :content_type => 'application/json; charset=utf-8'}
 
       allow(@client).to receive(:credentials).and_return(secret)
-      stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Just a test'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Just a test'}).to_return(:body => fixture('status.json'), :headers => headers)
       @client.update('Just a test')
-      expect(a_post('/1.1/statuses/update.json').
-             with(:headers => header)).to have_been_made
+      expect(a_post('/1.1/statuses/update.json').with(:headers => {:authorization => headers[:authorization]})).to have_been_made
     end
     it 'submits the correct auth header when media is present' do
       # We use static values for nounce and timestamp to get a stable signature
-      secret = {:consumer_key => 'CK', :consumer_secret => 'CS',
-                :token => 'OT', :token_secret => 'OS',
-                :nonce => 'e08201ad0dab4897c99445056feefd95', :timestamp => '1370967652'}
-      header = {'Authorization' => /oauth_signature="9ziouUPwZT9IWWRbJL8r0BerKYA%3D"/}
+      secret = {:consumer_key => 'CK', :consumer_secret => 'CS', :token => 'OT', :token_secret => 'OS', :nonce => 'e08201ad0dab4897c99445056feefd95', :timestamp => '1370967652'}
+      headers = {:authorization => /oauth_signature="9ziouUPwZT9IWWRbJL8r0BerKYA%3D"/, :content_type => 'application/json; charset=utf-8'}
 
       allow(@client).to receive(:credentials).and_return(secret)
-      stub_post('/1.1/statuses/update_with_media.json').to_return(:body => fixture('status.json'), :headers => header)
+      stub_post('/1.1/statuses/update_with_media.json').to_return(:body => fixture('status.json'), :headers => headers)
       @client.update_with_media('Just a test', fixture('pbjt.gif'))
-      expect(a_post('/1.1/statuses/update_with_media.json').
-             with(:headers => header)).to have_been_made
+      expect(a_post('/1.1/statuses/update_with_media.json').with(:headers => {:authorization => headers[:authorization]})).to have_been_made
     end
   end