twitter 5.0.0.rc.1 → 5.0.0

data/lib/twitter/client.rb

@@ -4,15 +4,16 @@ require 'uri'
 
 module Twitter
   class Client
-    attr_writer :access_token, :access_token_secret, :consumer_key,
-      :consumer_secret, :user_agent
+    attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret
+    alias oauth_token access_token
     alias oauth_token= access_token=
+    alias oauth_token_secret access_token_secret
     alias oauth_token_secret= access_token_secret=
 
     # Initializes a new Client object
     #
     # @param options [Hash]
-    # @return [Twitter::REST::Client]
+    # @return [Twitter::Client]
     def initialize(options={})
       options.each do |key, value|
         send(:"#{key}=", value)
@@ -21,49 +22,12 @@ module Twitter
       validate_credential_type!
     end
 
-    # @return [String]
-    def consumer_key
-      if instance_variable_defined?(:@consumer_key)
-        @consumer_key
-      else
-        ENV['TWITTER_CONSUMER_KEY']
-      end
-    end
-
-    # @return [String]
-    def consumer_secret
-      if instance_variable_defined?(:@consumer_secret)
-        @consumer_secret
-      else
-        ENV['TWITTER_CONSUMER_SECRET']
-      end
-    end
-
-    # @return [String]
-    def access_token
-      if instance_variable_defined?(:@access_token)
-        @access_token
-      else
-        ENV['TWITTER_ACCESS_TOKEN'] || ENV['TWITTER_OAUTH_TOKEN']
-      end
-    end
-    alias oauth_token access_token
-
-    # @return [String]
-    def access_token_secret
-      if instance_variable_defined?(:@access_token_secret)
-        @access_token_secret
-      else
-        ENV['TWITTER_ACCESS_TOKEN_SECRET'] || ENV['TWITTER_OAUTH_TOKEN_SECRET']
-      end
-    end
-    alias oauth_token_secret access_token_secret
-
     # @return [Boolean]
     def user_token?
       !!(access_token && access_token_secret)
     end
 
+    # @return [String]
     def user_agent
       @user_agent ||= "Twitter Ruby Gem #{Twitter::Version}"
     end

data/lib/twitter/configuration.rb

@@ -11,13 +11,12 @@ module Twitter
     #
     # @return [Array<Twitter::Size>]
     def photo_sizes
-      memoize(:photo_sizes) do
-        Array(@attrs[:photo_sizes]).inject({}) do |object, (key, value)|
-          object[key] = Twitter::Size.new(value)
-          object
-        end
+      Array(@attrs[:photo_sizes]).inject({}) do |object, (key, value)|
+        object[key] = Size.new(value)
+        object
       end
     end
+    memoize :photo_sizes
 
   end
 end

data/lib/twitter/core_ext/kernel.rb

@@ -1,6 +1,10 @@
 module Kernel
 
   # Returns the object's singleton class (exists in Ruby 1.9.2)
-  def singleton_class; class << self; self; end; end unless method_defined?(:singleton_class)
+  def singleton_class
+    class << self
+      self
+    end
+  end unless method_defined?(:singleton_class)
 
 end

data/lib/twitter/creatable.rb

@@ -1,18 +1,23 @@
 require 'time'
+require 'memoizable'
 
 module Twitter
   module Creatable
+    include Memoizable
 
     # Time when the object was created on Twitter
     #
     # @return [Time]
     def created_at
-      @created_at ||= Time.parse(@attrs[:created_at]) if @attrs[:created_at]
+      Time.parse(@attrs[:created_at]) if @attrs[:created_at]
     end
+    memoize :created_at
 
+    # @return [Boolean]
     def created?
       !!@attrs[:created_at]
     end
+    memoize :created?
 
   end
 end

data/lib/twitter/cursor.rb

@@ -8,18 +8,22 @@ module Twitter
     alias to_hash attrs
     alias to_hsh attrs
 
-    # Construct a new Cursor object from a response hash
-    #
-    # @param response [Hash]
-    # @param key [String, Symbol] The key to fetch the data from the response
-    # @param klass [Class] The class to instantiate objects in the response
-    # @param client [Twitter::REST::Client]
-    # @param request_method [String, Symbol]
-    # @param path [String]
-    # @param options [Hash]
-    # @return [Twitter::Cursor]
-    def self.from_response(response, key, klass, client, request_method, path, options)
-      new(response[:body], key, klass, client, request_method, path, options)
+    class << self
+
+      # Construct a new Cursor object from a response hash
+      #
+      # @param response [Hash]
+      # @param key [String, Symbol] The key to fetch the data from the response
+      # @param klass [Class] The class to instantiate objects in the response
+      # @param client [Twitter::REST::Client]
+      # @param request_method [String, Symbol]
+      # @param path [String]
+      # @param options [Hash]
+      # @return [Twitter::Cursor]
+      def from_response(response, key, klass, client, request_method, path, options)
+        new(response[:body], key, klass, client, request_method, path, options)
+      end
+
     end
 
     # Initializes a new Cursor

