slack_twitter_egosa 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacc92d45d103fdc59e58af8b74159c47cac2518fed7661d77c3117b3ff55903
-  data.tar.gz: 2a1479ef926b3bd2f8bbc70b6e465cd92bf1fec2b0eada3ba08402eae2af9908
+  metadata.gz: 1aeb894d9c375f87138b5df774353570e9fb5a62d3a6c452ca1eac344b7d34dd
+  data.tar.gz: a59bd58d2ce71f48c02951fab5d6bef8db968501d9d0f94e1333dc3b0a58def8
 SHA512:
-  metadata.gz: ce029d23c1ddb615070ef9d99866a56c8f273bd1be0048d1027bdf00a6fba4eb8d9107c6ca63ba654b6ea79d63538e7102611e5c8c59717495b7a310bf24c85c
-  data.tar.gz: 5e97f133be1c89ab1c5d2e4048e3bd95fc172f8024c7b2525aa9bab11aa011c2dacb5760946fb038cbe4783c0d44685e6f49d136ecb671ff0bedcd1c8212774f
+  metadata.gz: bb88c0ce7ac29b88f4f7cb94da7484e6ad52ed886781d30c3412c9ff356b35acb8bd4dba9686984aa7cdbb8b17fa3120178a7490637b74cd9915d6be1c70e5fb
+  data.tar.gz: 2b04f6451b6071f89317e4d37c37bc6de8192f594f01bf5af99cc41e4c39bcd66037d9858e33b055e4697c028177bab44c7e7977297c1b9e02739c76c92fa25b

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in slack_twitter_egosa.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'slack_twitter_egosa'

data/exe/slack_twitter_egosa

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'slack_twitter_egosa'
 

data/lib/slack_twitter_egosa/twitter_client.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'twitter'
+
+class TwitterClient
+  def initialize(consumer_key:, consumer_secret:, access_token:, access_token_secret:, search_query:)
+    @client = Twitter::REST::Client.new do |config|
+      config.consumer_key        = consumer_key
+      config.consumer_secret     = consumer_secret
+      config.access_token        = access_token
+      config.access_token_secret = access_token_secret
+    end
+    @search_query = search_query
+  end
+
+  def home_timeline
+    is_first_fetch = @home_timeline_since_id.nil?
+
+    params = { count: 200, tweet_mode: 'extended' }
+    params[:since_id] = @home_timeline_since_id if @home_timeline_since_id
+    statuses = @client.home_timeline(params).to_a
+    @home_timeline_since_id = statuses.first.id unless statuses.empty?
+
+    # Tweets acquired for the first time are not subject to notification
+    return [] if is_first_fetch
+
+    statuses
+  rescue Twitter::Error::TooManyRequests
+    warn 'home_timeline: too many requests'
+    []
+  rescue HTTP::ConnectionError
+    warn 'home_timeline: http connection error'
+    []
+  end
+
+  def search
+    return [] if @search_query.empty?
+
+    is_first_fetch = @search_since_id.nil?
+
+    params = { result_type: 'recent', count: 100, tweet_mode: 'extended' }
+    params[:since_id] = @search_since_id if @search_since_id
+    statuses = @client.search(@search_query, params).to_a
+    @search_since_id = statuses.first.id unless statuses.empty?
+
+    # Tweets acquired for the first time are not subject to notification
+    return [] if is_first_fetch
+
+    statuses
+  rescue Twitter::Error::TooManyRequests
+    warn 'search: too many requests'
+    []
+  rescue HTTP::ConnectionError
+    warn 'search: http connection error'
+    []
+  end
+end

data/lib/slack_twitter_egosa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SlackTwitterEgosa
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/lib/slack_twitter_egosa/word_manager.rb

@@ -20,7 +20,7 @@ class WordManager
     [
       target.join(' OR '),
       exclude.map { |word| "-#{word}" }.join(' ')
-    ].join(' ')
+    ].join(' ').strip
   end
 
   def match?(text)

data/lib/slack_twitter_egosa.rb

@@ -2,13 +2,13 @@
 
 require 'thwait'
 
-require 'slack_twitter_egosa/version'
-require 'slack_twitter_egosa/slack_poster'
-require 'slack_twitter_egosa/word_manager'
-require 'slack_twitter_egosa/user_filter'
+require_relative 'slack_twitter_egosa/version'
+require_relative 'slack_twitter_egosa/slack_poster'
+require_relative 'slack_twitter_egosa/word_manager'
+require_relative 'slack_twitter_egosa/user_filter'
+require_relative 'slack_twitter_egosa/twitter_client'
 
 require 'dotenv'
-require 'twitter'
 
 module SlackTwitterEgosa
   class << self
@@ -17,17 +17,17 @@ module SlackTwitterEgosa
 
       lack_env = check_env(ENV.keys)
       unless lack_env.empty?
-        STDERR.puts 'Not enough vnvironment variable'
+        warn 'Not enough vnvironment variable'
         lack_env.each do |env|
-          STDERR.puts "  #{env}"
+          warn "  #{env}"
         end
         exit 1
       end
 
-      threads = [
-        home_timeline_thread,
-        search_thread
-      ]
+      Thread.abort_on_exception = true
+      threads = []
+      threads << home_timeline_thread unless home_timeline_words.query.empty?
+      threads << search_thread unless search_words.query.empty?
       ThreadsWait.all_waits(*threads)
     end
 
@@ -45,12 +45,13 @@ module SlackTwitterEgosa
     end
 
     def client
-      @client ||= Twitter::REST::Client.new do |config|
-        config.consumer_key        = ENV['CONSUMER_KEY']
-        config.consumer_secret     = ENV['CONSUMER_SECRET']
-        config.access_token        = ENV['OAUTH_TOKEN']
-        config.access_token_secret = ENV['OAUTH_TOKEN_SECRET']
-      end
+      @client ||= TwitterClient.new(
+        consumer_key: ENV['CONSUMER_KEY'],
+        consumer_secret: ENV['CONSUMER_SECRET'],
+        access_token: ENV['OAUTH_TOKEN'],
+        access_token_secret: ENV['OAUTH_TOKEN_SECRET'],
+        search_query: search_words.query
+      )
     end
 
     def poster
@@ -81,18 +82,7 @@ module SlackTwitterEgosa
     def home_timeline_thread
       Thread.new do
         loop do
-          sleep 180 if @home_timeline_since_id
-
-          params = { count: 200, tweet_mode: 'extended' }
-          params[:since_id] = @home_timeline_since_id if @home_timeline_since_id
-          statuses = client.home_timeline(params)
-          next if statuses.empty?
-
-          before_home_timeline_since_id = @home_timeline_since_id
-          @home_timeline_since_id = statuses.first.id
-          next unless before_home_timeline_since_id
-
-          statuses.reverse_each do |status|
+          client.home_timeline.reverse_each do |status|
             if status.retweet?
               status = status.retweeted_status
               next if status.user.following?
@@ -100,6 +90,9 @@ module SlackTwitterEgosa
 
             poster.post_status(status) if match_on_home_timeline?(status)
           end
+
+          # Max 15 requests / 15 min
+          sleep 180
         end
       end
     end
@@ -107,20 +100,12 @@ module SlackTwitterEgosa
     def search_thread
       Thread.new do
         loop do
-          sleep 90 if @search_since_id
-
-          params = { result_type: 'recent', count: 100, tweet_mode: 'extended' }
-          params[:since_id] = @search_since_id if @search_since_id
-          statuses = client.search(search_words.query, params).to_a
-          next if statuses.empty?
-
-          before_search_since_id = @search_since_id
-          @search_since_id = statuses.first.id
-          next unless before_search_since_id
-
-          statuses.reverse_each do |status|
+          client.search.reverse_each do |status|
             poster.post_status(status) if match_on_search?(status)
           end
+
+          # Max 180 requests / 15 min
+          sleep 60
         end
       end
     end

data/slack_twitter_egosa.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'slack_twitter_egosa/version'
 
@@ -19,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dotenv', '~> 2.4.0'
+  spec.add_dependency 'dotenv', '~> 2.7.0'
   spec.add_dependency 'slack-poster', '~> 2.2.0'
   spec.add_dependency 'twitter', '~> 6.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack_twitter_egosa
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - abcang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: slack-poster
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - exe/slack_twitter_egosa
 - lib/slack_twitter_egosa.rb
 - lib/slack_twitter_egosa/slack_poster.rb
+- lib/slack_twitter_egosa/twitter_client.rb
 - lib/slack_twitter_egosa/user_filter.rb
 - lib/slack_twitter_egosa/version.rb
 - lib/slack_twitter_egosa/word_manager.rb
@@ -138,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Eegosearching twitter and post to slack.