weatherscout 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b0d63da54f05eea838d5a10bed697dcd1d735eb
-  data.tar.gz: db40952ef17dee2abf0ebe33df5ec1a0fd8d3dc2
+  metadata.gz: 2af3cc5c390cc4e5a9817b474ab059230a767041
+  data.tar.gz: 99b4a96130932e19941e0541eddd1c93d80a7413
 SHA512:
-  metadata.gz: 4587da3cc3e1945bfb4285c792f5032d07c11925112e4de641ba7aa08761e5ed0a3b7e7af6a99bd78e19bd23a0d5aa7e2c7ba909f25f698e633b1233ffd9c793
-  data.tar.gz: 86e041ebf87ee31d42b40714a3386911661064fa0550cd798d46e8a4ee9cb1da13c236d4eb4c7ae74e358142bba4bb3c421bf6b2abb5cd7f3ff62049b003f97e
+  metadata.gz: 0c375ce7327f53c051819d3f02092527cbbfad7ea5977ac7f14d43e5ba09eb83d689cde40c1374028ab499d755ace21c51f9c4b4ccbe1be8755f2e72cf13e394
+  data.tar.gz: c65150ec72d3c362dc693cbcfd28486fb57a095003b0fb7484c563f358339bd56b14f409eeca9664da0525a1e928faf5f52b4d22e89cf3be18870006dd46a837

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 gem 'oga'
 gem 'minitest'
 gem 'thor'
+gem 'vcr'
+gem 'webmock'
 
 group :test do
   gem 'rake'

data/README.md

@@ -15,34 +15,144 @@ $ gem install weatherscout
 To see the weather today
 ```sh
 $ weatherscout today 新竹
-新竹（01/01）天氣狀況：
-白天氣象：多雲，氣溫 15 ~ 16 度
-晚上氣象：多雲，氣溫 15 ~ 23 度
-降雨機率：0 %
+新竹（HsinchuCity）的天氣預測：
+今晚至明晨 01/21 00:00~01/21 06:00
+  -氣溫：15 ~ 16 度
+  -降雨機率：70 %
+  -天氣狀況：多雲短暫雨
+明日白天 01/21 06:00~01/21 18:00
+  -氣溫：15 ~ 18 度
+  -降雨機率：60 %
+  -天氣狀況：多雲短暫雨
+明日晚上 01/21 18:00~01/22 06:00
+  -氣溫：15 ~ 17 度
+  -降雨機率：70 %
+  -天氣狀況：多雲時陰陣雨
 溫馨叮嚀：
-清晨東北季風影響，早晚氣溫低
-今(31)日，新竹市地區仍受東北季風影響，為多雲的天氣，空曠地區易有８至９級強陣風，香山區白天溫度在15-19度左右；外出請注意保暖及注意安全。
-明(1)日，新竹市地區清晨東北季風影響，早晚氣溫低，為多雲的天氣，預報溫度在16到18度之間；外出請注意保暖及注意安全。
-明(1)日，新竹沿海地區風力7至8陣風10級下午轉5至6陣風8級，作業船隻及海邊活動仍請注意安全。
+東北季風及華南雲雨區影響，多雲短暫雨
+昨 (20)日，持續受大陸冷氣團影響，氣溫較低，水氣增加，為多雲時陰有短暫雨的天氣，清晨起，局部地區已有短暫陣雨發生。
+明 (21)日，受東北季風及華南雲雨區影響，氣溫略回升，為多雲短暫雨的天氣。預估氣溫16-18度，空曠地區有6至8級強陣風；清晨部分地區有短暫陣雨，外出請注意保暖和強風及攜帶雨具備用。
 ```
 
