ruboty-twitter_track 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332ecf6d38e4fcc8edf2677bc119ec27c5278bce
-  data.tar.gz: 6581c64efec90384b6c63d94d3ebce48c7b0c925
+  metadata.gz: 6bcad5f258d6f12adc8bf514bb42b091e9110c73
+  data.tar.gz: feeac45bcda8da737ecd41ba628e274a10b57645
 SHA512:
-  metadata.gz: eed785ff8df72589a7c020bce99bdac1ed7c5945dc94b54bf1995f29a5a4e9b8a359235f3cc9d2364f563b14dc821cd9453ba8346c8c4b5b70a1bf28c71a8e5f
-  data.tar.gz: 2c1976543de864f235e14b7119380e70775565186aba3b88d9638e2b574f38ee1b83c7107aa7e666612bdceafcdbae188c375889b4e723fa80611384c9b42fbc
+  metadata.gz: 39c955ee2d2b30aae1ccdf8f853b3f37024bd67e5ff82750627431af3458f3d5a4696f868a8fe5f027e6ac0c4ded17fc1b95817484ade07164f70c997ea95dfd
+  data.tar.gz: ed6ff5dbc00eaf9267c0be105ce3ade7ee99e6c54941b1198c9c5b99318dbc27e4674a064febcff3272743024f3207b157753a3c6b1185c533028c0e8563b008

data/README.md

@@ -1,6 +1,6 @@
 # Ruboty::TwitterTrack
 
-Ruboty handler to track terms in the twitter stream.
+Ruboty handler to track certain words in the twitter stream.
 
 ## Installation
 
@@ -17,18 +17,18 @@ And then execute:
 ## Usage
 
 ```
-> @ruboty track tweets by ruboty 
-Tracked 'ruboty'
+> @ruboty twitter track by rubygems
+@ruboty> Tracked 'rubygems'
 
 @ruboty> https://twitter.com/haccht/status/123456789
 @ruboty> https://twitter.com/haccht/status/123456790
 @ruboty> https://twitter.com/haccht/status/123456791
 
-> @ruboty list tweets tracking
-@haccht
+> @ruboty twitter tracking
+@ruboty> 'rubygems'
 
-> @ruboty untrack tweets by ruboty
-Untracked 'ruboty'
+> @ruboty twitter untrack by rubygems
+@ruboty> Untracked 'rubygems'
 ```
 
 ## Env

data/lib/ruboty/handlers/twitter_track.rb

@@ -1,69 +1,73 @@
 module Ruboty
   module Handlers
     class TwitterTrack < Base
-      on(/track tweets by (?<term>.+)\z/,
+      on(/twitter track by (?<term>.+)\z/,
         name: 'track',
-        description: 'Track tweets in the twitter stream.')
+        description: 'Track the twitter stream by the certain term.')
 
-      on(/untrack tweets by (?<term>.+)\z/,
+      on(/twitter untrack by (?<term>.+)\z/,
         name: 'untrack',
-        description: 'Untrack tweets in the twitter stream.')
+        description: 'Untrack the twitter stream by the certain term.')
 
-      on(/list tweets tracking\z/,
+      on(/twitter tracking\z/,
         name: 'tracking',
-        description: 'List tracking tweets in the twitter stream.')
+        description: 'List tracking terms.')
 
       def initialize(*args)
         super
 
         @stream = Ruboty::TwitterTrack::Stream.new(robot)
-        @stream.start(tracking_terms)
+        @stream.start(cache[:message], cache[:terms])
       end
 
       def track(message)
-        message[:term].split(',').map { |e| e.strip }.each do |term|
-          if tracking_terms.include?(term)
-            message.reply("Already trackedd '#{term}'.")
-          else
-            tracking_terms << term
-            message.reply("Tracked '#{term}'.")
-          end
+        cache[:message] = message.original.except(:robot)
+
+        message[:term].split(',').each do |term|
+          words = term.strip.split(/\s+/).sort
+          cache[:terms].push(words).uniq!
         end
 
         begin
-          @stream.restart(tracking_terms)
+          @stream.restart(cache[:message], cache[:terms])
+          message.reply("Done.")
         rescue Twitter::Error::Forbidden
           message.reply("Unable to verify your credentials.")
         end
       end
 
       def untrack(message)
-        message[:term].split(',').map { |e| e.strip }.each do |term|
-          if tracking_terms.include?(term)
-            tracking_terms.delete(term)
-            message.reply("Untracked '#{term}'.")
-          else
-            message.reply("'#{term}' has not tracked.")
-          end
+        cache[:message] = message.original.except(:robot)
+
+        message[:term].split(',').each do |term|
+          words = term.strip.split(/\s+/).sort
+          cache[:terms].delete(words)
         end
 
         begin
-          @stream.restart(tracking_terms)
+          @stream.restart(cache[:message], cache[:terms])
+          message.reply("Done.")
         rescue Twitter::Error::Forbidden
           message.reply("Unable to verify your credentials.")
         end
       end
 
       def tracking(message)
-        if tracking_terms.empty?
-          message.reply("tracking no terms.")
+        if cache[:terms].empty?
+          message.reply("Tracking no terms.")
         else
-          tracking_terms.each { |term| message.reply(term, code:true) }
+          response = cache[:terms].map { |words| message.reply(words.join(' ') }.join("\n")
+          message.reply(response, code:true)
         end
       end
 
-      def tracking_terms
-        robot.brain.data[Ruboty::TwitterTrack::NAMESPACE] ||= []
+      def cache
+        unless robot.brain.data[Ruboty::TwitterTrack::NAMESPACE]
+          status = { message: nil, terms: [] }
+          robot.brain.data[Ruboty::TwitterTrack::NAMESPACE] = status
+        end
+
+        robot.brain.data[Ruboty::TwitterTrack::NAMESPACE]
       end
     end
   end

data/lib/ruboty/twitter_track/stream.rb

@@ -34,20 +34,22 @@ module Ruboty
         end
       end
 
-      def start(terms)
+      def start(message, terms)
         return if terms.empty?
 
         Thread.start do
-          @client.track(*terms) do |object|
-            message = Message.new(robot: @robot)
-            message.reply(u(object))
+          query = terms.map { |w| w.join(' ') }
+          @client.track(*query) do |object|
+            Message.new(message.merge(robot: @robot)).reply(u(object))
           end
         end
       end
 
-      def restart(terms)
-        return start(terms) unless @client.stream
-        @client.stream.update(params: {:track => terms.join(',')})
+      def restart(message, terms)
+        return start(message, terms) unless @client.stream
+
+        query = terms.map { |w| w.join(' ') }
+        @client.stream.update(params: {:track => query.join(',')})
       end
 
       private

data/lib/ruboty/twitter_track/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module TwitterTrack
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-twitter_track
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty