logstash-input-twitter 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c922a98eed84cc4f486e62cf74ec0ccfe3877788503cc6de18cde82b7ce59d70
-  data.tar.gz: db40a663d45c6fb8b395c6f12af58d57bccc08ab7e9fd8e534513defd6aef6cd
+  metadata.gz: '0857b97ff1503291374881bfd1dafe4693ba756b5a935e8331bc415e17d30148'
+  data.tar.gz: 62aeaf7b1e9161479df75e3fa34e9da1c1162c7d2ee50bf13818923a62bac740
 SHA512:
-  metadata.gz: 4fd2bbfd624db48d8c572cd1faa8a4be34035093929b3ce663b5c38bd228fdbafcdf6b0de81c3c6af98299022795e380573451e93f92b8d3dc91db8f5869c5d6
-  data.tar.gz: f215a53f05f8490ac7e612719095dc0ea53be10f38b984d48e29c30e2b75f1b300deeb412d64f03d8ea035058dafdc59741aad2f24f4e0700ff37efb325ebf6e
+  metadata.gz: 3758ab5554337990eddbaf5da5c7207be10252cbfe8132697b6809014f7bb0390d797d6ae2a0de4a38561e1ae0113fe4245dceae541e6fd51a3c87169f922acc
+  data.tar.gz: 6a3eed43e5128523ad319e4513d1bf0297382ad7f8671386579dae53d5e5f49a7ecb3f75f7ed80fdf1f68c8da0de52fa65bd307667d7d55ec9a33a5dbbff7e08

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.1
+  - Updated Twitter gem to v6.2.0, cleaned up obsolete monkey patches, fixed integration tests [#63](https://github.com/logstash-plugins/logstash-input-twitter/pull/63)
+
 ## 4.0.0
   - Update http-form_data to ~> 2 and public_suffix to ~> 3
 

data/lib/logstash/inputs/twitter.rb

@@ -5,6 +5,7 @@ require "logstash/timestamp"
 require "logstash/util"
 require "logstash/json"
 require "stud/interval"
+require "twitter"
 require "logstash/inputs/twitter/patches"
 
 # Ingest events from the Twitter Streaming API.
@@ -104,8 +105,6 @@ class LogStash::Inputs::Twitter < LogStash::Inputs::Base
   config :rate_limit_reset_in, :validate => :number, :default => 300
 
   def register
-    require "twitter"
-
     if !@use_samples && ( @keywords.nil? && @follows.nil? && @locations.nil? )
       raise LogStash::ConfigurationError.new("At least one parameter (follows, locations or keywords) must be specified.")
     end

data/lib/logstash/inputs/twitter/patches.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
-require 'twitter/streaming/connection'
 require 'twitter/streaming/response'
-require 'twitter/streaming/message_parser'
 
 module LogStash
   module Inputs
@@ -10,54 +8,12 @@ module LogStash
       def self.patch
         verify_version
         patch_json
-        patch_connection_stream
-        patch_request
       end
 
       private
 
       def self.verify_version
-        raise("Incompatible Twitter gem version and the LogStash::Json.load") unless ::Twitter::Version.to_s == "5.15.0"
-      end
-
-      def self.patch_connection_stream
-        ::Twitter::Streaming::Connection.class_eval do
-          def stream(request, response)
-            socket = @tcp_socket_class.new(Resolv.getaddress(request.socket_host), request.socket_port)
-            socket = ssl_stream(socket) if !request.using_proxy?
-
-            request.stream(socket)
-            while body = socket.readpartial(1024) # rubocop:disable AssignmentInCondition
-              response << body
-            end
-          end
-
-          def ssl_stream(client)
-            client_context = OpenSSL::SSL::SSLContext.new
-            ssl_client     = @ssl_socket_class.new(client, client_context)
-            ssl_client.connect
-          end
-
-          def normalized_port(scheme)
-            HTTP::URI.port_mapping[scheme]
-          end
-        end
-      end
-
-      def self.patch_request
-        ::Twitter::Streaming::Client.class_eval do
-          def request(method, uri, params)
-            before_request.call
-            headers = ::Twitter::Headers.new(self, method, uri, params).request_headers
-            request = ::HTTP::Request.new(method, uri + '?' + to_url_params(params), headers, proxy)
-            response = ::Twitter::Streaming::Response.new do |data|
-              if item = ::Twitter::Streaming::MessageParser.parse(data) # rubocop:disable AssignmentInCondition
-                yield(item)
-              end
-            end
-            @connection.stream(request, response)
-          end
-        end
+        raise("Incompatible Twitter gem version and the LogStash::Json.load") unless ::Twitter::Version.to_s == "6.2.0"
       end
 
       def self.patch_json

data/logstash-input-twitter.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-twitter'
-  s.version         = '4.0.0'
+  s.version         = '4.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads events from the Twitter Streaming API"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -19,9 +19,13 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
+  # public_suffix 3.x+ includes ruby syntax from 2.1
+  # This effectively requires Logstash >= 6.x
+  s.required_ruby_version = '>= 2.1.0'
+
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_runtime_dependency 'twitter', '5.15.0'
+  s.add_runtime_dependency 'twitter', '6.2.0'
   s.add_runtime_dependency 'http-form_data', '~> 2'
   s.add_runtime_dependency 'public_suffix', '~> 3'
   s.add_runtime_dependency 'stud', '>= 0.0.22', '< 0.1'

data/spec/integration/twitter_pubsub_spec.rb

@@ -45,7 +45,7 @@ describe LogStash::Inputs::Twitter do
         RSpec::Sequencing.run_after(1, "update tweet status") do
           twt = "logstash_ci_publish partial tweet test #{Time.now} #{SecureRandom.hex(6)} $AAPL #lscipub @logstash https://www.elastic.co/downloads/logstash"
           publisher.update_with_media(twt, File.open(LogstashTwitterInput.fixture("small_smile.png")))
-        end.then_after(3, "stop plugin") do
+        end.then_after(10, "stop plugin") do
           plugin.stop
           true
         end.value
@@ -64,10 +64,10 @@ describe LogStash::Inputs::Twitter do
       let(:full_tweets) { true }
 
       it "receives an event from the twitter stream" do
-        RSpec::Sequencing.run_after(0.1, "update tweet status") do
+        RSpec::Sequencing.run_after(1, "update tweet status") do
           twt = "logstash_ci_publish full tweet test #{Time.now} #{SecureRandom.hex(6)} $AAPL #lscipub @logstash https://www.elastic.co/downloads/logstash"
           publisher.update_with_media(twt, File.open(LogstashTwitterInput.fixture("small_smile.png")))
-        end.then_after(3, "stop plugin") do
+        end.then_after(10, "stop plugin") do
           plugin.stop
           true
         end.value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-twitter
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.15.0
+        version: 6.2.0
   name: twitter
   prerelease: false
   type: :runtime
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.15.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="