twitter 5.0.0.rc.1 → 5.0.0

data/lib/twitter/size.rb

@@ -1,24 +1,11 @@
+require 'equalizer'
 require 'twitter/base'
 
 module Twitter
   class Size < Twitter::Base
+    include Equalizer.new(:h, :w)
     attr_reader :h, :resize, :w
     alias height h
     alias width w
-
-    # @param other [Twitter::Size]
-    # @return [Boolean]
-    def ==(other)
-      super || size_equal(other) || attrs_equal(other)
-    end
-
-  private
-
-    # @param other [Twitter::Size]
-    # @return [Boolean]
-    def size_equal(other)
-      self.class == other.class && !other.h.nil? && h == other.h && !other.w.nil? && w == other.w
-    end
-
   end
 end

data/lib/twitter/streaming/client.rb

@@ -3,45 +3,56 @@ require 'twitter/arguments'
 require 'twitter/client'
 require 'twitter/streaming/connection'
 require 'twitter/streaming/response'
+require 'twitter/streaming/message_parser'
+require 'twitter/streaming/event'
+require 'twitter/streaming/friend_list'
 
 module Twitter
   module Streaming
     class Client < Twitter::Client
       attr_writer :connection
 
+      # Initializes a new Client object
+      #
+      # @return [Twitter::Streaming::Client]
       def initialize(options={}, &block)
         super
-        @connection = Twitter::Streaming::Connection.new
+        @connection = Streaming::Connection.new
       end
 
+      # @yield [Twitter::Tweet] A stream of tweets.
       def filter(options={}, &block)
-        request(:get, 'https://stream.twitter.com:443/1.1/statuses/filter.json', options, &block)
+        request(:post, 'https://stream.twitter.com:443/1.1/statuses/filter.json', options, &block)
       end
 
+      # @yield [Twitter::Tweet] A stream of tweets.
       def firehose(options={}, &block)
         request(:get, 'https://stream.twitter.com:443/1.1/statuses/firehose.json', options, &block)
       end
 
+      # @yield [Twitter::Tweet] A stream of tweets.
       def sample(options={}, &block)
         request(:get, 'https://stream.twitter.com:443/1.1/statuses/sample.json', options, &block)
       end
 
+      # @yield [Twitter::Tweet] A stream of tweets.
       def site(*args, &block)
-        arguments = Twitter::Arguments.new(args)
+        arguments = Arguments.new(args)
         request(:get, 'https://sitestream.twitter.com:443/1.1/site.json', arguments.options.merge(:follow => arguments.join(',')), &block)
       end
 
+      # @yield [Twitter::Tweet] A stream of tweets.
       def user(options={}, &block)
         request(:get, 'https://userstream.twitter.com:443/1.1/user.json', options, &block)
       end
 
       # Set a Proc to be run when connection established.
-      def on_request(&block)
+      def before_request(&block)
         if block_given?
-          @on_request = block
+          @before_request = block
           self
-        elsif instance_variable_defined?(:@on_request)
-          @on_request
+        elsif instance_variable_defined?(:@before_request)
+          @before_request
         else
           Proc.new {}
         end
@@ -50,11 +61,13 @@ module Twitter
     private
 
       def request(method, uri, params, &block)
-        on_request.call
+        before_request.call
         headers  = default_headers.merge(:authorization => oauth_auth_header(method, uri, params).to_s)
         request  = HTTP::Request.new(method, uri + '?' + to_url_params(params), headers)
-        response = Twitter::Streaming::Response.new do |data|
-          yield(Tweet.new(data)) if data[:id]
+        response = Streaming::Response.new do |data|
+          if item = Streaming::MessageParser.parse(data)
+            yield item
+          end
         end
         @connection.stream(request, response)
       end
@@ -71,7 +84,6 @@ module Twitter
           :user_agent => user_agent,
         }
       end
-
     end
   end
 end

data/lib/twitter/streaming/event.rb