-The weather in the future week and other feature will be coming soon! :grinning:
+To see the weather in the future week
+```sh
+➜  weather-scout-scraper git:(weekly-weather) ✗ ./bin/weatherscout week 新竹
+新竹（HsinchuCity）的未來一週預測：
+01/23星期六
+  -白天溫度：8 ~ 12 度
+  -白天天氣狀況：陰時多雲陣雨
+  -晚上溫度：6 ~ 8 度
+  -晚上天氣狀況：陰時多雲短暫雨
+01/24星期日
+  -白天溫度：5 ~ 7 度
+  -白天天氣狀況：多雲短暫雨
+  -晚上溫度：4 ~ 5 度
+  -晚上天氣狀況：多雲
+01/25星期一
+  -白天溫度：4 ~ 10 度
+  -白天天氣狀況：多雲時晴
+  -晚上溫度：8 ~ 9 度
+  -晚上天氣狀況：晴時多雲
+01/26星期二
+  -白天溫度：8 ~ 18 度
+  -白天天氣狀況：多雲時晴
+  -晚上溫度：13 ~ 15 度
+  -晚上天氣狀況：晴時多雲
+01/27星期三
+  -白天溫度：12 ~ 19 度
+  -白天天氣狀況：多雲時陰
+  -晚上溫度：15 ~ 16 度
+  -晚上天氣狀況：陰時多雲短暫陣雨
+01/28星期四
+  -白天溫度：15 ~ 18 度
+  -白天天氣狀況：多雲時陰短暫陣雨
+  -晚上溫度：15 ~ 16 度
+  -晚上天氣狀況：陰短暫陣雨
+01/29星期五
+  -白天溫度：15 ~ 18 度
+  -白天天氣狀況：陰短暫陣雨
+  -晚上溫度：15 ~ 16 度
+  -晚上天氣狀況：陰天
+```
 
 ## Development
 Use it from your Ruby code:
+#### DailyWeather
 ````ruby
 require 'weatherscout'
 CITY = "新竹"
-weather = DailyWeatherScraper::DailyWeather.new(CITY)
+daily_weather = DailyWeatherScraper::DailyWeather.new(CITY)
+
+city = daily_weather.city
+# ""HsinchuCity""
 
-temp = weather.temperature_day
-puts "今天白天氣溫：#{temp}"
+weathers = daily_weather.weathers
+# {"今晚至明晨 01/21 00:00~01/21 06:00"=>
+#     {"temperature"=>"15 ~ 16",
+#      "rain_probability"=>"70 %",
+#      "condition"=>"多雲短暫雨"},
+#  "明日白天 01/21 06:00~01/21 18:00"=>
+#     {"temperature"=>"15 ~ 18",
+#      "rain_probability"=>"60 %",
+#      "condition"=>"多雲短暫雨"},
+#  "明日晚上 01/21 18:00~01/22 06:00"=>
+#     {"temperature"=>"15 ~ 17",
+#      "rain_probability"=>"70 %",
+#      "condition"=>"多雲時陰陣雨"}}
 
-tips = weather.tips
-puts "溫馨提示：\n#{tips}"
+tips = daily_weather.tips
+# "東北季風及華南雲雨區影響，多雲短暫雨\n昨 (20)日，持續受大陸冷氣團影響，氣溫較低，水氣增加，為多雲時陰有短暫雨的天氣，清晨起，局部地區已有短暫陣雨發生。\n明 (21)日，受東北季風及華南雲雨區影響，氣溫略回升，為多雲短暫雨的天氣。預估氣溫16-18度，空曠地區有6至8級強陣風；清晨部分地區有短暫陣雨，外出請注意保暖和強風及攜帶雨具備用。\n"
 
 ````
 
