ruboty-twitter_search 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a101873c2cb41d5d728cf61262f77bf2a5e3d890
-  data.tar.gz: c29ce2d0503b71933e1e92edcdc549684afebb8f
+  metadata.gz: 6dafb7c3ce9a43df3af927996161b0f3066a5093
+  data.tar.gz: 6fa1ce3cfdfedafd532e6770538f90fb6d10d69d
 SHA512:
-  metadata.gz: 9725086905c97364564ffda709cb6ef96827771755e5b4e597d45d5efac9c8f46c3e5a403e7fe7803656142730cc1581914354dd244dbe738a010cffc4b43190
-  data.tar.gz: 239e4ae74c634f5fa15653e977f69f766cfeb2768a8b3112d867428014e989c7ac79ce6f0b2f26c7da17403cb71f65db809649201a4e752bb3de42fd45aefde3
+  metadata.gz: 2565ba3f48da594fc444f824a5358a311580cdb57a451d48deaa4eedb77cdefd4add5311d531fb4ca53b7158d185566b4021afcf285a122463ad141641b15559
+  data.tar.gz: 0ebe3c100527a1e29d937c55b15bed367125d0af8cfdf2c0d1c3d2a5c8a60c7ac5c1158d8e6208366af08342b8e5294c1c7d83496301dc1ab49d38b6fd539025

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.1
+- Separate class files from handler's inner classes
+- Support combination use with ruboty-twitter
+- Fix since_id on filtered result
+
 ## 0.1.0
 - Support search filter query (Thx @gong023)
 

data/lib/ruboty/handlers/twitter_search.rb

@@ -1,4 +1,6 @@
 require "ruboty"
+require "ruboty/twitter_search/query"
+require "ruboty/twitter_search/statuses_view"
 require "twitter"
 
 module Ruboty
@@ -21,7 +23,7 @@ module Ruboty
 
       # @return [true] to prevent running missing handlers.
       def search(message)
-        query = Query.new(message[:query])
+        query = Ruboty::TwitterSearch::Query.new(message[:query])
 
         statuses = client.search(
           query.query_string,
@@ -29,6 +31,8 @@ module Ruboty
           since_id: fetch_since_id_for(message[:query]),
         ).take(TWEETS_COUNT)
 
+        since_id = statuses.first.id
+
         statuses.select! do |status|
           status.retweet_count >= query.minimum_retweet_count
         end
@@ -38,10 +42,10 @@ module Ruboty
         end
 
         if statuses.any?
-          message.reply(StatusesView.new(statuses).to_s)
-          store_since_id(query: message[:query], since_id: statuses.first.id)
+          message.reply(Ruboty::TwitterSearch::StatusesView.new(statuses).to_s)
+          store_since_id(query: message[:query], since_id: since_id)
         end
-      rescue Twitter::Error => exception
+      rescue ::Twitter::Error => exception
         message.reply("#{exception.class}: #{exception}")
       ensure
         return true
@@ -80,120 +84,6 @@ module Ruboty
           store[query] = since_id
         end
       end
-
-      class Query
-        DEFAULT_MINIMUM_FAVORITE_COUNT = 0
-        DEFAULT_MINIMUM_RETWEET_COUNT = 0
-
-        # @param [String] original_query_string
-        def initialize(original_query_string)
-          @original_query_string = original_query_string
-        end
-
-        # @return [Fixnum]
-        def minimum_favorite_count
-          if token = tokens.find(&:favorite_count_filter?)
-            token.favorite_count
-          else
-            DEFAULT_MINIMUM_FAVORITE_COUNT
-          end
-        end
-
-        # @return [Fixnum]
-        def minimum_retweet_count
-          if token = tokens.find(&:retweet_count_filter?)
-            token.retweet_count
-          else
-            DEFAULT_MINIMUM_RETWEET_COUNT
-          end
-        end
-
-        # @return [String]
-        def query_string
-          tokens.reject(&:filter?).join(" ")
-        end
-
-        # @return [String, nil]
-        def result_type
-          if token = tokens.find(&:result_type_filter?)
-            token.result_type
-          end
-        end
-
-        private
-
-        # @return [Array<Ruboty::Handlers::TwitterSearch::Token>]
-        def tokens
-          @tokens ||= @original_query_string.split.map do |token_string|
-            Token.new(token_string)
-          end
-        end
-      end
-
-      class StatusesView
-        def initialize(statuses)
-          @statuses = statuses
-        end
-
-        def to_s
-          source_urls.reverse.join("\n")
-        end
-
-        private
-
-        def source_urls
-          @statuses.map do |status|
-            "https://twitter.com/#{status.user.screen_name}/status/#{status.id}"
-          end
-        end
-      end
-
-      class Token
-        def initialize(token_string)
-          @token_string = token_string
-        end
-
-        # @return [Fixnum, nil]
-        def favorite_count
-          if @token_string.match(/\Afav:(?<count>\d+)\z/)
-            Regexp.last_match(:count).to_i
-          end
-        end
-
-        def favorite_count_filter?
-          !favorite_count.nil?
-        end
-
-        def filter?
-          favorite_count_filter? || result_type_filter? || retweet_count_filter?
-        end
-
-        # @return [String, nil]
-        def result_type
-          if @token_string.match(/\Aresult_type:(?<type>\w+)\z/)
-            Regexp.last_match(:type)
-          end
-        end
-
-        def result_type_filter?
-          !result_type.nil?
-        end
-
-        # @return [Fixnum, nil]
-        def retweet_count
-          if @token_string.match(/\Aretweet:(?<count>\d+)\z/)
-            Regexp.last_match(:count).to_i
-          end
-        end
-
-        def retweet_count_filter?
-          !retweet_count.nil?
-        end
-
-        def to_s
-          @token_string
-        end
-      end
     end
   end
 end

