twitter 4.3.0 → 4.4.0

data/lib/twitter/basic_user.rb

@@ -3,7 +3,6 @@ require 'twitter/identity'
 module Twitter
   class BasicUser < Twitter::Identity
     attr_reader :following, :screen_name
-    alias following? following
     alias handle screen_name
     alias username screen_name
     alias user_name screen_name

data/lib/twitter/client.rb

@@ -27,7 +27,6 @@ module Twitter
   # @note All methods have been separated into modules and follow the same grouping used in {http://dev.twitter.com/doc the Twitter API Documentation}.
   # @see http://dev.twitter.com/pages/every_developer
   class Client
-    include Twitter::API
     include Twitter::API::DirectMessages
     include Twitter::API::Favorites
     include Twitter::API::FriendsAndFollowers
@@ -67,57 +66,37 @@ module Twitter
 
     # Perform an HTTP POST request
     def post(path, params={})
-      request(:post, path, params)
+      signature_params = params.values.any?{|value| value.respond_to?(:to_io)} ? {} : params
+      request(:post, path, params, signature_params)
     end
 
-    # Perform an HTTP UPDATE request
+    # Perform an HTTP PUT request
     def put(path, params={})
       request(:put, path, params)
     end
 
   private
 
-    # Returns a Faraday::Connection object
-    #
-    # @return [Faraday::Connection]
-    def connection
-      @connection ||= Faraday.new(@endpoint, @connection_options.merge(:builder => @middleware))
-    end
-
-    # Perform an HTTP request
-    #
-    # @raise [Twitter::Error::ClientError, Twitter::Error::DecodeError]
-    def request(method, path, params={})
-      uri = URI(@endpoint) unless uri.respond_to?(:host)
-      uri += path
-      request_headers = {}
-      if credentials?
-        authorization = auth_header(method, uri, params)
-        request_headers[:authorization] = authorization.to_s
-      end
-      connection.url_prefix = @endpoint
-      response = connection.run_request(method.to_sym, path, nil, request_headers) do |request|
-        unless params.empty?
-          case request.method
-          when :post, :put
-            request.body = params
-          else
-            request.params.update(params)
-          end
-        end
-        yield request if block_given?
+    def request(method, path, params={}, signature_params=params)
+      connection.send(method.to_sym, path, params) do |request|
+        request.headers[:authorization] = auth_header(method.to_sym, path, signature_params).to_s
       end.env
-      response
     rescue Faraday::Error::ClientError
       raise Twitter::Error::ClientError
     rescue MultiJson::DecodeError
       raise Twitter::Error::DecodeError
     end
 
-    def auth_header(method, uri, params={})
-      # When posting a file, don't sign any params
-      signature_params = [:post, :put].include?(method.to_sym) && params.values.any?{|value| value.respond_to?(:to_io)} ? {} : params
-      SimpleOAuth::Header.new(method, uri, signature_params, credentials)
+    # Returns a Faraday::Connection object
+    #
+    # @return [Faraday::Connection]
+    def connection
+      @connection ||= Faraday.new(@endpoint, @connection_options.merge(:builder => @middleware))
+    end
+
+    def auth_header(method, path, params={})
+      uri = URI(@endpoint + path)
+      SimpleOAuth::Header.new(method, uri, params, credentials)
     end
 
   end

data/lib/twitter/core_ext/enumerable.rb

@@ -15,9 +15,9 @@ private
   def abort_on_exception
     initial_abort_on_exception = Thread.abort_on_exception
     Thread.abort_on_exception ||= true
-    value = yield
+    yield
+  ensure
     Thread.abort_on_exception = initial_abort_on_exception
-    value
   end
 
 end

data/lib/twitter/default.rb

@@ -2,7 +2,6 @@ require 'faraday'
 require 'twitter/configurable'
 require 'twitter/error/client_error'
 require 'twitter/error/server_error'
-require 'twitter/identity_map'
 require 'twitter/request/multipart_with_file'
 require 'twitter/response/parse_json'
 require 'twitter/response/raise_error'
@@ -10,7 +9,7 @@ require 'twitter/version'
 
 module Twitter
   module Default
-    ENDPOINT = 'https://api.twitter.com' unless defined? ENDPOINT
+    ENDPOINT = 'https://api.twitter.com' unless defined? Twitter::Default::ENDPOINT
     CONNECTION_OPTIONS = {
       :headers => {
         :accept => 'application/json',
@@ -20,8 +19,8 @@ module Twitter
       :raw => true,
       :ssl => {:verify => false},
       :timeout => 10,
-    } unless defined? CONNECTION_OPTIONS
-    IDENTITY_MAP = false unless defined? IDENTITY_MAP
+    } unless defined? Twitter::Default::CONNECTION_OPTIONS
+    IDENTITY_MAP = false unless defined? Twitter::Default::IDENTITY_MAP
     MIDDLEWARE = Faraday::Builder.new do |builder|
       # Convert file uploads to Faraday::UploadIO objects
       builder.use Twitter::Request::MultipartWithFile
@@ -37,7 +36,7 @@ module Twitter
       builder.use Twitter::Response::RaiseError, Twitter::Error::ServerError
       # Set Faraday's HTTP adapter
       builder.adapter Faraday.default_adapter
-    end
+    end unless defined? Twitter::Default::MIDDLEWARE
 
     class << self
 
@@ -66,7 +65,7 @@ module Twitter
         ENV['TWITTER_OAUTH_TOKEN_SECRET']
       end
 
-      # @note This is configurable in case you want to use HTTP instead of HTTPS or use a Twitter-compatible endpoint.
+      # @note This is configurable in case you want to use a Twitter-compatible endpoint.
       # @see http://status.net/wiki/Twitter-compatible_API
       # @see http://en.blog.wordpress.com/2009/12/12/twitter-api/
       # @see http://staff.tumblr.com/post/287703110/api
@@ -76,12 +75,10 @@ module Twitter
         ENDPOINT
       end
 
-      # @return [Hash]
       def connection_options
         CONNECTION_OPTIONS
       end
 
-      # @return [Twitter::IdentityMap]
       def identity_map
         IDENTITY_MAP
       end

data/lib/twitter/exceptable.rb

@@ -0,0 +1,36 @@
+module Twitter
+  module Exceptable
+
+  private
+
+    # Return a hash that includes everything but the given keys.
+    #
+    # @param klass [Class]
+    # @param hash [Hash]
+    # @param key1 [Symbol]
+    # @param key2 [Symbol]
+    def fetch_or_new_without_self(klass, hash, key1, key2)
+      klass.fetch_or_new(hash.dup[key1].merge(key2 => except(hash, key1))) unless hash[key1].nil?
+    end
+
+    # Return a hash that includes everything but the given keys.
+    #
+    # @param hash [Hash]
+    # @param key [Symbol]
+    # @return [Hash]
+    def except(hash, key)
+      except!(hash.dup, key)
+    end
+
+    # Replaces the hash without the given keys.
+    #
+    # @param hash [Hash]
+    # @param key [Symbol]
+    # @return [Hash]
+    def except!(hash, key)
+      hash.delete(key)
+      hash
+    end
+
+  end
+end

data/lib/twitter/factory.rb

@@ -1,5 +1,3 @@
-require 'twitter/core_ext/string'
-
 module Twitter
   class Factory
 
@@ -10,8 +8,10 @@ module Twitter
     # @return [Twitter::Action::Favorite, Twitter::Action::Follow, Twitter::Action::ListMemberAdded, Twitter::Action::Mention, Twitter::Action::Reply, Twitter::Action::Retweet]
     def self.fetch_or_new(method, klass, attrs={})
       return unless attrs
-      if type = attrs.delete(method.to_sym)
-        klass.const_get(type.camelize.to_sym).fetch_or_new(attrs)
+      type = attrs.delete(method.to_sym)
+      if type
+        const_name = type.gsub(/\/(.?)/){"::#{$1.upcase}"}.gsub(/(?:^|_)(.)/){$1.upcase}
+        klass.const_get(const_name.to_sym).fetch_or_new(attrs)
       else
         raise ArgumentError, "argument must have :#{method} key"
       end

data/lib/twitter/list.rb

@@ -7,7 +7,6 @@ module Twitter
     include Twitter::Creatable
     attr_reader :description, :following, :full_name, :member_count,
       :mode, :name, :slug, :subscriber_count, :uri
-    alias following? following
 
     # @return [Twitter::User]
     def user

data/lib/twitter/request/multipart_with_file.rb

@@ -10,14 +10,12 @@ module Twitter
       end
 
       def call(env)