@@ -0,0 +1,35 @@
+module Twitter
+  module Streaming
+    class Event
+
+      LIST_EVENTS = [
+        :list_created, :list_destroyed, :list_updated, :list_member_added, 
+        :list_member_added, :list_member_removed, :list_user_subscribed, 
+        :list_user_subscribed, :list_user_unsubscribed, :list_user_unsubscribed
+      ]
+
+      TWEET_EVENTS = [
+        :favorite, :unfavorite
+      ]
+        
+      attr_reader :name, :source, :target, :target_object
+
+      # @param data [Hash]
+      def initialize(data)
+        @name = data[:event].intern
+        @source = Twitter::User.new(data[:source])
+        @target = Twitter::User.new(data[:target])
+        @target_object = target_object_factory(@name, data[:target_object])
+      end
+
+    private
+      def target_object_factory(event_name, data)
+        if LIST_EVENTS.include?(event_name)
+          Twitter::List.new(data)
+        elsif TWEET_EVENTS.include?(event_name)
+          Twitter::Tweet.new(data)
+        end
+      end
+    end
+  end
+end

data/lib/twitter/streaming/friend_list.rb

@@ -0,0 +1,13 @@
+module Twitter
+  module Streaming
+    class FriendList
+
+      attr_reader :friend_ids
+
+      # @param friend_ids [Array]
+      def initialize(friend_ids)
+        @friend_ids = friend_ids
+      end
+    end
+  end
+end

data/lib/twitter/streaming/message_parser.rb

@@ -0,0 +1,18 @@
+module Twitter
+  module Streaming
+    class MessageParser
+
+      def self.parse(data)
+        if data[:id]
+          Tweet.new(data)
+        elsif data[:event]
+          Event.new(data)
+        elsif data[:direct_message]
+          DirectMessage.new(data[:direct_message])
+        elsif data[:friends]
+          FriendList.new(data[:friends])
+        end
+      end
+    end
+  end
+end

data/lib/twitter/streaming/response.rb

@@ -3,6 +3,10 @@ require 'buftok'
 module Twitter
   module Streaming
     class Response
+
+      # Initializes a new Response object
+      #
+      # @return [Twitter::Streaming::Response]
       def initialize(&block)
         @block     = block
         @parser    = Http::Parser.new(self)

data/lib/twitter/suggestion.rb

@@ -1,23 +1,18 @@
+require 'equalizer'
 require 'twitter/base'
 
 module Twitter
   class Suggestion < Twitter::Base
+    include Equalizer.new(:slug)
     attr_reader :name, :size, :slug
 
-    # @param other [Twitter::Suggestion]
-    # @return [Boolean]
-    def ==(other)
-      super || attr_equal(:slug, other) || attrs_equal(other)
-    end
-
     # @return [Array<Twitter::User>]
     def users
-      memoize(:users) do
-        Array(@attrs[:users]).map do |user|
-          Twitter::User.new(user)
-        end
+      Array(@attrs[:users]).map do |user|
+        User.new(user)
       end
     end
+    memoize :users
 
   end
 end

data/lib/twitter/token.rb

@@ -2,7 +2,8 @@ require 'twitter/base'
 
 module Twitter
   class Token < Twitter::Base
-    attr_reader :token_type, :access_token
+    attr_reader :access_token, :token_type
+    alias to_s access_token
 
     BEARER_TYPE = "bearer"
 
@@ -10,6 +11,7 @@ module Twitter
     def bearer?
       @attrs[:token_type] == BEARER_TYPE
     end
+    memoize :bearer?
 
   end
 end

data/lib/twitter/trend.rb

@@ -1,15 +1,10 @@
+require 'equalizer'
 require 'twitter/base'
 
 module Twitter
   class Trend < Twitter::Base
+    include Equalizer.new(:name)
     attr_reader :events, :name, :promoted_content, :query
     uri_attr_reader :uri
-
-    # @param other [Twitter::Trend]
-    # @return [Boolean]
-    def ==(other)
-      super || attr_equal(:name, other) || attrs_equal(other)
-    end
-
   end
 end

data/lib/twitter/trend_results.rb

@@ -1,32 +1,38 @@
 require 'twitter/creatable'
 require 'twitter/enumerable'
+require 'memoizable'
 require 'twitter/null_object'
 
 module Twitter
   class TrendResults
     include Twitter::Creatable
     include Twitter::Enumerable
+    include Memoizable
     attr_reader :attrs
     alias to_h attrs
     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].first)
