weather-report 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa16ff0ec30a13f5f0a926faf7524f184a383721
-  data.tar.gz: a0180b74e86e87db051b2d754a8a46c379ac703f
+  metadata.gz: a54cde6c43574f517d352bb0108e4df59e489502
+  data.tar.gz: 9abe9627e9648796999cc617f3a8e1c01562e571
 SHA512:
-  metadata.gz: 64cd6ca1ccbd073e13ce7794a0a7094ac18cf6382d0d048161589dbf6e905beeb44ca30279545e2e151a7af929bbb6323e7aba8d449a085eedac0a4caec702d7
-  data.tar.gz: 5da091b6efa977c7879f9ad38c1409ecc91979c349a81d9c3394ff9d873b4bcc7cd4e883ab661e343e138f318ad5aa6bc5254558bdadb0617965686a5c6ff797
+  metadata.gz: 04357dbeee595b0778420964c5d3103fcb07229489bbb50fa06386e1c12224820f7ad4efd9cf8b8ce5205539a9090a6fe68bb302f50da954a3e2eae474e14ff6
+  data.tar.gz: 35e2f06ec179721583ef66aab3f70e626e3b0947c7de6f73ebc5c1f4d60b128e3159baf591d0bbf1940ad7f82d3f94a07b71b9b4141b022bbcadfd7fc639487f

data/bin/weather-report

@@ -14,7 +14,7 @@ opt_parser = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Common options:"
 
-  opts.on_tail("-list", "Show city list") do
+  opts.on_tail("-l", "--list", "Show city list") do
     WeatherReport.cities.each do |city|
       puts city
     end
@@ -41,9 +41,13 @@ city = opt_parser.parse(ARGV)
 weather = WeatherReport::Weather.new(WeatherReport::Weather.request_cityid(*city))
 
 [weather.today, weather.tomorrow, weather.day_after_tomorrow].each do |day|
-  print "#{day.date.year}年#{day.date.month}月#{day.date.day}日の天気 #{day.telop}"
-  print " 最低気温#{day.temperature_min}度" if day.temperature_min
-  print " 最高気温#{day.temperature_max}度" if day.temperature_max
-  puts
+  begin
+    print "#{day.date.year}年#{day.date.month}月#{day.date.day}日の天気 #{day.telop}"
+    print " 最低気温#{day.temperature_min}度" if day.temperature_min
+    print " 最高気温#{day.temperature_max}度" if day.temperature_max
+    puts
+  rescue NoMethodError
+    next
+  end
 end
 puts weather.link

data/lib/weather-report.rb

@@ -14,4 +14,13 @@ module WeatherReport
   def self.get(city_name)
     Weather.new(Weather.request_cityid(city_name))
   end
+
+  # @return [Array] get city list
+  def self.cities
+    proxy = Weather.parse_proxy(ENV["http_proxy"])
+    doc = Nokogiri::XML(open("http://weather.livedoor.com/forecast/rss/primary_area.xml", :proxy_http_basic_authentication => [proxy.server, proxy.user, proxy.pass]))
+    doc.xpath("//city").map{|i|
+      i["title"]
+    }
+  end
 end

data/lib/weather-report/day.rb

@@ -64,6 +64,7 @@ module WeatherReport
 
     def forecast(forecasts, dateLabel)
       forecasts["forecasts"].each {|elem| return elem if elem["dateLabel"] == dateLabel}
+      return nil
     end
   end
 end

data/lib/weather-report/version.rb

@@ -1,3 +1,3 @@
 module WeatherReport
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/weather-report/weather.rb

@@ -1,14 +1,6 @@
 # -*- coding: utf-8 -*-
 
 module WeatherReport
-  def self.cities
-    proxy = Weather.parse_proxy(ENV["http_proxy"])
-    doc = Nokogiri::XML(open("http://weather.livedoor.com/forecast/rss/primary_area.xml", :proxy_http_basic_authentication => [proxy.server, proxy.user, proxy.pass]))
-    doc.xpath("//city").map{|i|
-      i["title"]
-    }
-  end
-
   class Weather
     attr_reader :today, :tomorrow, :day_after_tomorrow
 
@@ -18,13 +10,12 @@ module WeatherReport
 
     # @return [String] the id of given city
     def self.request_cityid(city_name)
+      raise ArgumentError, "City name must be String." unless city_name.kind_of?(String)
       proxy = Weather.parse_proxy(ENV["http_proxy"])
       doc = Nokogiri::XML(open("http://weather.livedoor.com/forecast/rss/primary_area.xml", :proxy_http_basic_authentication => [proxy.server, proxy.user, proxy.pass]))
       doc.search("//city[@title='#{city_name}']").attr("id").value
     rescue NoMethodError
       raise WeatherReportError, "It seems like city #{city_name} does not exist.\nPlease look at http://weather.livedoor.com/forecast/rss/primary_area.xml for city list."
-    rescue => e
-      raise WeatherReportError
     end
 
     def self.parse_proxy(proxy)

data/test/test_day.rb

@@ -51,4 +51,10 @@ class TestDay < MiniTest::Unit::TestCase
   def test_to_h
     assert_respond_to @day, :to_h
   end
+
+  def test_send
+    forecasts = {"forecasts" => [{"dateLabel" => "明日"}]}
+    refute_nil @day.send(:forecast, forecasts, "明日")
+    assert_nil @day.send(:forecast, forecasts, "明後日")
+  end
 end

data/test/test_weather.rb

@@ -47,7 +47,7 @@ class TestWeather < MiniTest::Unit::TestCase
     assert_respond_to Weather, :request_cityid
     assert_equal "130010", Weather.request_cityid("東京")
     assert_equal "140010", Weather.request_cityid("横浜")
-    assert_raises(WeatherReportError) do
+    assert_raises(ArgumentError) do
       Weather.request_cityid(nil)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weather-report
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -163,3 +163,4 @@ test_files:
 - test/test_helper.rb
 - test/test_weather-report.rb
 - test/test_weather.rb
+has_rdoc: