ruboty-twitter_track 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bcad5f258d6f12adc8bf514bb42b091e9110c73
-  data.tar.gz: feeac45bcda8da737ecd41ba628e274a10b57645
+  metadata.gz: 54491438c61fbc0c1e79e1d389c516515f56e432
+  data.tar.gz: 3c56a186e20caaa7c40ae13111c1bc83ec2f429f
 SHA512:
-  metadata.gz: 39c955ee2d2b30aae1ccdf8f853b3f37024bd67e5ff82750627431af3458f3d5a4696f868a8fe5f027e6ac0c4ded17fc1b95817484ade07164f70c997ea95dfd
-  data.tar.gz: ed6ff5dbc00eaf9267c0be105ce3ade7ee99e6c54941b1198c9c5b99318dbc27e4674a064febcff3272743024f3207b157753a3c6b1185c533028c0e8563b008
+  metadata.gz: 3d9ccb877689b0f62efc1a6147c945325fcbc0568e594ca361357a2bb17911c9633b7a220108cbe6fb9e19dc53a926ef9cabf1f2d864cf83b7a5f6435707647f
+  data.tar.gz: ed1375c1d5e801b5e6431537ab6c14019cf6c7ec97f4d2a53b55a1266d829b13c6b3044328b71999f1fc222989b3beaefaf5f04c1152fef925a60470f6578de9

data/README.md

@@ -1,6 +1,6 @@
 # Ruboty::TwitterTrack
 
-Ruboty handler to track certain words in the twitter stream.
+Ruboty handler to track the twitter stream with the given words.
 
 ## Installation
 
@@ -18,17 +18,17 @@ And then execute:
 
 ```
 > @ruboty twitter track by rubygems
-@ruboty> Tracked '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 twitter tracking
-@ruboty> 'rubygems'
+@ruboty> '100: rubygems'
 
-> @ruboty twitter untrack by rubygems
-@ruboty> Untracked 'rubygems'
+> @ruboty twitter untrack 100
+@ruboty> Untracked '100: rubygems'.
 ```
 
 ## Env

data/lib/ruboty/handlers/twitter_track.rb

@@ -3,11 +3,11 @@ module Ruboty
     class TwitterTrack < Base
       on(/twitter track by (?<term>.+)\z/,
         name: 'track',
-        description: 'Track the twitter stream by the certain term.')
+        description: 'Track the twitter stream with the term.')
 
-      on(/twitter untrack by (?<term>.+)\z/,
+      on(/twitter untrack (?<id>\d+)\z/,
         name: 'untrack',
-        description: 'Untrack the twitter stream by the certain term.')
+        description: 'Untrack the twitter stream with the term.')
 
       on(/twitter tracking\z/,
         name: 'tracking',
@@ -24,13 +24,14 @@ module Ruboty
         cache[:message] = message.original.except(:robot)
 
         message[:term].split(',').each do |term|
-          words = term.strip.split(/\s+/).sort
-          cache[:terms].push(words).uniq!
+          key   = generate_id
+          words = term.strip.split(/\s+/)
+          cache[:terms][key] = words
         end
 
         begin
-          @stream.restart(cache[:message], cache[:terms])
-          message.reply("Done.")
+          @stream.restart(cache[:message], cache[:terms].values)
+          message.reply("Tracked '#{message[:term]}'.")
         rescue Twitter::Error::Forbidden
           message.reply("Unable to verify your credentials.")
         end
@@ -39,14 +40,16 @@ module Ruboty
       def untrack(message)
         cache[:message] = message.original.except(:robot)
 
-        message[:term].split(',').each do |term|
-          words = term.strip.split(/\s+/).sort
-          cache[:terms].delete(words)
+        key   = message[:id]
+        words = cache[:terms].delete(key)
+        unless words
+          message.reply("'#{key}' not found.")
+          return
         end
 
         begin
-          @stream.restart(cache[:message], cache[:terms])
-          message.reply("Done.")
+          @stream.restart(cache[:message], cache[:terms].values)
+          message.reply("Untracked '#{key}: #{words.join(' ')}'.")
         rescue Twitter::Error::Forbidden
           message.reply("Unable to verify your credentials.")
         end
@@ -56,19 +59,25 @@ module Ruboty
         if cache[:terms].empty?
           message.reply("Tracking no terms.")
         else
-          response = cache[:terms].map { |words| message.reply(words.join(' ') }.join("\n")
-          message.reply(response, code:true)
+          response = cache[:terms].map { |key, words| "#{key}: #{words.join(' ')}" }
+          message.reply(response.join("\n"), code:true)
         end
       end
 
       def cache
         unless robot.brain.data[Ruboty::TwitterTrack::NAMESPACE]
-          status = { message: nil, terms: [] }
+          status = { message: nil, terms: {} }
           robot.brain.data[Ruboty::TwitterTrack::NAMESPACE] = status
         end
 
         robot.brain.data[Ruboty::TwitterTrack::NAMESPACE]
       end
+
+      private
+      def generate_id
+        id = (100..999).to_a.sample
+        cache[:terms][id].nil? ? id : generate_id
+      end
     end
   end
 end

data/lib/ruboty/twitter_track/version.rb

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

data/ruboty-twitter_track.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.name          = 'ruboty-twitter_track'
   spec.version       = Ruboty::TwitterTrack::VERSION
   spec.authors       = ['haccht']
-  spec.email         = ['haccht00@gmail.com']
-  spec.summary       = "Ruboty handler to track tweets in the twitter stream."
+  spec.email         = ['haccht@users.noreply.github.com']
+  spec.summary       = "Ruboty handler to track the twitter stream with the given words."
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/haccht/ruboty-twitter_track'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-twitter_track
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -66,9 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruboty handler to track tweets in the twitter stream.
+description: Ruboty handler to track the twitter stream with the given words.
 email:
-- haccht00@gmail.com
+- haccht@users.noreply.github.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -106,5 +106,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Ruboty handler to track tweets in the twitter stream.
+summary: Ruboty handler to track the twitter stream with the given words.
 test_files: []