Remove deprecated aliases

lib/twitter/base.rb

@@ -13,7 +13,6 @@ class Base
     attr_reader :attrs
     alias_method :to_h, :attrs
     alias_method :to_hash, :to_h
-    deprecate_alias :to_hsh, :to_hash
 
     class << self
       # Define methods that retrieve the value from attributes
@@ -29,7 +28,6 @@ def attr_reader(*attrs)
       def predicate_attr_reader(*attrs)
         attrs.each do |attr|
           define_predicate_method(attr)
-          deprecate_attribute_method(attr)
         end
       end
 
@@ -99,15 +97,6 @@ def define_attribute_method(key1, klass = nil, key2 = nil)
         memoize(key1)
       end
 
-      # @param key [Symbol]
-      def deprecate_attribute_method(key)
-        define_method(key) do
-          warn "#{Kernel.caller.first}: [DEPRECATION] ##{key} is deprecated. Use ##{key}? instead."
-          @attrs[key]
-        end
-        memoize(key)
-      end
-
       # Dynamically define a predicate method for an attribute
       #
       # @param key1 [Symbol]

lib/twitter/basic_user.rb

@@ -5,9 +5,6 @@ module Twitter
   class BasicUser < Twitter::Identity
     # @return [String]
     attr_reader :screen_name
-    deprecate_alias :handle, :screen_name
-    deprecate_alias :username, :screen_name
-    deprecate_alias :user_name, :screen_name
     predicate_attr_reader :following
   end
 end

lib/twitter/client.rb

@@ -7,10 +7,6 @@ class Client
     include Twitter::Utils
     attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret, :proxy
     attr_writer :user_agent
-    deprecate_alias :oauth_token, :access_token
-    deprecate_alias :oauth_token=, :access_token=
-    deprecate_alias :oauth_token_secret, :access_token_secret
-    deprecate_alias :oauth_token_secret=, :access_token_secret=
 
     # Initializes a new Client object
     #

lib/twitter/cursor.rb

@@ -10,7 +10,6 @@ class Cursor
     attr_reader :attrs
     alias_method :to_h, :attrs
     alias_method :to_hash, :to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new Cursor
     #

lib/twitter/entity/uri.rb

@@ -6,9 +6,5 @@ class URI < Twitter::Entity
       display_uri_attr_reader
       uri_attr_reader :expanded_uri, :uri
     end
-
-    URL = URI
-    Uri = URI
-    Url = URI
   end
 end

lib/twitter/error.rb

@@ -36,7 +36,6 @@ module Code
       CANNOT_MUTE                  = 271
       CANNOT_UNMUTE                = 272
     end
-    Codes = Code
 
     class << self
       include Twitter::Utils
@@ -58,7 +57,7 @@ def errors
           403 => Twitter::Error::Forbidden,
           404 => Twitter::Error::NotFound,
           406 => Twitter::Error::NotAcceptable,
-          420 => Twitter::Error::EnhanceYourCalm,
+          420 => Twitter::Error::TooManyRequests,
           422 => Twitter::Error::UnprocessableEntity,
           429 => Twitter::Error::TooManyRequests,
           500 => Twitter::Error::InternalServerError,
@@ -139,7 +138,6 @@ def initialize
 
     # Raised when a Tweet has already been posted
     DuplicateStatus = Class.new(Forbidden)
-    AlreadyPosted = DuplicateStatus
 
     # Raised when Twitter returns the HTTP status code 404
     NotFound = Class.new(ClientError)
@@ -152,8 +150,6 @@ def initialize
 
     # Raised when Twitter returns the HTTP status code 429
     TooManyRequests = Class.new(ClientError)
-    EnhanceYourCalm = TooManyRequests
-    RateLimited = TooManyRequests
 
     # Raised when Twitter returns a 5xx HTTP status code
     ServerError = Class.new(self)

lib/twitter/geo_results.rb

@@ -9,7 +9,6 @@ class GeoResults
     attr_reader :attrs
     alias_method :to_h, :attrs
     alias_method :to_hash, :to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new GeoResults object
     #

lib/twitter/rest/direct_messages.rb

@@ -111,7 +111,6 @@ def direct_messages(*args)
       def destroy_direct_message(*args)
         parallel_objects_from_response(Twitter::DirectMessage, :post, '/1.1/direct_messages/destroy.json', args)
       end
-      deprecate_alias :direct_message_destroy, :destroy_direct_message
 
       # Sends a new direct message to the specified user from the authenticating user
       #
@@ -131,7 +130,6 @@ def create_direct_message(user, text, options = {})
       alias_method :d, :create_direct_message
       alias_method :m, :create_direct_message
       alias_method :dm, :create_direct_message
-      deprecate_alias :direct_message_create, :create_direct_message
     end
   end
 end