-        if env[:body].is_a?(Hash)
-          env[:body].each do |key, value|
-            if value.respond_to?(:to_io)
-              env[:body][key] = Faraday::UploadIO.new(value, mime_type(value.path), value.path)
-              env[:request_headers][CONTENT_TYPE] = self.class.mime_type
-            end
+        env[:body].each do |key, value|
+          if value.respond_to?(:to_io)
+            env[:body][key] = Faraday::UploadIO.new(value, mime_type(value.path), value.path)
+            env[:request_headers][CONTENT_TYPE] = self.class.mime_type
           end
-        end
+        end if env[:body].is_a?(::Hash)
         @app.call(env)
       end
 

data/lib/twitter/search_results.rb

@@ -15,33 +15,37 @@ module Twitter
 
     # @return [Float]
     def completed_in
-      @attrs[:search_metadata][:completed_in] unless @attrs[:search_metadata].nil?
+      @attrs[:search_metadata][:completed_in] if search_metadata?
     end
 
     # @return [Integer]
     def max_id
-      @attrs[:search_metadata][:max_id] unless @attrs[:search_metadata].nil?
+      @attrs[:search_metadata][:max_id] if search_metadata?
     end
 
     # @return [Integer]
     def page
-      @attrs[:search_metadata][:page] unless @attrs[:search_metadata].nil?
+      @attrs[:search_metadata][:page] if search_metadata?
     end
 
     # @return [String]
     def query
-      @attrs[:search_metadata][:query] unless @attrs[:search_metadata].nil?
+      @attrs[:search_metadata][:query] if search_metadata?
     end
 
     # @return [Integer]
     def results_per_page
-      @attrs[:search_metadata][:results_per_page] unless @attrs[:search_metadata].nil?
+      @attrs[:search_metadata][:results_per_page] if search_metadata?
     end
     alias rpp results_per_page
 
+    def search_metadata?
+      !@attrs[:search_metadata].nil?
+    end
+
     # @return [Integer]
     def since_id
-      @attrs[:search_metadata][:since_id] unless @attrs[:search_metadata].nil?
+      @attrs[:search_metadata][:since_id] if search_metadata?
     end
 
   end

data/lib/twitter/settings.rb

@@ -6,7 +6,6 @@ module Twitter
     attr_reader :always_use_https, :discoverable_by_email, :geo_enabled,
       :language, :protected, :screen_name, :show_all_inline_media, :sleep_time,
       :time_zone
-    alias protected? protected
 
     # @return [Twitter::Place]
     def trend_location

data/lib/twitter/source_user.rb

@@ -4,12 +4,5 @@ module Twitter
   class SourceUser < Twitter::BasicUser
     attr_reader :all_replies, :blocking, :can_dm, :followed_by, :marked_spam,
       :notifications_enabled, :want_retweets
-    alias all_replies? all_replies
-    alias blocking? blocking
-    alias can_dm? can_dm
-    alias followed_by? followed_by
-    alias marked_spam? marked_spam
-    alias notifications_enabled? notifications_enabled
-    alias want_retweets? want_retweets
   end
 end

data/lib/twitter/target_user.rb

@@ -3,6 +3,5 @@ require 'twitter/basic_user'
 module Twitter
   class TargetUser < Twitter::BasicUser
     attr_reader :followed_by
-    alias followed_by? followed_by
   end
 end

data/lib/twitter/tweet.rb

@@ -1,8 +1,8 @@
-require 'twitter/core_ext/hash'
 require 'twitter/creatable'
 require 'twitter/entity/hashtag'
 require 'twitter/entity/url'
 require 'twitter/entity/user_mention'
+require 'twitter/exceptable'
 require 'twitter/geo_factory'
 require 'twitter/identity'
 require 'twitter/media_factory'
@@ -13,18 +13,21 @@ require 'twitter/user'
 module Twitter
   class Tweet < Twitter::Identity
     include Twitter::Creatable
+    include Twitter::Exceptable
     attr_reader :favorited, :favoriters, :from_user_id, :from_user_name,
       :in_reply_to_screen_name, :in_reply_to_attrs_id, :in_reply_to_status_id,
       :in_reply_to_user_id, :iso_language_code, :profile_image_url,
       :profile_image_url_https, :repliers, :retweeted, :retweeters, :source,
       :text, :to_user, :to_user_id, :to_user_name, :truncated
     alias in_reply_to_tweet_id in_reply_to_status_id