data/lib/twitter/entity/uri.rb

@@ -3,7 +3,8 @@ require 'twitter/entity'
 module Twitter
   class Entity
     class URI < Twitter::Entity
-      uri_attr_reader :display_uri, :expanded_uri, :uri
+      display_uri_attr_reader
+      uri_attr_reader :expanded_uri, :uri
     end
 
     Uri = URI

data/lib/twitter/enumerable.rb

@@ -3,7 +3,7 @@ module Twitter
     include ::Enumerable
 
     # @return [Enumerator]
-    def each(start = 0, &block)
+    def each(start=0, &block)
       return to_enum(:each) unless block_given?
       Array(@collection[start..-1]).each do |element|
         yield element

data/lib/twitter/error.rb

@@ -1,8 +1,10 @@
+require 'descendants_tracker'
 require 'twitter/rate_limit'
 
 module Twitter
   # Custom error class for rescuing from all Twitter errors
   class Error < StandardError
+    extend DescendantsTracker
     attr_reader :rate_limit, :wrapped_exception, :code
 
     # If error code is missing see https://dev.twitter.com/docs/error-codes-responses
@@ -16,36 +18,54 @@ module Twitter
       OVER_CAPACITY                = 130
       INTERNAL_ERROR               = 131
       OAUTH_TIMESTAMP_OUT_OF_RANGE = 135
+      FOLLOW_LIMIT_EXCEEDED        = 161
+      PROTECTED_STATUS             = 179
       DUPLICATE_STATUS             = 187
       BAD_AUTHENTICATION_DATA      = 215
       LOGIN_VERIFICATION_NEEDED    = 231
+      ENDPOINT_RETIRED             = 251
     end
 
-    # Create a new error from an HTTP response
-    #
-    # @param response [Hash]
-    # @return [Twitter::Error]
-    def self.from_response(response={})
-      error, code = parse_error(response[:body])
-      new(error, response[:response_headers], code)
-    end
+    class << self
 
-    # @return [Hash]
-    def self.errors
-      @errors ||= descendants.inject({}) do |hash, klass|
-        hash[klass::HTTP_STATUS_CODE] = klass
-        hash
+      # Create a new error from an HTTP response
+      #
+      # @param response [Hash]
+      # @return [Twitter::Error]
+      def from_response(response={})
+        error, code = parse_error(response[:body])
+        new(error, response[:response_headers], code)
       end
-    end
 
-    # @return [Array]
-    def self.descendants
-      @descendants ||= []
-    end
+      # @return [Hash]
+      def errors
+        @errors ||= descendants.inject({}) do |hash, klass|
+          hash[klass::HTTP_STATUS_CODE] = klass
+          hash
+        end
+      end
+
+    private
+
+      def parse_error(body)
+        if body.nil?
+          ['', nil]
+        elsif body[:error]
+          [body[:error], nil]
+        elsif body[:errors]
+          extract_message_from_errors(body)
+        end
+      end
+
+      def extract_message_from_errors(body)
+        first = Array(body[:errors]).first
+        if first.is_a?(Hash)
+          [first[:message].chomp, first[:code]]
+        else
+          [first.chomp, nil]
+        end
+      end
 
-    # @return [Array]
-    def self.inherited(descendant)
-      descendants << descendant
     end
 
     # Initializes a new Error object
@@ -55,28 +75,11 @@ module Twitter
     # @param code [Integer]
     # @return [Twitter::Error]
     def initialize(exception=$!, response_headers={}, code=nil)
-      @rate_limit = Twitter::RateLimit.new(response_headers)
+      @rate_limit = RateLimit.new(response_headers)
       @wrapped_exception = exception
       @code = code
       exception.respond_to?(:message) ? super(exception.message) : super(exception.to_s)
     end
 
-  private
-
-    def self.parse_error(body)
-      if body.nil?
-        ['', nil]
-      elsif body[:error]
-        [body[:error], nil]
-      elsif body[:errors]
-        first = Array(body[:errors]).first
-        if first.is_a?(Hash)
-          [first[:message].chomp, first[:code]]
-        else
-          [first.chomp, nil]
-        end
-      end
-    end
-
   end
 end

data/lib/twitter/factory.rb

@@ -1,14 +1,21 @@
 module Twitter
   class Factory
 
-    def self.new(method, klass, attrs={})
-      type = attrs.delete(method.to_sym)
-      if type
+    class << self
+
+      # Construct a new object
+      #
+      # @param method [Symbol]
+      # @param klass [Class]
+      # @param attrs [Hash]
+      # @raise [IndexError] Error raised when supplied argument is missing a key.
+      # @return [Twitter::Base]
+      def new(method, klass, attrs={})
+        type = attrs.fetch(method.to_sym)
         const_name = type.gsub(/\/(.?)/){"::#{$1.upcase}"}.gsub(/(?:^|_)(.)/){$1.upcase}
         klass.const_get(const_name.to_sym).new(attrs)
-      else
-        raise ArgumentError, "argument must have :#{method} key"
       end
+
     end
 
   end

data/lib/twitter/geo.rb

@@ -1,15 +1,10 @@
+require 'equalizer'
 require 'twitter/base'
 
 module Twitter
   class Geo < Twitter::Base
+    include Equalizer.new(:coordinates)
     attr_reader :coordinates
     alias coords coordinates
-
-    # @param other [Twitter::Geo]
-    # @return [Boolean]
-    def ==(other)
-      super || attr_equal(:coordinates, other) || attrs_equal(other)
-    end
-
   end
 end

data/lib/twitter/geo_factory.rb

@@ -5,13 +5,17 @@ require 'twitter/geo/polygon'
 module Twitter
   class GeoFactory < Twitter::Factory
 
-    # Construct a new geo object
-    #
-    # @param attrs [Hash]
-    # @raise [ArgumentError] Error raised when supplied argument is missing a :type key.
-    # @return [Twitter::Geo]
-    def self.new(attrs={})
-      super(:type, Twitter::Geo, attrs)
+    class << self
+
+      # Construct a new geo object
+      #
+      # @param attrs [Hash]
+      # @raise [IndexError] Error raised when supplied argument is missing a :type key.
+      # @return [Twitter::Geo]
+      def new(attrs={})
+        super(:type, Geo, attrs)
+      end
+
     end
 
   end

data/lib/twitter/geo_results.rb

@@ -8,22 +8,26 @@ module Twitter
     alias to_hash attrs
     alias to_hsh attrs
 
-    # Construct a new SearchResults object from a response hash
-    #
-    # @param response [Hash]
-    # @return [Twitter::Base]
-    def self.from_response(response={})
-      new(response[:body])
+    class << self
+
+      # Construct a new GeoResults object from a response hash
+      #
+      # @param response [Hash]
+      # @return [Twitter::Base]
+      def from_response(response={})
+        new(response[:body])
+      end
+
     end
 
-    # Initializes a new SearchResults object
+    # Initializes a new GeoResults object
     #
     # @param attrs [Hash]
     # @return [Twitter::GeoResults]
     def initialize(attrs={})
       @attrs = attrs
       @collection = Array(@attrs[:result][:places]).map do |place|
-        Twitter::Place.new(place)
+        Place.new(place)
       end
     end
 

data/lib/twitter/identity.rb

@@ -1,7 +1,10 @@
+require 'equalizer'
 require 'twitter/base'
 
 module Twitter
   class Identity < Twitter::Base
+    include Equalizer.new(:id)
+    attr_reader :id
 
     # Initializes a new object
     #
@@ -9,19 +12,8 @@ module Twitter
     # @raise [ArgumentError] Error raised when supplied argument is missing an :id key.
     # @return [Twitter::Identity]
     def initialize(attrs={})
+      attrs.fetch(:id)
       super
-      raise ArgumentError, "argument must have an :id key" unless id
-    end
-
-    # @param other [Twitter::Identity]
-    # @return [Boolean]
-    def ==(other)
-      super || attr_equal(:id, other) || attrs_equal(other)
-    end
-
-    # @return [Integer]
-    def id
-      @attrs[:id]
     end
 
   end

data/lib/twitter/list.rb

@@ -10,20 +10,23 @@ module Twitter
 
     # @return [URI] The URI to the list members.
     def members_uri
-      @members_uri ||= ::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/members")
+      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/members")
     end
+    memoize :members_uri
     alias members_url members_uri
 
     # @return [URI] The URI to the list subscribers.
     def subscribers_uri
-      @subscribers_uri ||= ::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/subscribers")
+      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/subscribers")
     end
+    memoize :subscribers_uri
     alias subscribers_url subscribers_uri
 
     # @return [URI] The URI to the list.
     def uri
-      @uri ||= ::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}")
+      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}")
     end
+    memoize :uri
     alias url uri
 
   end