+    class << self
+
+      # Construct a new TrendResults object from a response hash
+      #
+      # @param response [Hash]
+      # @return [Twitter::Base]
+      def from_response(response={})
+        new(response[:body].first)
+      end
+
     end
 
-    # Initializes a new SearchResults object
+    # Initializes a new TrendResults object
     #
     # @param attrs [Hash]
     # @return [Twitter::TrendResults]
     def initialize(attrs={})
       @attrs = attrs
       @collection = Array(@attrs[:trends]).map do |trend|
-        Twitter::Trend.new(trend)
+        Trend.new(trend)
       end
     end
 
@@ -34,26 +40,26 @@ module Twitter
     #
     # @return [Time]
     def as_of
-      @as_of ||= Time.parse(@attrs[:as_of]) if @attrs[:as_of]
+      Time.parse(@attrs[:as_of]) if @attrs[:as_of]
     end
+    memoize :as_of
 
     def as_of?
       !!@attrs[:as_of]
     end
+    memoize :as_of?
 
     # @return [Twitter::Place, NullObject]
     def location
-      @location ||= if location?
-        Twitter::Place.new(@attrs[:locations].first)
-      else
-        Twitter::NullObject.instance
-      end
+      location? ? Place.new(@attrs[:locations].first) : NullObject.new
     end
+    memoize :location
 
     # @return [Boolean]
     def location?
       !@attrs[:locations].nil? && !@attrs[:locations].first.nil?
     end
+    memoize :location?
 
   end
 end

data/lib/twitter/tweet.rb

@@ -7,12 +7,7 @@ module Twitter
       :in_reply_to_attrs_id, :in_reply_to_status_id, :in_reply_to_user_id,
       :lang, :retweet_count, :retweeted, :source, :text, :truncated
     alias favorites_count favorite_count
-    alias favourite_count favorite_count
-    alias favourites_count favorite_count
     alias favoriters_count favorite_count
-    alias favouriters_count favorite_count
-    alias favourited favorited
-    alias favourited? favorited?
     alias in_reply_to_tweet_id in_reply_to_status_id
     alias retweeters_count retweet_count
     object_attr_reader :GeoFactory, :geo
@@ -27,12 +22,14 @@ module Twitter
 
     # @return [Boolean]
     def entities?
-      !@attrs[:entities].nil?
+      !@attrs[:entities].nil? && @attrs[:entities].any?{|_, array| !array.empty?}
     end
+    memoize :entities?
 
     def filter_level
       @attrs[:filter_level] || "none"
     end
+    memoize :filter_level
 
     # @return [String]
     # @note May be > 140 characters.
@@ -44,58 +41,56 @@ module Twitter
         text
       end
     end
+    memoize :full_text
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::Hashtag>]
     def hashtags
-      memoize(:hashtags) do
-        entities(Twitter::Entity::Hashtag, :hashtags)
-      end
+      entities(Entity::Hashtag, :hashtags)
     end
+    memoize :hashtags
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Media>]
     def media
-      memoize(:media) do
-        entities(Twitter::MediaFactory, :media)
-      end
+      entities(MediaFactory, :media)
     end
+    memoize :media
 
     # @return [Boolean]
     def reply?
       !!@attrs[:in_reply_to_status_id]
     end
+    memoize :reply?
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::Symbol>]
     def symbols
-      memoize(:symbols) do
-        entities(Twitter::Entity::Symbol, :symbols)
-      end
+      entities(Entity::Symbol, :symbols)
     end
+    memoize :symbols
 
     # @return [String] The URL to the tweet.
     def uri
-      @uri ||= ::URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}")
+      URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}")
     end
+    memoize :uri
     alias url uri
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::URI>]
     def uris
-      memoize(:uris) do
-        entities(Twitter::Entity::URI, :urls)
-      end
+      entities(Entity::URI, :urls)
     end
+    memoize :uris
     alias urls uris
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::UserMention>]
     def user_mentions
-      memoize(:user_mentions) do
-        entities(Twitter::Entity::UserMention, :user_mentions)
-      end
+      entities(Entity::UserMention, :user_mentions)
     end
+    memoize :user_mentions
 
   private
 
@@ -107,7 +102,7 @@ module Twitter
           klass.new(entity)
         end
       else
-        warn "#{Kernel.caller.first}: To get #{key.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}."
         []
       end
     end