weatherscout 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 935355d42555116fed7cd482ce7dad6ae7a8a37b
-  data.tar.gz: 6518fc9a70d79116fd45e8ef71a46093b0f14a77
+  metadata.gz: 8b0d63da54f05eea838d5a10bed697dcd1d735eb
+  data.tar.gz: db40952ef17dee2abf0ebe33df5ec1a0fd8d3dc2
 SHA512:
-  metadata.gz: e16fc9b14fc90784da1105e459d863fe60d12b26b93f3af9035d0965b6a63223228a9e9768b80f24e8a531460261653d55f138af70cabb54c36da91f313d9339
-  data.tar.gz: bbe6aa56c145f5018568c508b3029b52fc7a140212fea6bf92713005df638f20e03caa4e91c31e8ae4c229c7109e492b8f8393b3af2cb86a5c571bd1e8aa2c36
+  metadata.gz: 4587da3cc3e1945bfb4285c792f5032d07c11925112e4de641ba7aa08761e5ed0a3b7e7af6a99bd78e19bd23a0d5aa7e2c7ba909f25f698e633b1233ffd9c793
+  data.tar.gz: 86e041ebf87ee31d42b40714a3386911661064fa0550cd798d46e8a4ee9cb1da13c236d4eb4c7ae74e358142bba4bb3c421bf6b2abb5cd7f3ff62049b003f97e

data/bin/weatherscout

@@ -8,17 +8,16 @@ class WeatherCLI < Thor
   def today(city)
     weather = DailyWeatherScraper::DailyWeather.new(city)
     city_eng = weather.city
-    date = weather.date
-    temperature_day = weather.temperature_day
-    temperature_night = weather.temperature_night
-    rain_probability = weather.rain_probability
-    condition_day = weather.condition_day
-    condition_night = weather.condition_night
+    weathers = weather.weathers
     tips = weather.tips
-    puts "#{city}（#{city_eng}）在 #{date} 的天氣狀況："
-    puts "白天氣象：#{condition_day}，氣溫 #{temperature_day} 度"
-    puts "晚上氣象：#{condition_night}，氣溫 #{temperature_night} 度"
-    puts "降雨機率：#{rain_probability}"
+    puts "#{city}（#{city_eng}）的天氣預測："
+    weathers.each do |timestamp, weather|
+      attributes = weather.values
+      puts "#{timestamp}"
+      puts "  -氣溫：#{attributes[0]} 度"
+      puts "  -降雨機率：#{attributes[1]}"
+      puts "  -天氣狀況：#{attributes[2]}"
+    end
     puts "溫馨叮嚀："
     puts "#{tips}"
   end

data/lib/weatherdesc/daily_weather.rb

@@ -8,36 +8,16 @@ module DailyWeatherScraper
     CITY_WEATHER_URL = "#{CWB_URL}/V7/forecast/taiwan/"
 
     def initialize(city)
-      @city = name_mapping(city)
-      parse_html(@city)
+      @city = name_mapping(city).delete("_")
+      parse_html(name_mapping(city))
     end
 
     def city
       @city
     end
 
-    def date
-      @data ||= parse_date
-    end
-
-    def temperature_day
-      @temperature_day ||= parse_temp_day
-    end
-
-    def temperature_night
-      @temperature_night ||= parse_temp_night
-    end
-
-    def rain_probability
-      @rain_probability ||= parse_rain_prob
-    end
-
-    def condition_day
-      @condition_day ||= parse_condition_day
-    end
-
-    def condition_night
-      @condition_night ||= parse_condition_night
+    def weathers
+      @weathers ||= parse_weathers
     end
 
     def tips
@@ -51,34 +31,18 @@ module DailyWeatherScraper
       @document = Oga.parse_html(open(url))
     end
 