-    alias favorited? favorited
     alias favourited favorited
-    alias favourited? favorited
+    alias favourited? favorited?
     alias favouriters favoriters
-    alias retweeted? retweeted
-    alias truncated? truncated
+
+    # @return [Boolean]
+    def entities?
+      !@attrs[:entities].nil?
+    end
 
     # @return [Integer]
     def favoriters_count
@@ -121,7 +124,7 @@ module Twitter
 
     # @return [Twitter::User]
     def user
-      @user ||= Twitter::User.fetch_or_new(@attrs.dup[:user].merge(:status => @attrs.except(:user))) if user?
+      @user ||= fetch_or_new_without_self(Twitter::User, @attrs, :user, :status)
     end
 
     # @note Must include entities in your request for this method to work
@@ -130,30 +133,25 @@ module Twitter
       @user_mentions ||= entities(Twitter::Entity::UserMention, :user_mentions)
     end
 
-    # @return [Boolean]
-    def entities?
-      !@attrs[:entities].nil?
+    def user?
+      !@attrs[:user].nil?
     end
 
   private
 
     # @param klass [Class]
-    # @param method [Symbol]
-    def entities(klass, method)
+    # @param key [Symbol]
+    def entities(klass, key)
       if entities?
-        Array(@attrs[:entities][method.to_sym]).map do |user_mention|
+        Array(@attrs[:entities][key.to_sym]).map do |user_mention|
           klass.fetch_or_new(user_mention)
         end
       else
-        warn "#{Kernel.caller.first}: To get #{method.to_s.tr('_', ' ')}, you must pass `:include_entities => true` when requesting the #{self.class.name}."
+        warn "#{Kernel.caller.first}: To get #{key.to_s.tr('_', ' ')}, you must pass `:include_entities => true` when requesting the #{self.class.name}."
         []
       end
     end
 
-    def user?
-      !@attrs[:user].nil?
-    end
-
   end
 
   Status = Tweet

data/lib/twitter/user.rb

@@ -1,12 +1,13 @@
 require 'twitter/basic_user'
-require 'twitter/core_ext/hash'
 require 'twitter/creatable'
+require 'twitter/exceptable'
 require 'twitter/tweet'
 
 module Twitter
   class User < Twitter::BasicUser
     PROFILE_IMAGE_SUFFIX_REGEX = /_normal(\.gif|\.jpe?g|\.png)$/
     include Twitter::Creatable
+    include Twitter::Exceptable
     attr_reader :connections, :contributors_enabled, :default_profile,
       :default_profile_image, :description, :favourites_count,
       :follow_request_sent, :followers_count, :friends_count, :geo_enabled,
@@ -17,10 +18,6 @@ module Twitter
       :profile_sidebar_fill_color, :profile_text_color,
       :profile_use_background_image, :protected, :statuses_count, :time_zone,
       :url, :utc_offset, :verified
-    alias contributors_enabled? contributors_enabled
-    alias default_profile? default_profile
-    alias default_profile_image? default_profile_image
-    alias follow_request_sent? follow_request_sent
     alias favorite_count favourites_count
     alias favoriters_count favourites_count
     alias favorites_count favourites_count
@@ -28,20 +25,13 @@ module Twitter
     alias favouriters_count favourites_count
     alias follower_count followers_count
     alias friend_count friends_count
-    alias geo_enabled? geo_enabled
-    alias is_translator? is_translator
-    alias notifications? notifications
-    alias profile_background_tile? profile_background_tile
-    alias profile_use_background_image? profile_use_background_image
-    alias protected? protected
     alias status_count statuses_count
     alias translator is_translator
-    alias translator? is_translator
+    alias translator? is_translator?
     alias tweet_count statuses_count
     alias tweets_count statuses_count
     alias update_count statuses_count
     alias updates_count statuses_count
-    alias verified? verified
 
     # Return the URL to the user's profile banner image
     #
@@ -93,7 +83,7 @@ module Twitter
 
     # @return [Twitter::Tweet]
     def status
-      @status ||= Twitter::Tweet.fetch_or_new(@attrs.dup[:status].merge(:user => @attrs.except(:status))) if status?
+      @status ||= fetch_or_new_without_self(Twitter::Tweet, @attrs, :status, :user)
     end
 
     def status?