ruboty-weather 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860623a0d508c8584f07762c8b8e55c743348406
-  data.tar.gz: 273528a4c69fc97e39ba9dee023e0183d508fd2f
+  metadata.gz: ecbe7a1112b83e2d5aeda9649e62793f8f408d69
+  data.tar.gz: 946ee44d3ed0e50daf5eb894da8c2eea3666714d
 SHA512:
-  metadata.gz: fce8ab36a1a2ad7548453e55b0726a6e247edcd2e07392032503695c48643155dd953f1946e7e1d8f7d07fa0ac85a66286fcda8eb722bf8e686d0b1d2cbe6a1c
-  data.tar.gz: 3c3e0c6901bbbf1af01f93538f958e185cb64c24e3f37b3b7b45d7f77d99bfc272b2409ddf41ff6ba675926cb1b78d7afa83644ab9d5b6e746b1b603649692a0
+  metadata.gz: d2cf18cd5ff5ec4d043b6c43dbcca1ac6da746c65273af1f4e24f73367f0cc28e0d5d703a0a7a59bd0287682ae8b6f377dfb9cb602c45defba2acc9ad0d63be7
+  data.tar.gz: 397a1215d30f887aec4a58eca6f2c50f3dbe03abeead556307175c11d34d4844d94fecf8635bfe30819a20078e61a1044679e26df06eaadb37a49dd53133dbc7

data/lib/ruboty/handlers/weather.rb

@@ -1,7 +1,7 @@
 module Ruboty
   module Handlers
     class Weather < Base
-      on /weather( me)?/, name: "weather", description: "Fetch weather info from livedoor API"
+      on /weather/, name: "weather", description: "Fetch weather info from livedoor API"
 
       def weather(message)
         message.reply(fetch)

data/lib/ruboty/weather/client.rb

@@ -5,12 +5,6 @@ module Ruboty
   module Weather
     class Client
       LIVEDOOR_WEATHER_API_URL = 'http://weather.livedoor.com/forecast/webservice/json/v1'
-      #TODO parse this http://weather.livedoor.com/forecast/rss/primary_area.xml
-      CITIES = {
-        tokyo: 130010,
-        chiba: 120010,
-        yokohama: 140010
-      }
 
       def initialize
         @client = Faraday.new do |connection|
@@ -21,7 +15,15 @@ module Ruboty
 
       def get(city_code=default_city)
         response = @client.get("#{url}?city=#{city_code}").body
-        response['forecasts'][0]['telop']
+
+        forecasts = response['forecasts']
+        today = forecasts[0]
+        tomorrow = forecasts[1]
+
+        today_forecast = "#{today['date']}: #{emojilize!(today['telop'])} (#{temperature_to_s(today['temperature'])})"
+        tomorrow_forecast = "#{tomorrow['date']}: #{emojilize!(tomorrow['telop'])} (#{temperature_to_s(tomorrow['temperature'])})"
+
+        [today_forecast, tomorrow_forecast].join("\n")
       end
 
       private
@@ -30,13 +32,34 @@ module Ruboty
         LIVEDOOR_WEATHER_API_URL
       end
 
-      def cities
-        CITIES
-      end
-
       def default_city
         ENV['RUBOTY_WEATHER_CITY'] || 130010 #tokyo
       end
+
+      def emojilize!(telop)
+
+        telop.gsub!(/時々/, "\u{2194}")
+        telop.gsub!(/のち/, "\u{27A1}")
+
+        emojis = {
+          "晴" => "\u{2600}",
+          "曇" => "\u{2601}",
+          "雨" => "\u{2614}",
+          "雷" => "\u{26A1}",
+          "雪" => "\u{26C4}",
+        }.each do |k, v|
+          telop.gsub!(/#{k}/, v)
+        end
+
+        telop
+      end
+
+      def temperature_to_s(temperature)
+        min = (temperature['min'] ? temperature['min']['celsius'] : '-')
+        max = (temperature['max'] ? temperature['max']['celsius'] : '-')
+
+        "#{min}/#{max}"
+      end
     end
   end
 end

data/lib/ruboty/weather/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Weather
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-weather
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty