ruboty-haiku_wo_yome 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 598742607727cce56673f535ef56da08dc372e8c
-  data.tar.gz: e4c17a6a028cd7c1e2c2504fcf57b692b722654c
+  metadata.gz: bfd5cdc5131804509972eeca5985b87d139c2a16
+  data.tar.gz: c121133f8f556e5e1ec55f7127f079f1fbc7a786
 SHA512:
-  metadata.gz: 1a70fe864ad89dbfbac1a0b40db4feb2cc66170dea0124ebb407ef9712200a728c34e926976925fdbd7c98b7d198912bd9e1d77d8d952800c6b4705a7c59c7ce
-  data.tar.gz: f04240359d3da7f1cc63a5ff7af9023f9568bec19168c67bc46e4efc5bf83ca29eedfc9610f191beadface79018fe86471b59ca4fee37648bf07c6130af8b878
+  metadata.gz: 5f57c3c69ed8c3a27d89fb6927b0b96acb65e1ed7a48ff204123b5f6a370e9be42e91c461a9a578a2c004a6a9c7bdd8ac7125de7d068e8f117e653fbe942624a
+  data.tar.gz: 258af8ee6e11d39a75105be8d3e0b792f8838d919835cfe62ea3977706dca31f9e0e130d95f70422a6aace8a697d02a99017c38282199c240bb63de84c0f9b0e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.0
+
+Implements Tanka
+
 # 0.2.0
 
 Change required environment variable name

data/lib/ruboty/haiku_wo_yome/actions/haiku.rb

@@ -2,8 +2,14 @@ module Ruboty
   module HaikuWoYome
     module Actions
       class Haiku < Ruboty::Actions::Base
-        def call
-          haiku = haiku_list.sample || '「アイエエエエ！？」'
+        def call(options = {type: :haiku})
+          list = case options[:type]
+                 when :tanka
+                   tanka_list
+                 else
+                   haiku_list
+                 end
+          haiku = list.sample || '「アイエエエエ！？」'
           message.reply(haiku)
         end
 
@@ -14,13 +20,34 @@ module Ruboty
         end
 
         def haiku_list
-          haiku_nodes = user_public_messages_text.inject([]) do |acc, message|
-            haiku = haiku_reviewer.search(message)
-            acc + haiku
+          user_public_messages_text.inject([]) do |acc, message|
+            haiku_reviewer.search(message).each do |node|
+              acc << node.phrases.join
+            end
+            acc
           end
+        end
+
+        def tanka_list
+          kaminoku_nodes = user_public_messages_text.inject([]) do |acc, message|
+            haiku_reviewer.search(message).each do |node|
+              acc << node.phrases.join
+            end
+            acc
+          end
+
+          reset!
+          shimonoku_nodes = user_public_messages_text.inject([]) do |acc, message|
+            haiku_reviewer(rule: [7, 7]).search(message).each do |node|
+              acc << node.phrases.join
+            end
+            acc
+          end
+
+          return [] if shimonoku_nodes.empty?
 
-          haiku_nodes.map do |haiku_node|
-            haiku_node.phrases.join
+          kaminoku_nodes.map do |kaminoku|
+            "#{kaminoku}  #{shimonoku_nodes.sample}"
           end
         end
 
@@ -41,8 +68,13 @@ module Ruboty
           name.start_with?('@') ? name : "@#{name}"
         end
 
-        def haiku_reviewer
-          @reviewer ||= Ikku::Reviewer.new
+        def haiku_reviewer(options = {})
+          rule = options[:rule] || [5, 7, 5]
+          @reviewer ||= Ikku::Reviewer.new(rule: rule)
+        end
+
+        def reset!
+          @reviewer = nil
         end
       end
     end

data/lib/ruboty/haiku_wo_yome/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module HaikuWoYome
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/ruboty/handlers/haiku.rb

@@ -6,10 +6,15 @@ module Ruboty
       env 'SLACK_TOKEN_FOR_SEARCH', "Slack token for search api (important: bot user can't call search api! require human api key"
 
       on('(?<user_name>.+) ハイクを詠め', name: :haiku_wo_yome, description: 'カイシャクしてやる', all: true)
+      on('(?<user_name>.+) タンカを詠め', name: :tanka_wo_yome, description: 'カイシャクしてやる', all: true)
 
       def haiku_wo_yome(message)
         Ruboty::HaikuWoYome::Actions::Haiku.new(message).call
       end
+
+      def tanka_wo_yome(message)
+        Ruboty::HaikuWoYome::Actions::Haiku.new(message).call(type: :tanka)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-haiku_wo_yome
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kinoshita.Yasuhiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty