twitter 4.4.2 → 4.4.3

data/lib/twitter/api/saved_searches.rb

@@ -1,3 +1,4 @@
+require 'twitter/api/arguments'
 require 'twitter/api/utils'
 require 'twitter/saved_search'
 
@@ -31,12 +32,12 @@ module Twitter
       #   @param ids [Array<Integer>, Set<Integer>] An array of Tweet IDs.
       #   @param options [Hash] A customizable set of options.
       def saved_searches(*args)
-        options = extract_options!(args)
-        if args.empty?
-          collection_from_response(Twitter::SavedSearch, :get, "/1.1/saved_searches/list.json", options)
+        arguments = Twitter::API::Arguments.new(args)
+        if arguments.empty?
+          objects_from_response(Twitter::SavedSearch, :get, "/1.1/saved_searches/list.json", arguments.options)
         else
-          args.flatten.threaded_map do |id|
-            saved_search(id)
+          arguments.flatten.threaded_map do |id|
+            saved_search(id, arguments.options)
           end
         end
       end
@@ -87,9 +88,9 @@ module Twitter
       #   @param ids [Array<Integer>, Set<Integer>] An array of Tweet IDs.
       #   @param options [Hash] A customizable set of options.
       def saved_search_destroy(*args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
-          object_from_response(Twitter::SavedSearch, :post, "/1.1/saved_searches/destroy/#{id}.json", options)
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
+          object_from_response(Twitter::SavedSearch, :post, "/1.1/saved_searches/destroy/#{id}.json", arguments.options)
         end
       end
 

data/lib/twitter/api/spam_reporting.rb

@@ -22,7 +22,7 @@ module Twitter
       #   @param users [Array<Integer, String, Twitter::User>, Set<Integer, String, Twitter::User>] An array of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
       def report_spam(*args)
-        threaded_users_from_response(:post, "/1.1/users/report_spam.json", args)
+        threaded_user_objects_from_response(:post, "/1.1/users/report_spam.json", args)
       end
 
     end

data/lib/twitter/api/suggested_users.rb

@@ -1,3 +1,4 @@
+require 'twitter/api/arguments'
 require 'twitter/api/utils'
 require 'twitter/suggestion'
 require 'twitter/user'
@@ -27,11 +28,11 @@ module Twitter
       #   @example Return the users in the Art & Design category
       #     Twitter.suggestions("art-design")
       def suggestions(*args)
-        options = extract_options!(args)
-        if slug = args.pop
-          object_from_response(Twitter::Suggestion, :get, "/1.1/users/suggestions/#{slug}.json", options)
+        arguments = Twitter::API::Arguments.new(args)
+        if slug = arguments.pop
+          object_from_response(Twitter::Suggestion, :get, "/1.1/users/suggestions/#{slug}.json", arguments.options)
         else
-          collection_from_response(Twitter::Suggestion, :get, "/1.1/users/suggestions.json", options)
+          objects_from_response(Twitter::Suggestion, :get, "/1.1/users/suggestions.json", arguments.options)
         end
       end
 
@@ -46,7 +47,7 @@ module Twitter
       # @example Return the users in the Art & Design category and their most recent Tweet if they are not a protected user
       #   Twitter.suggest_users("art-design")
       def suggest_users(slug, options={})
-        collection_from_response(Twitter::User, :get, "/1.1/users/suggestions/#{slug}/members.json", options)
+        objects_from_response(Twitter::User, :get, "/1.1/users/suggestions/#{slug}/members.json", options)
       end
 
     end

data/lib/twitter/api/timelines.rb

@@ -25,7 +25,7 @@ module Twitter
       # @example Return the 20 most recent mentions (statuses containing @username) for the authenticating user
       #   Twitter.mentions
       def mentions_timeline(options={})
-        collection_from_response(Twitter::Tweet, :get, "/1.1/statuses/mentions_timeline.json", options)
+        objects_from_response(Twitter::Tweet, :get, "/1.1/statuses/mentions_timeline.json", options)
       end
       alias mentions mentions_timeline
 
@@ -50,7 +50,7 @@ module Twitter
       #   @example Return the 20 most recent Tweets posted by @sferik
       #     Twitter.user_timeline('sferik')
       def user_timeline(*args)
-        objects_from_response(Twitter::Tweet, :get, "/1.1/statuses/user_timeline.json", args)
+        objects_from_response_with_user(Twitter::Tweet, :get, "/1.1/statuses/user_timeline.json", args)
       end
 
       # Returns the 20 most recent retweets posted by the specified user
@@ -72,10 +72,8 @@ module Twitter
       # @example Return the 20 most recent retweets posted by @sferik
       #   Twitter.retweeted_by_user('sferik')
       def retweeted_by_user(user, options={})
-        options[:include_rts] = true
-        count = options[:count] || DEFAULT_TWEETS_PER_REQUEST
-        collect_with_count(count) do |count_options|
-          select_retweets(user_timeline(user, options.merge(count_options)))
+        retweets_from_timeline(options) do |opts|
+          user_timeline(user, opts)
         end
       end
       alias retweeted_by retweeted_by_user
@@ -123,7 +121,7 @@ module Twitter
       # @example Return the 20 most recent Tweets, including retweets if they exist, posted by the authenticating user and the users they follow
       #   Twitter.home_timeline
       def home_timeline(options={})
-        collection_from_response(Twitter::Tweet, :get, "/1.1/statuses/home_timeline.json", options)
+        objects_from_response(Twitter::Tweet, :get, "/1.1/statuses/home_timeline.json", options)
       end
 
       # Returns the 20 most recent retweets posted by users the authenticating user follow.
@@ -167,7 +165,7 @@ module Twitter
       # @example Return the 20 most recent tweets of the authenticated user that have been retweeted by others
       #   Twitter.retweets_of_me
       def retweets_of_me(options={})
-        collection_from_response(Twitter::Tweet, :get, "/1.1/statuses/retweets_of_me.json", options)
+        objects_from_response(Twitter::Tweet, :get, "/1.1/statuses/retweets_of_me.json", options)
       end
 
     private

data/lib/twitter/api/trends.rb

@@ -22,7 +22,7 @@ module Twitter
       def trends(id=1, options={})
         options[:id] = id
         response = get("/1.1/trends/place.json", options)
-        collection_from_array(Twitter::Trend, response[:body].first[:trends])
+        objects_from_array(Twitter::Trend, response[:body].first[:trends])
       end
       alias local_trends trends
       alias trends_place trends
@@ -38,7 +38,7 @@ module Twitter
       # @example Return the locations that Twitter has trending topic information for
       #   Twitter.trends_available
       def trends_available(options={})
-        collection_from_response(Twitter::Place, :get, "/1.1/trends/available.json", options)
+        objects_from_response(Twitter::Place, :get, "/1.1/trends/available.json", options)
       end
       alias trend_locations trends_available
 
@@ -55,7 +55,7 @@ module Twitter
       # @example Return the locations that Twitter has trending topic information for
       #   Twitter.trends_closest
       def trends_closest(options={})
-        collection_from_response(Twitter::Place, :get, "/1.1/trends/closest.json", options)
+        objects_from_response(Twitter::Place, :get, "/1.1/trends/closest.json", options)
       end
 
     end

data/lib/twitter/api/tweets.rb

@@ -1,3 +1,4 @@
+require 'twitter/api/arguments'
 require 'twitter/api/utils'
 require 'twitter/error/already_retweeted'
 require 'twitter/error/forbidden'
@@ -23,7 +24,7 @@ module Twitter
       # @example Return up to 100 of the first retweets of the Tweet with the ID 28561922516
       #   Twitter.retweets(28561922516)
       def retweets(id, options={})
-        collection_from_response(Twitter::Tweet, :get, "/1.1/statuses/retweets/#{id}.json", options)
+        objects_from_response(Twitter::Tweet, :get, "/1.1/statuses/retweets/#{id}.json", options)
       end
 
       # Show up to 100 users who retweeted the Tweet
@@ -144,10 +145,10 @@ module Twitter
       #   @param options [Hash] A customizable set of options.
       #   @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       def retweet(*args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
           begin
-            post_retweet(id, options)
+            post_retweet(id, arguments.options)
           rescue Twitter::Error::Forbidden => error
             raise unless error.message == Twitter::Error::AlreadyRetweeted::MESSAGE
           end
@@ -171,10 +172,10 @@ module Twitter
       #   @param options [Hash] A customizable set of options.
       #   @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       def retweet!(*args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
           begin
-            post_retweet(id, options)
+            post_retweet(id, arguments.options)
           rescue Twitter::Error::Forbidden => error
             handle_forbidden_error(Twitter::Error::AlreadyRetweeted, error)
           end
@@ -248,9 +249,9 @@ module Twitter
       #   @option options [String] :related A value for the TWT related parameter, as described in {https://dev.twitter.com/docs/intents Web Intents}. This value will be forwarded to all Web Intents calls.
       #   @option options [String] :lang Language code for the rendered embed. This will affect the text and localization of the rendered HTML.
       def oembeds(*args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
-          object_from_response(Twitter::OEmbed, :get, "/1.1/statuses/oembed.json?id=#{id}", options)
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
+          object_from_response(Twitter::OEmbed, :get, "/1.1/statuses/oembed.json?id=#{id}", arguments.options)
         end
       end
 
@@ -261,9 +262,9 @@ module Twitter
       # @param args [Array]
       # @return [Array<Twitter::Tweet>]
       def threaded_tweets_from_response(request_method, path, args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
-          object_from_response(Twitter::Tweet, request_method, path + "/#{id}.json", options)
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
+          object_from_response(Twitter::Tweet, request_method, path + "/#{id}.json", arguments.options)
         end
       end
 

data/lib/twitter/api/undocumented.rb

@@ -1,4 +1,5 @@
 require 'twitter/action_factory'
+require 'twitter/api/arguments'
 require 'twitter/api/utils'
 require 'twitter/cursor'
 require 'twitter/tweet'
@@ -22,7 +23,7 @@ module Twitter
       # @example Return activity about me
       #   Twitter.activity_about_me
       def activity_about_me(options={})
-        collection_from_response(Twitter::ActionFactory, :get, "/i/activity/about_me.json", options)
+        objects_from_response(Twitter::ActionFactory, :get, "/i/activity/about_me.json", options)
       end
 
       # Returns activity by friends
@@ -38,7 +39,7 @@ module Twitter
       # @example Return activity by friends
       #   Twitter.activity_by_friends
       def activity_by_friends(options={})
-        collection_from_response(Twitter::ActionFactory, :get, "/i/activity/by_friends.json", options)
+        objects_from_response(Twitter::ActionFactory, :get, "/i/activity/by_friends.json", options)
       end
 
       # @note Undocumented
@@ -66,10 +67,7 @@ module Twitter
       #     Twitter.following_followers_of('sferik')
       #     Twitter.following_followers_of(7505382)  # Same as above
       def following_followers_of(*args)
-        options = extract_options!(args)
-        merge_default_cursor!(options)
-        merge_user!(options, args.pop || screen_name) unless options[:user_id] || options[:screen_name]
-        cursor_from_response(:users, Twitter::User, :get, "/users/following_followers_of.json", options, :following_followers_of)
+        cursor_from_response_with_user(:users, Twitter::User, :get, "/users/following_followers_of.json", args, :following_followers_of)
       end
 
       # Returns activity summary for a Tweet
@@ -105,9 +103,9 @@ module Twitter
       #   @param ids [Array<Integer>, Set<Integer>] An array of Tweet IDs.
       #   @param options [Hash] A customizable set of options.
       def statuses_activity(*args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
-          status_activity(id, options)
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
+          status_activity(id, arguments.options)
         end
       end
 

data/lib/twitter/api/users.rb

@@ -1,4 +1,6 @@
+require 'twitter/api/arguments'
 require 'twitter/api/utils'
+require 'twitter/core_ext/enumerable'
 require 'twitter/error/not_found'
 require 'twitter/profile_banner'
 require 'twitter/settings'
@@ -147,7 +149,6 @@ module Twitter
       # @example Return an array of user objects that the authenticating user is blocking
       #   Twitter.blocking
       def blocking(options={})
-        merge_default_cursor!(options)
         cursor_from_response(:users, Twitter::User, :get, "/1.1/blocks/list.json", options, :blocking)
       end
 
@@ -163,7 +164,9 @@ module Twitter
       # @overload block(options={})
       #   @param options [Hash] A customizable set of options.
       def blocked_ids(*args)
-        ids_from_response(:get, "/1.1/blocks/ids.json", args, :blocked_ids)
+        arguments = Twitter::API::Arguments.new(args)
+        merge_user!(arguments.options, arguments.pop)
+        cursor_from_response(:ids, nil, :get, "/1.1/blocks/ids.json", arguments.options, :blocked_ids)
       end
 
       # Returns true if the authenticating user is blocking a target user
@@ -208,7 +211,7 @@ module Twitter
       #   @param users [Array<Integer, String, Twitter::User>, Set<Integer, String, Twitter::User>] An array of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
       def block(*args)
-        threaded_users_from_response(:post, "/1.1/blocks/create.json", args)
+        threaded_user_objects_from_response(:post, "/1.1/blocks/create.json", args)
       end
 
       # Un-blocks the users specified by the authenticating user
@@ -227,7 +230,7 @@ module Twitter
       #   @param users [Array<Integer, String, Twitter::User>, Set<Integer, String, Twitter::User>] An array of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
       def unblock(*args)
-        threaded_users_from_response(:post, "/1.1/blocks/destroy.json", args)
+        threaded_user_objects_from_response(:post, "/1.1/blocks/destroy.json", args)
       end
 
       # Returns extended information for up to 100 users
@@ -251,10 +254,10 @@ module Twitter
       #     Twitter.users('sferik', 'pengwynn', :method => :get) # Retrieve users with a GET request
       #     Twitter.users(7505382, 14100886, :method => :get)    # Same as above
       def users(*args)
-        options = extract_options!(args)
-        method = options.delete(:method) || :post
-        args.flatten.each_slice(MAX_USERS_PER_REQUEST).threaded_map do |users|
-          collection_from_response(Twitter::User, method, "/1.1/users/lookup.json", merge_users(options, users))
+        arguments = Twitter::API::Arguments.new(args)
+        method = arguments.options.delete(:method) || :post
+        arguments.flatten.each_slice(MAX_USERS_PER_REQUEST).threaded_map do |users|
+          objects_from_response(Twitter::User, method, "/1.1/users/lookup.json", merge_users(arguments.options, users))
         end.flatten
       end
 
@@ -279,12 +282,12 @@ module Twitter
       #     Twitter.user('sferik')
       #     Twitter.user(7505382)  # Same as above
       def user(*args)
-        options = extract_options!(args)
-        if user = args.pop
-          merge_user!(options, user)
-          object_from_response(Twitter::User, :get, "/1.1/users/show.json", options)
+        arguments = Twitter::API::Arguments.new(args)
+        if user = arguments.pop
+          merge_user!(arguments.options, user)
+          object_from_response(Twitter::User, :get, "/1.1/users/show.json", arguments.options)
         else
-          verify_credentials(options)
+          verify_credentials(arguments.options)
         end
       end
 
@@ -320,7 +323,7 @@ module Twitter
       # @example Return users that match "Erik Michaels-Ober"
       #   Twitter.user_search("Erik Michaels-Ober")
       def user_search(query, options={})
-        collection_from_response(Twitter::User, :get, "/1.1/users/search.json", options.merge(:q => query))
+        objects_from_response(Twitter::User, :get, "/1.1/users/search.json", options.merge(:q => query))
       end
 
       # Returns an array of users that the specified user can contribute to
@@ -343,7 +346,7 @@ module Twitter
       #     Twitter.contributees('sferik')
       #     Twitter.contributees(7505382)  # Same as above
       def contributees(*args)
-        users_from_response(:get, "/1.1/users/contributees.json", args)
+        user_objects_from_response(:get, "/1.1/users/contributees.json", args)
       end
 
       # Returns an array of users who can contribute to the specified account
@@ -366,7 +369,7 @@ module Twitter
       #     Twitter.contributors('sferik')
       #     Twitter.contributors(7505382)  # Same as above
       def contributors(*args)
-        users_from_response(:get, "/1.1/users/contributors.json", args)
+        user_objects_from_response(:get, "/1.1/users/contributors.json", args)
       end
 
       # Removes the authenticating user's profile banner image
@@ -423,9 +426,9 @@ module Twitter
       #     Twitter.profile_banner('sferik')
       #     Twitter.profile_banner(7505382)  # Same as above
       def profile_banner(*args)
-        options = extract_options!(args)
-        merge_user!(options, args.pop || screen_name) unless options[:user_id] || options[:screen_name]
-        object_from_response(Twitter::ProfileBanner, :get, "/1.1/users/profile_banner.json", options)
+        arguments = Twitter::API::Arguments.new(args)
+        merge_user!(arguments.options, arguments.pop || screen_name) unless arguments.options[:user_id] || arguments.options[:screen_name]
+        object_from_response(Twitter::ProfileBanner, :get, "/1.1/users/profile_banner.json", arguments.options)
       end
 
     end

data/lib/twitter/api/utils.rb

@@ -1,5 +1,4 @@
-require 'twitter/core_ext/enumerable'
-require 'twitter/core_ext/kernel'
+require 'twitter/api/arguments'
 require 'twitter/cursor'
 require 'twitter/user'
 
@@ -11,99 +10,103 @@ module Twitter
 
     private
 
-      # @param klass [Class]
-      # @param array [Array]
-      # @return [Array]
-      def collection_from_array(klass, array)
-        array.map do |element|
-          klass.fetch_or_new(element)
+      # @param request_method [Symbol]
+      # @param path [String]
+      # @param args [Array]
+      # @return [Array<Twitter::User>]
+      def threaded_user_objects_from_response(request_method, path, args)
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |user|
+          object_from_response(Twitter::User, request_method, path, merge_user(arguments.options, user))
         end
       end
 
-      # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
-      # @param params [Hash]
-      # @return [Array]
-      def collection_from_response(klass, request_method, path, params={})
-        collection_from_array(klass, send(request_method.to_sym, path, params)[:body])
+      # @param args [Array]
+      # @return [Array<Twitter::User>]
+      def user_objects_from_response(request_method, path, args)
+        arguments = Twitter::API::Arguments.new(args)
+        merge_user!(arguments.options, arguments.pop || screen_name) unless arguments.options[:user_id] || arguments.options[:screen_name]
+        objects_from_response(Twitter::User, request_method, path, arguments.options)
       end
 
       # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
-      # @param params [Hash]
-      # @return [Object]
-      def object_from_response(klass, request_method, path, params={})
-        response = send(request_method.to_sym, path, params)
-        klass.from_response(response)
+      # @param args [Array]
+      # @return [Array]
+      def objects_from_response_with_user(klass, request_method, path, args)
+        arguments = Twitter::API::Arguments.new(args)
+        merge_user!(arguments.options, arguments.pop)
+        objects_from_response(klass, request_method, path, arguments.options)
       end
 
       # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
-      # @param args [Array]
+      # @param options [Hash]
       # @return [Array]
-      def objects_from_response(klass, request_method, path, args)
-        options = extract_options!(args)
-        merge_user!(options, args.pop)
-        collection_from_response(klass, request_method, path, options)
+      def objects_from_response(klass, request_method, path, options={})
+        response = send(request_method.to_sym, path, options)[:body]
+        objects_from_array(klass, response)
       end
 
-      # @param request_method [Symbol]
-      # @param path [String]
-      # @param args [Array]
-      # @return [Array<Integer>]
-      def ids_from_response(request_method, path, args, calling_method)
-        options = extract_options!(args)
-        merge_default_cursor!(options)
-        merge_user!(options, args.pop)
-        cursor_from_response(:ids, nil, request_method, path, options, calling_method)
+      # @param klass [Class]
+      # @param array [Array]
+      # @return [Array]
+      def objects_from_array(klass, array)
+        array.map do |element|
+          klass.fetch_or_new(element)
+        end
       end
 
-      # @param collection_name [Symbol]
       # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
-      # @param params [Hash]
-      # @param method_name [Symbol]
-      # @return [Twitter::Cursor]
-      def cursor_from_response(collection_name, klass, request_method, path, params, method_name)
-        response = send(request_method.to_sym, path, params)
-        Twitter::Cursor.from_response(response, collection_name.to_sym, klass, self, method_name, params)
+      # @param args [Array]
+      # @return [Array]
+      def threaded_object_from_response(klass, request_method, path, args)
+        arguments = Twitter::API::Arguments.new(args)
+        arguments.flatten.threaded_map do |id|
+          object_from_response(klass, request_method, path, arguments.options.merge(:id => id))
+        end
       end
 
+      # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
-      # @param args [Array]
-      # @return [Array<Twitter::User>]
-      def users_from_response(request_method, path, args)
-        options = extract_options!(args)
-        merge_user!(options, args.pop || screen_name) unless options[:user_id] || options[:screen_name]
-        collection_from_response(Twitter::User, request_method, path, options)
+      # @param options [Hash]
+      # @return [Object]
+      def object_from_response(klass, request_method, path, options={})
+        response = send(request_method.to_sym, path, options)
+        klass.from_response(response)
       end
 
+      # @param collection_name [Symbol]
+      # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
       # @param args [Array]
-      # @return [Array<Twitter::User>]
-      def threaded_users_from_response(request_method, path, args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |user|
-          object_from_response(Twitter::User, request_method, path, merge_user(options, user))
-        end
+      # @param method_name [Symbol]
+      # @return [Twitter::Cursor]
+      def cursor_from_response_with_user(collection_name, klass, request_method, path, args, method_name)
+        arguments = Twitter::API::Arguments.new(args)
+        merge_user!(arguments.options, arguments.pop || screen_name) unless arguments.options[:user_id] || arguments.options[:screen_name]
+        cursor_from_response(collection_name, klass, request_method, path, arguments.options, method_name)
       end
 
+      # @param collection_name [Symbol]
       # @param klass [Class]
       # @param request_method [Symbol]
       # @param path [String]
-      # @param args [Array]
-      # @return [Array]
-      def threaded_object_from_response(klass, request_method, path, args)
-        options = extract_options!(args)
-        args.flatten.threaded_map do |id|
-          object_from_response(klass, request_method, path, options.merge(:id => id))
-        end
+      # @param options [Hash]
+      # @param method_name [Symbol]
+      # @return [Twitter::Cursor]
+      def cursor_from_response(collection_name, klass, request_method, path, options, method_name)
+        merge_default_cursor!(options)
+        response = send(request_method.to_sym, path, options)
+        Twitter::Cursor.from_response(response, collection_name.to_sym, klass, self, method_name, options)
       end
 
       def handle_forbidden_error(klass, error)
@@ -122,10 +125,6 @@ module Twitter
         @screen_name ||= verify_credentials.screen_name
       end
 
-      def extract_options!(array)
-        array.last.is_a?(::Hash) ? array.pop : {}
-      end
-
       # Take a user and merge it into the hash with the correct key
       #
       # @param hash [Hash]