-    def parse_date
-      data = @document.xpath("//table[@class='FcstBoxTable01']")
-      result = data[2].children[3].children[0].children[1].children.text.split(" ")[1]
-    end
-
-    def parse_temp_day
-      data = @document.xpath("//table[@class='FcstBoxTable01']")
-      result = data[2].children[3].children[0].children[3].children.text
-    end
-
-    def parse_temp_night
-      data = @document.xpath("//table[@class='FcstBoxTable01']")
-      result = data[2].children[3].children[1].children[3].children.text
-    end
-
-    def parse_rain_prob
-      data = @document.xpath("//table[@class='FcstBoxTable01']")
-      result = data[2].children[3].children[0].children[9].children.text
-    end
-
-    def parse_condition_day
-      data = @document.xpath("//table[@class='FcstBoxTable01']")
-      result = data[2].children[3].children[0].children[5].children[1].attributes[1].value.force_encoding('UTF-8')
-    end
-
-    def parse_condition_night
+    def parse_weathers
       data = @document.xpath("//table[@class='FcstBoxTable01']")
-      result = data[2].children[3].children[1].children[5].children[1].attributes[1].value.force_encoding('UTF-8')
+      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/lib/weatherdesc/version.rb

@@ -1,5 +1,5 @@
 # Versioning
 module WeatherDesc
-  VERSION = '0.1.1'
-  DATE = '2016-01-02'
+  VERSION = '0.2.0'
+  DATE = '2016-01-21'
 end

data/spec/dailyweather_spec.rb

@@ -0,0 +1,54 @@
+require 'minitest/autorun'
+require './lib/weatherscout.rb'
+
+CITY = "新竹"
+daily_weather = DailyWeatherScraper::DailyWeather.new(CITY)
+
+describe 'Daily weather desc scrap' do
+
+  it 'should return city name' do
+    city = daily_weather.city
+    city.must_be_instance_of String
+  end
+
+  it 'has the right number of period weathers' do
+    weathers = daily_weather.weathers
+    weathers.size.must_equal 3
+  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/
+    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+/
+    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
+    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
+
+  it 'should return weather tips' do
+    tips = daily_weather.tips
+    tips.must_be_instance_of String
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weatherscout
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vicky Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -70,7 +70,7 @@ files:
 - lib/weatherdesc/daily_weather.rb
 - lib/weatherdesc/version.rb
 - lib/weatherscout.rb
-- spec/weatherdesc_spec.rb
+- spec/dailyweather_spec.rb
 - weatherscout.gemspec
 homepage: https://github.com/vicky-sunshine/weather-scout-scraper
 licenses:
@@ -97,4 +97,4 @@ signing_key:
 specification_version: 4
 summary: Tell you the weather of Taiwan
 test_files:
-- spec/weatherdesc_spec.rb
+- spec/dailyweather_spec.rb

data/spec/weatherdesc_spec.rb

@@ -1,47 +0,0 @@
-require 'minitest/autorun'
-require './lib/weatherscout.rb'
-
-CITY = "新竹"
-weather = DailyWeatherScraper::DailyWeather.new(CITY)
-
-describe 'Daily weather desc scrap' do
-  it 'should return date with the "month/day" style' do
-    city = weather.city
-    city.must_be_instance_of String
-  end
-
-  it 'should return date with the "month/day" style' do
-    date = weather.date
-    date.must_match /\d\d\/\d\d/
-  end
-
-  it 'should return temperature in daytime' do
-    temp = weather.temperature_day
-    temp.must_match /(-|\d)\d+\s~\s(-|\d)\d+/
-  end
-
-  it 'should return temperature in nighttime' do
-    temp = weather.temperature_night
-    temp.must_match /(-|\d)\d+\s~\s(-|\d)\d+/
-  end
-
-  it 'should return weather condition in daytime' do
-    con = weather.condition_day
-    con.must_be_instance_of String
-  end
-
-  it 'should return weather condition in nighttime' do
-    con = weather.condition_night
-    con.must_be_instance_of String
-  end
-
-  it 'should return rain probaliity' do
-    prob = weather.rain_probability
-    prob.must_match /\d+\s%/
-  end
-
-  it 'should return weather tips' do
-    tips = weather.tips
-    tips.must_be_instance_of String
-  end
-end