lib/twitter/rest/favorites.rb

@@ -51,7 +51,6 @@ def unfavorite(*args)
         parallel_objects_from_response(Twitter::Tweet, :post, '/1.1/favorites/destroy.json', args)
       end
       alias_method :destroy_favorite, :unfavorite
-      deprecate_alias :favorite_destroy, :unfavorite
 
       # Favorites the specified Tweets as the authenticating user
       #
@@ -77,7 +76,6 @@ def favorite(*args)
       end
       alias_method :fav, :favorite
       alias_method :fave, :favorite
-      deprecate_alias :favorite_create, :favorite
 
       # Favorites the specified Tweets as the authenticating user and raises an error if one has already been favorited
       #
@@ -102,7 +100,6 @@ def favorite!(*args)
       alias_method :create_favorite!, :favorite!
       alias_method :fav!, :favorite!
       alias_method :fave!, :favorite!
-      deprecate_alias :favorite_create!, :favorite!
     end
   end
 end

lib/twitter/rest/friends_and_followers.rb

@@ -114,7 +114,6 @@ def follow(*args)
         follow!(new_friends.value - existing_friends.value, arguments.options)
       end
       alias_method :create_friendship, :follow
-      deprecate_alias :friendship_create, :follow
 
       # Allows the authenticating user to follow the specified users
       #
@@ -136,7 +135,6 @@ def follow!(*args)
         end.compact
       end
       alias_method :create_friendship!, :follow!
-      deprecate_alias :friendship_create!, :follow!
 
       # Allows the authenticating user to unfollow the specified users
       #
@@ -154,7 +152,6 @@ def unfollow(*args)
         parallel_users_from_response(:post, '/1.1/friendships/destroy.json', args)
       end
       alias_method :destroy_friendship, :unfollow
-      deprecate_alias :friendship_destroy, :unfollow
 
       # Allows one to enable or disable retweets and device notifications from the specified user.
       #

lib/twitter/rest/lists.rb

@@ -83,7 +83,6 @@ def list_timeline(*args)
       def remove_list_member(*args)
         list_from_response_with_user('/1.1/lists/members/destroy.json', args)
       end
-      deprecate_alias :list_remove_member, :remove_list_member
 
       # List the lists the specified user has been added to
       #
@@ -206,7 +205,6 @@ def list_unsubscribe(*args)
       def add_list_members(*args)
         list_from_response_with_users('/1.1/lists/members/create_all.json', args)
       end
-      deprecate_alias :list_add_members, :add_list_members
 
       # Check if a user is a member of the specified list
       #
@@ -269,7 +267,6 @@ def list_members(*args)
       def add_list_member(*args)
         list_from_response_with_user('/1.1/lists/members/create.json', args)
       end
-      deprecate_alias :list_add_member, :add_list_member
 
       # Deletes the specified list
       #
@@ -290,7 +287,6 @@ def add_list_member(*args)
       def destroy_list(*args)
         list_from_response(:post, '/1.1/lists/destroy.json', args)
       end
-      deprecate_alias :list_destroy, :destroy_list
 
       # Updates the specified list
       #
@@ -330,7 +326,6 @@ def list_update(*args)
       def create_list(name, options = {})
         perform_post_with_object('/1.1/lists/create.json', options.merge(name: name), Twitter::List)
       end
-      deprecate_alias :list_create, :create_list
 
       # Show the specified list
       #
@@ -388,7 +383,6 @@ def subscriptions(*args)
       def remove_list_members(*args)
         list_from_response_with_users('/1.1/lists/members/destroy_all.json', args)
       end
-      deprecate_alias :list_remove_members, :remove_list_members
 
       # Returns the lists owned by the specified Twitter user
       #
@@ -407,8 +401,6 @@ def remove_list_members(*args)
       def owned_lists(*args)
         cursor_from_response_with_user(:lists, Twitter::List, '/1.1/lists/ownerships.json', args)
       end
-      deprecate_alias :lists_ownerships, :owned_lists
-      deprecate_alias :lists_owned, :owned_lists
 
     private
 

lib/twitter/rest/saved_searches.rb

@@ -65,7 +65,6 @@ def saved_search(id, options = {})
       def create_saved_search(query, options = {})
         perform_post_with_object('/1.1/saved_searches/create.json', options.merge(query: query), Twitter::SavedSearch)
       end
-      deprecate_alias :saved_search_create, :create_saved_search
 
       # Destroys saved searches for the authenticated user
       #
@@ -86,7 +85,6 @@ def destroy_saved_search(*args)
           perform_post_with_object("/1.1/saved_searches/destroy/#{id}.json", arguments.options, Twitter::SavedSearch)
         end
       end
-      deprecate_alias :saved_search_destroy, :destroy_saved_search
     end
   end
 end

lib/twitter/rest/tweets.rb

@@ -101,8 +101,6 @@ def destroy_status(*args)
         end
       end
       alias_method :destroy_tweet, :destroy_status
-      deprecate_alias :status_destroy, :destroy_status
-      deprecate_alias :tweet_destroy, :destroy_status
 
       # Updates the authenticating user's status
       #

lib/twitter/rest/users.rb

@@ -140,7 +140,6 @@ def update_profile_image(image, options = {})
       def blocked(options = {})
         perform_get_with_cursor('/1.1/blocks/list.json', options, :users, Twitter::User)
       end
-      deprecate_alias :blocking, :blocked
 
       # Returns an array of numeric user IDs the authenticating user is blocking
       #
@@ -337,7 +336,6 @@ def remove_profile_banner(options = {})
         perform_post('/1.1/account/remove_profile_banner.json', options)
         true
       end
-      deprecate_alias :profile_banner_remove, :remove_profile_banner
 
       # Updates the authenticating user's profile banner image
       #
@@ -422,7 +420,6 @@ def unmute(*args)
       def muted(options = {})
         perform_get_with_cursor('/1.1/mutes/users/list.json', options, :users, Twitter::User)
       end
-      deprecate_alias :muting, :muted
 
       # Returns an array of numeric user IDs the authenticating user is muting
       #

lib/twitter/search_results.rb

@@ -12,7 +12,6 @@ class SearchResults
     attr_reader :attrs
     alias_method :to_h, :attrs
     alias_method :to_hash, :to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new SearchResults object
     #

lib/twitter/streaming/deleted_tweet.rb

@@ -4,6 +4,5 @@ class DeletedTweet < Twitter::Identity
       # @return [Integer]
       attr_reader :user_id
     end
-    DeletedStatus = DeletedTweet
   end
 end

lib/twitter/trend_results.rb

@@ -14,7 +14,6 @@ class TrendResults
     attr_reader :attrs
     alias_method :to_h, :attrs
     alias_method :to_hash, :to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new TrendResults object
     #

lib/twitter/tweet.rb

@@ -11,11 +11,8 @@ class Tweet < Twitter::Identity
     # @return [Integer]
     attr_reader :favorite_count, :in_reply_to_status_id, :in_reply_to_user_id,
                 :retweet_count
-    deprecate_alias :favorites_count, :favorite_count
-    deprecate_alias :favoriters_count, :favorite_count
     alias_method :in_reply_to_tweet_id, :in_reply_to_status_id
     alias_method :reply?, :in_reply_to_user_id?
-    deprecate_alias :retweeters_count, :retweet_count
     object_attr_reader :GeoFactory, :geo
     object_attr_reader :Metadata, :metadata
     object_attr_reader :Place, :place
@@ -50,5 +47,4 @@ def uri
     memoize :uri
     alias_method :url, :uri
   end
-  Status = Tweet
 end

lib/twitter/utils.rb

@@ -1,20 +1,5 @@
 module Twitter
   module Utils
-    class << self
-      def included(base)
-        base.extend(ClassMethods)
-      end
-    end
-
-    module ClassMethods
-      def deprecate_alias(new_name, old_name, &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)
-        end
-      end
-    end
-
     # Returns a new array with the concatenated results of running block once for every element in enumerable.
     # If no block is given, an enumerator is returned instead.
     #

spec/helper.rb

@@ -6,7 +6,7 @@
 SimpleCov.start do
   add_filter '/spec/'
   add_filter '/vendor/'
-  minimum_coverage(99.64)
+  minimum_coverage(99.63)
 end
 
 require 'twitter'

spec/twitter/base_spec.rb

@@ -22,26 +22,11 @@
         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
 
   describe '#attrs' do
     it 'returns a hash of attributes' do
       expect(@base.attrs).to eq(id: 1)
     end
   end
-
-  describe '#to_hsh' do
-    it 'outputs a warning' do
-      warning = capture_warning do
-        expect(@base.to_hsh).to eq(id: 1)
-      end
-      expect(warning).to match(/\[DEPRECATION\] #to_hsh is deprecated\. Use #to_hash instead\./)
-    end
-  end
 end

spec/twitter/user_spec.rb

@@ -379,16 +379,6 @@
     end
   end
 
-  describe '#verified' do
-    it 'outputs a warning' do
-      user = Twitter::User.new(id: 7_505_382, verified: true)
-      warning = capture_warning do
-        expect(user.verified).to be true
-      end
-      expect(warning).to match(/\[DEPRECATION\] #verified is deprecated\. Use #verified\? instead\./)
-    end
-  end
-
   describe '#website' do
     it 'returns a URI when the url is set' do
       user = Twitter::User.new(id: 7_505_382, url: 'https://github.com/sferik')