+####WeeklyWeather
+```ruby
+require 'weatherscout'
+CITY = "新竹"
+weekly_weather = WeatherScraper::WeeklyWeather.new(CITY)
+
+city = daily_weather.city
+# ""HsinchuCity""
+
+weathers = daily_weather.weathers
+# {"01/23星期六"=>{
+#     "day_temperature"=>"8 ~ 12",
+#     "day_condition"=>"陰時多雲陣雨",
+#     "night_temperature"=>"6 ~ 8",
+#     "night_condition"=>"陰時多雲短暫雨"},
+#  "01/24星期日"=>{
+#      "day_temperature"=>"5 ~ 7",
+#      "day_condition"=>"多雲短暫雨",
+#      "night_temperature"=>"4 ~ 5",
+#      "night_condition"=>"多雲"},
+#  "01/25星期一"=>{
+#      "day_temperature"=>"4 ~ 10",
+#      "day_condition"=>"多雲時晴",
+#      "night_temperature"=>"8 ~ 9",
+#      "night_condition"=>"晴時多雲"},
+#  "01/26星期二"=>{
+#      "day_temperature"=>"8 ~ 18",
+#      "day_condition"=>"多雲時晴",
+#      "night_temperature"=>"13 ~ 15",
+#      "night_condition"=>"晴時多雲"},
+#  "01/27星期三"=>{
+#      "day_temperature"=>"12 ~ 19",
+#      "day_condition"=>"多雲時陰",
+#      "night_temperature"=>"15 ~ 16",
+#      "night_condition"=>"陰時多雲短暫陣雨"},
+#  "01/28星期四"=>{
+#      "day_temperature"=>"15 ~ 18",
+#      "day_condition"=>"多雲時陰短暫陣雨",
+#      "night_temperature"=>"15 ~ 16",
+#      "night_condition"=>"陰短暫陣雨"},
+#  "01/29星期五"=>{
+#      "day_temperature"=>"15 ~ 18",
+#      "day_condition"=>"陰短暫陣雨",
+#      "night_temperature"=>"15 ~ 16",
+#      "night_condition"=>"陰天"}}
+
+```
+
 ## Test
 Using [rake](http://docs.seattlerb.org/rake/) to run tests. If you don't have rake using `gem install rake` to install it.
 

data/bin/weatherscout

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 require 'thor'
 require 'weatherscout' # for production
-# require './lib/weatherdesc/daily_weather.rb' # for cmd line testing purposes
+# require './lib/weathers/weather_scraper/daily_weather.rb' # for cmd line testing purposes
+# require './lib/weathers/weather_scraper/weekly_weather.rb' # for cmd line testing purposes
+
 
 class WeatherCLI < Thor
   desc 'today CITY', 'see the weather of the city today'
   def today(city)
-    weather = DailyWeatherScraper::DailyWeather.new(city)
+    weather = WeatherScraper::DailyWeather.new(city)
     city_eng = weather.city
     weathers = weather.weathers
     tips = weather.tips
@@ -21,6 +23,26 @@ class WeatherCLI < Thor
     puts "溫馨叮嚀："
     puts "#{tips}"
   end
+
+  desc 'week CITY', 'see the weather of the city this week'
+  def week(city)
+    weather = WeatherScraper::WeeklyWeather.new(city)
+    city_eng = weather.city
+    weathers = weather.weathers
+
+    day_temp = weathers.values.map {|e| e['day_temperature']}
+    day_cond = weathers.values.map {|e| e['day_condition']}
+    night_temp = weathers.values.map {|e| e['night_temperature']}
+    night_cond = weathers.values.map {|e| e['night_condition']}
+    puts "#{city}（#{city_eng}）的未來一週預測："
+    weathers.keys.each_index do |i|
+      puts "#{weathers.keys[i]}"
+      puts "  -白天溫度：#{day_temp[i]} 度"
+      puts "  -白天天氣狀況：#{day_cond[i]}"
+      puts "  -晚上溫度：#{night_temp[i]} 度"
+      puts "  -晚上天氣狀況：#{night_cond[i]}"
+    end
+  end
 end
 
 WeatherCLI.start(ARGV)

data/lib/weathers/version.rb

@@ -0,0 +1,5 @@
+# Versioning
+module WeatherDesc
+  VERSION = '0.3.1'
+  DATE = '2016-01-23'
+end

data/lib/weathers/weather_scraper.rb

@@ -0,0 +1,6 @@
+require_relative './weather_scraper/weekly_weather.rb'
+require_relative './weather_scraper/daily_weather.rb'
+require_relative './weather_scraper/name_mapping.rb'
+
+module WeatherScraper
+end

data/lib/weathers/weather_scraper/daily_weather.rb

@@ -0,0 +1,69 @@
+require 'oga'
+require 'open-uri'
+require_relative 'name_mapping'
+
+module WeatherScraper
+  # parse daily weather description from cwb website
+  class DailyWeather
+    include NameMapping
+    CWB_URL = "http://www.cwb.gov.tw"
+    CITY_WEATHER_URL = "#{CWB_URL}/V7/forecast/taiwan/"
+
+    def initialize(city)
+      @city = city_mapping(city).delete("_")
+      parse_html(city_mapping(city))
+    end
+
+    def city
+      @city
+    end
+
+    def weathers
+      @weathers ||= parse_weathers
+    end
+
+    def tips
+      @tips ||= parse_tips
+    end
+
+    private
+
+    def parse_html(city)
+      url = "#{CITY_WEATHER_URL}/#{city}.htm"
+      @document = Oga.parse_html(open(url))
+    end
+
+    def parse_weathers
+      data = @document.xpath("//table[@class='FcstBoxTable01']")
+      data[2].children[3].children.map do |weathers|
+        timestamp= weathers.children[1].children.text.force_encoding('UTF-8')
+        temperature = weathers.children[3].children.text
+        rain_probability = weathers.children[9].children.text
+        condition = weathers.children[5].children[1].attributes[1].value.force_encoding('UTF-8')
+        [timestamp,
+         {"temperature" => temperature,
+          "rain_probability" => rain_probability,
+          "condition" => condition}]
+      end.to_h
+    end
+
+    def parse_tips
+      data = @document.xpath("//div[@id='box8']")
+      tips_api = data[0].children[13].children[0].text.split("'")[1]
+      tips_url = "#{CWB_URL}/#{tips_api}"
+      tips_doc = Oga.parse_html(open(tips_url))
+      result = ""
+      tips_doc.children.each do |element|
+        if element.text.empty?
+          result << "\n"
+        elsif element.text.split(":")[0].force_encoding('UTF-8') == "更新時間"
+          break
+        else
+          result << element.text
+        end
+      end
+      result = result.gsub("\n\n","\n")
+      result.force_encoding('UTF-8')
+    end
+  end
+end

data/lib/{weatherdesc/daily_weather.rb → weathers/weather_scraper/name_mapping.rb}

@@ -1,70 +1,7 @@
-require 'oga'
-require 'open-uri'
-
-module DailyWeatherScraper
-  # parse course description from sharecourse web
-  class DailyWeather
-    CWB_URL = "http://www.cwb.gov.tw"
-    CITY_WEATHER_URL = "#{CWB_URL}/V7/forecast/taiwan/"
-
-    def initialize(city)
-      @city = name_mapping(city).delete("_")
-      parse_html(name_mapping(city))
-    end
-
-    def city
-      @city
-    end
-
-    def weathers
-      @weathers ||= parse_weathers
-    end
-
-    def tips
-      @tips ||= parse_tips
-    end
-
-    private
-
-    def parse_html(city)
-      url = "#{CITY_WEATHER_URL}/#{city}.htm"
-      @document = Oga.parse_html(open(url))
-    end
-
-    def parse_weathers
-      data = @document.xpath("//table[@class='FcstBoxTable01']")
-      data[2].children[3].children.map do |weathers|
-        timestamp= weathers.children[1].children.text.force_encoding('UTF-8')
-        temperature = weathers.children[3].children.text
-        rain_probability = weathers.children[9].children.text
-        condition = weathers.children[5].children[1].attributes[1].value.force_encoding('UTF-8')
-        [timestamp,
-         {"temperature" => temperature,
-          "rain_probability" => rain_probability,
-          "condition" => condition}]
-      end.to_h
-    end
-
-    def parse_tips
-      data = @document.xpath("//div[@id='box8']")
-      tips_api = data[0].children[13].children[0].text.split("'")[1]
-      tips_url = "#{CWB_URL}/#{tips_api}"
-      tips_doc = Oga.parse_html(open(tips_url))
-      result = ""
-      tips_doc.children.each do |element|
-        if element.text.empty?
-          result << "\n"
-        elsif element.text.split(":")[0].force_encoding('UTF-8') == "更新時間"
-          break
-        else
-          result << element.text
-        end
-      end
-      result = result.gsub("\n\n","\n")
-      result.force_encoding('UTF-8')
-    end
-
-    def name_mapping(city)
+module WeatherScraper
+  # provide city name mapping
+  module NameMapping
+    def city_mapping(city)
       case city
       when "臺北", "台北", "臺北市", "台北市", "Taipei", "TaipeiCity"
         result = "Taipei_City"

data/lib/weathers/weather_scraper/weekly_weather.rb

@@ -0,0 +1,53 @@
+require 'oga'
+require 'open-uri'
+require_relative 'name_mapping'
+
+module WeatherScraper
+  # parse weekly weather description from cwb website
+  class WeeklyWeather
+    include NameMapping
+    CWB_URL = "http://www.cwb.gov.tw"
+    CITY_WEATHER_URL = "#{CWB_URL}/V7/forecast/taiwan/inc/city"
+
+    def initialize(city)
+      @city = city_mapping(city).delete("_")
+      parse_html(city_mapping(city))
+    end
+
+    def city
+      @city
+    end
+
+    def weathers
+      @weathers ||= parse_weathers
+    end
+
+    private
+
+    def parse_html(city)
+      url = "#{CITY_WEATHER_URL}/#{city}.htm"
+      @document = Oga.parse_html(open(url))
+    end
+
+    def parse_weathers
+      timestamp = @document.xpath("//th[@width='11%']")
+      timestamp = timestamp.map {|e| e.text.force_encoding('UTF-8')}
+
+      data = @document.xpath("//td")
+      temperature = data.map { |e| e.text.split("   ")[2]}
+      condition = data.map{ |e| e.children[1].attributes[1].value.force_encoding('UTF-8')}
+
+      result = []
+      timestamp.each_index do |i|
+        result << [timestamp[i],
+                    {"day_temperature" => temperature[i+7],
+                     "day_condition" => condition[i+7],
+                     "night_temperature" => temperature[i],
+                     "night_condition" => condition[i]
+                    }
+                  ]
+      end
+      result.to_h
+    end
+  end
+end

data/lib/weatherscout.rb

@@ -1 +1 @@
-require 'weatherdesc/daily_weather.rb'
+require 'weathers/weather_scraper.rb'

data/spec/dailyweather_spec.rb

@@ -1,54 +1,63 @@
+require 'vcr'
+require 'webmock'
 require 'minitest/autorun'
 require './lib/weatherscout.rb'
 
-CITY = "新竹"
-daily_weather = DailyWeatherScraper::DailyWeather.new(CITY)
+DAILY_CITY = "新竹"
 
-describe 'Daily weather desc scrap' do
+VCR.configure do |config|
+  config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  config.hook_into :webmock
+end
 
-  it 'should return city name' do
-    city = daily_weather.city
-    city.must_be_instance_of String
-  end
+VCR.use_cassette('dailytweather') do
+  daily_weather = WeatherScraper::DailyWeather.new(DAILY_CITY)
+  describe 'Daily weather desc scrap' do
 
-  it 'has the right number of period weathers' do
-    weathers = daily_weather.weathers
-    weathers.size.must_equal 3
-  end
+    it 'should return city name' do
+      city = daily_weather.city
+      city.must_be_instance_of String
+    end
 
-  it 'should return the timestamp in correct format' do
-    timestamps = daily_weather.weathers.keys
-    timestamps.each do |timestamp|
-      timestamp.must_match /\A.{4,5}\s\d\d\/\d\d\s\d\d:\d\d~\d\d\/\d\d\s\d\d:\d\d/
+    it 'has the right number of period weathers' do
+      weathers = daily_weather.weathers
+      weathers.size.must_equal 3
     end
-  end
 
-  it 'should return temperature' do
-    weathers = daily_weather.weathers.values
-    weathers.each do |weather|
-      temperature = weather["temperature"]
-      temperature.must_match /(-|\d)\d+\s~\s(-|\d)\d+/
+    it 'should return the timestamp in correct format' do
+      timestamps = daily_weather.weathers.keys
+      timestamps.each do |timestamp|
+        timestamp.must_match /\A.{4,5}\s\d\d\/\d\d\s\d\d:\d\d~\d\d\/\d\d\s\d\d:\d\d/
+      end
     end
-  end
 
-  it 'should return weather condition' do
-    weathers = daily_weather.weathers.values
-    weathers.each do |weather|
-      condition = weather["condition"]
-      condition.must_be_instance_of String
+    it 'should return temperature' do
+      weathers = daily_weather.weathers.values
+      weathers.each do |weather|
+        temperature = weather["temperature"]
+        temperature.must_match /(-|\d)\d*\s~\s(-|\d)\d*/
+      end
     end
-  end
 
-  it 'should return rain probaliity' do
-    weathers = daily_weather.weathers.values
-    weathers.each do |weather|
-      probaliity = weather["rain_probability"]
-      probaliity.must_match /\d+\s%/
+    it 'should return weather condition' do
+      weathers = daily_weather.weathers.values
+      weathers.each do |weather|
+        condition = weather["condition"]
+        condition.must_be_instance_of String
+      end
+    end
+
+    it 'should return rain probaliity' do
+      weathers = daily_weather.weathers.values
+      weathers.each do |weather|
+        probaliity = weather["rain_probability"]
+        probaliity.must_match /\d+\s%/
+      end
     end
-  end
 
-  it 'should return weather tips' do
-    tips = daily_weather.tips
-    tips.must_be_instance_of String
+    # it 'should return weather tips' do
+    #   tips = daily_weather.tips
+    #   tips.must_be_instance_of String
+    # end
   end
 end