data/lib/ruboty/twitter_search/query.rb

@@ -0,0 +1,54 @@
+require "ruboty/twitter_search/token"
+
+module Ruboty
+  module TwitterSearch
+    class Query
+      DEFAULT_MINIMUM_FAVORITE_COUNT = 0
+      DEFAULT_MINIMUM_RETWEET_COUNT = 0
+
+      # @param [String] original_query_string
+      def initialize(original_query_string)
+        @original_query_string = original_query_string
+      end
+
+      # @return [Fixnum]
+      def minimum_favorite_count
+        if token = tokens.find(&:favorite_count_filter?)
+          token.favorite_count
+        else
+          DEFAULT_MINIMUM_FAVORITE_COUNT
+        end
+      end
+
+      # @return [Fixnum]
+      def minimum_retweet_count
+        if token = tokens.find(&:retweet_count_filter?)
+          token.retweet_count
+        else
+          DEFAULT_MINIMUM_RETWEET_COUNT
+        end
+      end
+
+      # @return [String]
+      def query_string
+        tokens.reject(&:filter?).join(" ")
+      end
+
+      # @return [String, nil]
+      def result_type
+        if token = tokens.find(&:result_type_filter?)
+          token.result_type
+        end
+      end
+
+      private
+
+      # @return [Array<Ruboty::Handlers::TwitterSearch::Token>]
+      def tokens
+        @tokens ||= @original_query_string.split.map do |token_string|
+          Token.new(token_string)
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/twitter_search/statuses_view.rb

@@ -0,0 +1,21 @@
+module Ruboty
+  module TwitterSearch
+    class StatusesView
+      def initialize(statuses)
+        @statuses = statuses
+      end
+
+      def to_s
+        source_urls.reverse.join("\n")
+      end
+
+      private
+
+      def source_urls
+        @statuses.map do |status|
+          "https://twitter.com/#{status.user.screen_name}/status/#{status.id}"
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/twitter_search/token.rb

@@ -0,0 +1,50 @@
+module Ruboty
+  module TwitterSearch
+    class Token
+      def initialize(token_string)
+        @token_string = token_string
+      end
+
+      # @return [Fixnum, nil]
+      def favorite_count
+        if @token_string.match(/\Afav:(?<count>\d+)\z/)
+          Regexp.last_match(:count).to_i
+        end
+      end
+
+      def favorite_count_filter?
+        !favorite_count.nil?
+      end
+
+      def filter?
+        favorite_count_filter? || result_type_filter? || retweet_count_filter?
+      end
+
+      # @return [String, nil]
+      def result_type
+        if @token_string.match(/\Aresult_type:(?<type>\w+)\z/)
+          Regexp.last_match(:type)
+        end
+      end
+
+      def result_type_filter?
+        !result_type.nil?
+      end
+
+      # @return [Fixnum, nil]
+      def retweet_count
+        if @token_string.match(/\Aretweet:(?<count>\d+)\z/)
+          Regexp.last_match(:count).to_i
+        end
+      end
+
+      def retweet_count_filter?
+        !retweet_count.nil?
+      end
+
+      def to_s
+        @token_string
+      end
+    end
+  end
+end

data/lib/ruboty/twitter_search/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module TwitterSearch
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/ruboty/{handlers/twitter_search → twitter_search}/query_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Ruboty::Handlers::TwitterSearch::Query do
+RSpec.describe Ruboty::TwitterSearch::Query do
   let(:query) do
     described_class.new(original_string)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-twitter_search
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -112,9 +112,12 @@ files:
 - Rakefile
 - lib/ruboty/handlers/twitter_search.rb
 - lib/ruboty/twitter_search.rb
+- lib/ruboty/twitter_search/query.rb
+- lib/ruboty/twitter_search/statuses_view.rb
+- lib/ruboty/twitter_search/token.rb
 - lib/ruboty/twitter_search/version.rb
 - ruboty-twitter_search.gemspec
-- spec/ruboty/handlers/twitter_search/query_spec.rb
+- spec/ruboty/twitter_search/query_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/r7kamura/ruboty-twitter_search
 licenses:
@@ -141,6 +144,6 @@ signing_key:
 specification_version: 4
 summary: Ruboty plug-in to search twitter.
 test_files:
-- spec/ruboty/handlers/twitter_search/query_spec.rb
+- spec/ruboty/twitter_search/query_spec.rb
 - spec/spec_helper.rb
 has_rdoc: