ruboty-japan_weather 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08d3a9f568f26bdc439d4503cc368a7088bbdb7d
-  data.tar.gz: d26fbd684ed61efd6c000607e40e9c8011487038
+  metadata.gz: 2fb7d8c1459f77951f4d0aabaf2bc9ff7f43248c
+  data.tar.gz: 2613d0261cd0d6a75c5b143b61a762b8b15cee74
 SHA512:
-  metadata.gz: 99c6d8c441b31528e38ca9ddf63796071ea9a5bd618860f34a74520245d3777c23c770e8a0a7ce8c8b6eb9462282d15a1701519b7c28491e7625496cf102b175
-  data.tar.gz: cf5ca954a2c967fec8539c73f5966cd15166015252d600f0b69851b83bbb854de240405e947deaab19e78b54b7453e3589075dd17ff93b935c240cade732a03a
+  metadata.gz: 0827bdf0b025cdc742f28e73b26337e5c329cf72b04219eef97229b1610e5e866ca8cad8cbf3815c8e15a93b43ea911e6c7ad337c3ffc1af7e2cd49c1a4720a7
+  data.tar.gz: b5618a56a04747d523b585b3229832b3501eba5aada0e304ce6b8ec1ff964fb99c641883d17bca3891e6430af09e083f512ab27b4c843b4a61232d1c3d7d7160

data/README.md

@@ -1,16 +1,16 @@
-# Ellen::JapanWeather
-An action to tell weather forecast for [Ellen](https://github.com/r7kamura/ellen/) framework.
+# Ruboty::JapanWeather
+An action to tell weather forecast for [Ruboty](https://github.com/r7kamura/ruboty/) framework.
 
 ## Installation
 ```ruby
 # Gemfile
-gem 'ellen-japan_weather'
+gem 'ruboty-japan_weather'
 ```
 
 ## Usage
 ```
-> @ellen 明日の秋葉原の天気教えて
+> @ruboty 明日の秋葉原の天気教えて
 東京都 千代田区の明日の天気は曇時々雨 最高気温25度 最低気温17度 降水確率は60% です。
-> @ellen きょうのテヘランの天気は？
+> @ruboty きょうのテヘランの天気は？
 イラン テヘランの現在の天気は(17時00分 現在)晴時々曇 です。
 ```

data/lib/ruboty/actions/japan_weather.rb

@@ -8,14 +8,47 @@ module Ruboty
       private
 
       def forecast
-        look_for(message.body).to_s
+        if captures = cmd?(message.match_data.captures)
+          look_by_cmd(*captures).to_s
+        elsif body = jp?(message.match_data.captures)
+          look_by_jp(body).to_s
+        else
+          message.reply('Unmatched...')
+        end
       end
 
-      def look_for(body)
+      def look_by_cmd(place, day)
+        WeatherJp.get(place, convert(day))
+      rescue WeatherJp::WeatherJpError => e
+        "Error: #{e}"
+      end
+
+      def look_by_jp(body)
         WeatherJp.parse(body)
       rescue WeatherJp::WeatherJpError => e
         "Error: #{e}"
       end
+
+      def cmd?(captures)
+        captures[1..2] if captures[1] && captures[2]
+      end
+
+      def jp?(captures)
+        captures.first if captures.first
+      end
+
+      def convert(day)
+        case day
+        when /今日|きょう|今|いま/u
+          :today
+        when /明日|あした/u
+          :tomorrow
+        when /明後日|あさって/u
+          :day_after_tomorrow
+        else
+          day
+        end
+      end
     end
   end
 end

data/lib/ruboty/handlers/japan_weather.rb

@@ -1,7 +1,11 @@
 module Ruboty
   module Handlers
     class JapanWeather < Base
-      on /.*の天気/, name: "japan_weather", description: "Reply weather forecast"
+      on(
+        /((?<jp>.*の天気.*)|tenki\s+(?<place>.*)\s+(?<day>.*))/,
+        name: "japan_weather",
+        description: "Reply weather forecast"
+      )
 
       def japan_weather(message)
         Ruboty::Actions::JapanWeather.new(message).call

data/lib/ruboty/japan_weather/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module JapanWeather
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/ruboty-japan_weather.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "weather_jp", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-japan_weather
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Taiki ONO
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An action to tell weather forecast for ruboty bot framework.
 email:
 - taiks.4559@gmail.com