twitter 6.2.0 → 7.0.0

data/lib/twitter/search_results.rb

@@ -9,7 +9,7 @@ module Twitter
     include Twitter::Enumerable
     include Twitter::Utils
     # @return [Hash]
-    attr_reader :attrs
+    attr_reader :attrs, :rate_limit
     alias to_h attrs
     alias to_hash to_h
 
@@ -48,8 +48,9 @@ module Twitter
 
     # @return [Hash]
     def fetch_next_page
-      response = Twitter::REST::Request.new(@client, @request_method, @path, @options.merge(next_page)).perform
-      self.attrs = response
+      response = Twitter::REST::Request.new(@client, @request_method, @path, @options.merge(next_page))
+      self.attrs = response.perform
+      @rate_limit = response.rate_limit
     end
 
     # @param attrs [Hash]

data/lib/twitter/streaming/client.rb

@@ -105,6 +105,10 @@ module Twitter
         end
       end
 
+      def close
+        @connection.close
+      end
+
     private
 
       def request(method, uri, params)
@@ -112,7 +116,7 @@ module Twitter
         headers = Twitter::Headers.new(self, method, uri, params).request_headers
         request = HTTP::Request.new(verb: method, uri: uri + '?' + to_url_params(params), headers: headers, proxy: proxy)
         response = Streaming::Response.new do |data|
-          if item = Streaming::MessageParser.parse(data) # rubocop:disable AssignmentInCondition
+          if item = Streaming::MessageParser.parse(data) # rubocop:disable Lint/AssignmentInCondition
             yield(item)
           end
         end

data/lib/twitter/streaming/connection.rb

@@ -11,14 +11,23 @@ module Twitter
         @tcp_socket_class = options.fetch(:tcp_socket_class) { TCPSocket }
         @ssl_socket_class = options.fetch(:ssl_socket_class) { OpenSSL::SSL::SSLSocket }
         @using_ssl        = options.fetch(:using_ssl)        { false }
+        @write_pipe = nil
       end
 
-      def stream(request, response)
+      def stream(request, response) # rubocop:disable Metrics/MethodLength
         client = connect(request)
         request.stream(client)
-        while body = client.readpartial(1024) # rubocop:disable AssignmentInCondition
-          response << body
+        read_pipe, @write_pipe = IO.pipe
+        loop do
+          read_ios, _write_ios, _exception_ios = IO.select([read_pipe, client])
+          case read_ios.first
+          when client
+            response << client.readpartial(1024)
+          when read_pipe
+            break
+          end
         end
+        client.close
       end
 
       def connect(request)
@@ -30,6 +39,10 @@ module Twitter
         ssl_client.connect
       end
 
+      def close
+        @write_pipe&.write('q')
+      end
+
     private
 
       def new_tcp_socket(host, port)

data/lib/twitter/streaming/message_parser.rb

@@ -8,7 +8,7 @@ require 'twitter/tweet'
 module Twitter
   module Streaming
     class MessageParser
-      def self.parse(data) # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
+      def self.parse(data) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         if data[:id]
           Tweet.new(data)
         elsif data[:event]

data/lib/twitter/streaming/response.rb

@@ -27,6 +27,7 @@ module Twitter
       def on_body(data)
         @tokenizer.extract(data).each do |line|
           next if line.empty?
+
           @block.call(JSON.parse(line, symbolize_names: true))
         end
       end

data/lib/twitter/tweet.rb

@@ -10,7 +10,7 @@ module Twitter
     attr_reader :filter_level, :in_reply_to_screen_name, :lang, :source, :text
     # @return [Integer]
     attr_reader :favorite_count, :in_reply_to_status_id, :in_reply_to_user_id,
-                :retweet_count
+                :quote_count, :reply_count, :retweet_count
     alias in_reply_to_tweet_id in_reply_to_status_id
     alias reply? in_reply_to_user_id?
     object_attr_reader :GeoFactory, :geo
@@ -29,6 +29,15 @@ module Twitter
     predicate_attr_reader :favorited, :possibly_sensitive, :retweeted,
                           :truncated
 
+    # Initializes a new object
+    #
+    # @param attrs [Hash]
+    # @return [Twitter::Tweet]
+    def initialize(attrs = {})
+      attrs[:text] = attrs[:full_text] if attrs[:text].nil? && !attrs[:full_text].nil?
+      super
+    end
+
     # @note May be > 280 characters.
     # @return [String]
     def full_text

data/lib/twitter/utils.rb

@@ -7,9 +7,10 @@ module Twitter
     #
     # @param enumerable [Enumerable]
     # @return [Array, Enumerator]
-    def flat_pmap(enumerable)
+    def flat_pmap(enumerable, &block)
       return to_enum(:flat_pmap, enumerable) unless block_given?
-      pmap(enumerable, &Proc.new).flatten(1)
+
+      pmap(enumerable, &block).flatten(1)
     end
 
     # Returns a new array with the results of running block once for every element in enumerable.
@@ -19,6 +20,7 @@ module Twitter
     # @return [Array, Enumerator]
     def pmap(enumerable)
       return to_enum(:pmap, enumerable) unless block_given?
+
       if enumerable.count == 1
         enumerable.collect { |object| yield(object) }
       else

data/lib/twitter/version.rb

@@ -4,12 +4,12 @@ module Twitter
 
     # @return [Integer]
     def major
-      6
+      7
     end
 
     # @return [Integer]
     def minor
-      2
+      0
     end
 
     # @return [Integer]

data/twitter.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twitter/version'
 
@@ -6,14 +6,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'addressable', '~> 2.3'
   spec.add_dependency 'buftok', '~> 0.2.0'
   spec.add_dependency 'equalizer', '~> 0.0.11'
-  spec.add_dependency 'http', '~> 3.0'
+  spec.add_dependency 'http', '~> 4.0'
   spec.add_dependency 'http-form_data', '~> 2.0'
   spec.add_dependency 'http_parser.rb', '~> 0.6.0'
   spec.add_dependency 'memoizable', '~> 0.4.0'
   spec.add_dependency 'multipart-post', '~> 2.0'
   spec.add_dependency 'naught', '~> 1.0'
   spec.add_dependency 'simple_oauth', '~> 0.3.0'
-  spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors = ['Erik Michaels-Ober', 'John Nunemaker', 'Wynn Netherland', 'Steve Richert', 'Steve Agalloco']
   spec.description = 'A Ruby interface to the Twitter API.'
   spec.email = %w[sferik@gmail.com]
@@ -22,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.licenses = %w[MIT]
   spec.name = 'twitter'
   spec.require_paths = %w[lib]
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.3'
   spec.summary = spec.description
   spec.version = Twitter::Version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -62,14 +62,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: http-form_data
   requirement: !ruby/object:Gem::Requirement
@@ -154,20 +154,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A Ruby interface to the Twitter API.
 email:
 - sferik@gmail.com
@@ -189,6 +175,11 @@ files:
 - lib/twitter/creatable.rb
 - lib/twitter/cursor.rb
 - lib/twitter/direct_message.rb
+- lib/twitter/direct_message_event.rb
+- lib/twitter/direct_messages/welcome_message.rb
+- lib/twitter/direct_messages/welcome_message_rule.rb
+- lib/twitter/direct_messages/welcome_message_rule_wrapper.rb
+- lib/twitter/direct_messages/welcome_message_wrapper.rb
 - lib/twitter/entities.rb
 - lib/twitter/entity.rb
 - lib/twitter/entity/hashtag.rb
@@ -216,19 +207,23 @@ files:
 - lib/twitter/null_object.rb
 - lib/twitter/oembed.rb
 - lib/twitter/place.rb
+- lib/twitter/premium_search_results.rb
 - lib/twitter/profile.rb
 - lib/twitter/profile_banner.rb
 - lib/twitter/rate_limit.rb
 - lib/twitter/relationship.rb
+- lib/twitter/rest/account_activity.rb
 - lib/twitter/rest/api.rb
 - lib/twitter/rest/client.rb
 - lib/twitter/rest/direct_messages.rb
+- lib/twitter/rest/direct_messages/welcome_messages.rb
 - lib/twitter/rest/favorites.rb
 - lib/twitter/rest/friends_and_followers.rb
 - lib/twitter/rest/help.rb
 - lib/twitter/rest/lists.rb
 - lib/twitter/rest/oauth.rb
 - lib/twitter/rest/places_and_geo.rb
+- lib/twitter/rest/premium_search.rb
 - lib/twitter/rest/request.rb
 - lib/twitter/rest/saved_searches.rb
 - lib/twitter/rest/search.rb
@@ -238,6 +233,7 @@ files:
 - lib/twitter/rest/trends.rb
 - lib/twitter/rest/tweets.rb
 - lib/twitter/rest/undocumented.rb
+- lib/twitter/rest/upload_utils.rb
 - lib/twitter/rest/users.rb
 - lib/twitter/rest/utils.rb
 - lib/twitter/saved_search.rb
@@ -275,15 +271,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.