weather-report 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760746840f014f0120e729148e4f61516212875f
-  data.tar.gz: 1ceb9967c055c7b6a89fa90de5168eeef1f0ab91
+  metadata.gz: b9a69683ca8b735ec9e07e7d122d9fd211c0d6f4
+  data.tar.gz: 48b6373985b7cbd42f832a039ac8433c1b3765c7
 SHA512:
-  metadata.gz: 0ae3d76979a77a7519ca8153b2a2706af9a7e65686bf1bb282801f1c4f6de8c9fbea9483f5fca14456990afa6f704166a9415fc3c900104fe4012c7a66e10d31
-  data.tar.gz: 52938d64da714d90db1e8dcf7aa52f360bff6e24c3446cf2703466cc7dac0a5f255e778e86c9cbe990942aed7f9a17a0703dbfa99d98420816950e60e9cc4c01
+  metadata.gz: 718e0f6b78773654966babdce38df8d48b53153456ab38d80b9c0cb03e4c3e68eb21dbe96d6c9035ff900e93c7bcb8879cb4e4139963712414884fae3b5d2aa6
+  data.tar.gz: bd80b590a03d97349c2528b701ee10b503f594ae3434ff47c508c59ce857cbdea5354dfe02db496399766f8dc972043707629f4d166418be9f1d6eb426cf61f6

data/README.md

@@ -23,7 +23,7 @@ require 'weather-report'
 
 id = WeatherReport::Weather.request_cityid("東京")
 weather = WeatherReport::Weather.new(id)
-weather.tomorrow.date  # => Date: 2013-05-04 ((2456417j,0s,0n),+0s,2299161j)>
+weather.tomorrow.date  # => <Date: 2013-05-04 ((2456417j,0s,0n),+0s,2299161j)>
 weather.tomorrow.telop  # => "雨"
 weather.tomorrow.temperature_min  # => 12
 ```

data/bin/weather-report

@@ -1,3 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'weather-report'
+
+weather = WeatherReport::Weather.new(WeatherReport::Weather.request_cityid(ARGV[0]))
+puts weather.to_h

data/lib/weather-report.rb

@@ -9,4 +9,8 @@ require 'weather-report/version'
 
 module WeatherReport
   class WeatherReportError < StandardError; end
+
+  def self.get(city)
+    Weather.new(Weather.request_cityid(city))
+  end
 end

data/lib/weather-report/day.rb

@@ -35,6 +35,15 @@ module WeatherReport
         max ? max["celsius"].to_i : nil
     end
 
+    def to_h
+      {
+        "date" => date.to_s,
+        "telop" => telop,
+        "temperature_min" => temperature_min,
+        "temperature_max" => temperature_max
+      }
+    end
+
     private
 
     def forecast(forecasts, dateLabel)

data/lib/weather-report/version.rb

@@ -1,3 +1,3 @@
 module WeatherReport
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/weather-report/weather.rb

@@ -12,7 +12,7 @@ module WeatherReport
     def self.request_cityid(city)
       doc = Nokogiri::XML(open("http://weather.livedoor.com/forecast/rss/primary_area.xml"))
       doc.search("//city[@title='#{city}']").attr("id").value
-    rescue
+    rescue => e
       raise WeatherReportError
     end
 
@@ -31,6 +31,14 @@ module WeatherReport
       @day_after_tomorrow ||= Day.new(forecasts, "明後日")
     end
 
+    def to_h
+      {
+        "today" => today.to_h,
+        "tomorrow" => tomorrow.to_h,
+        "day_after_tomorrow" => day_after_tomorrow.to_h
+      }
+    end
+
     private
 
     def forecasts
@@ -39,7 +47,7 @@ module WeatherReport
 
     def read
       @response ||= JSON.parse(@uri.read)
-    rescue e
+    rescue => e
       raise WeatherReportError
     end
   end

data/test/test_weather-report.rb

@@ -3,5 +3,9 @@
 require 'test_helper'
 
 class TestWeatherReport < MiniTest::Unit::TestCase
-
+  
+  def test_get
+    assert_respond_to WeatherReport, :get
+    assert_instance_of WeatherReport::Weather, WeatherReport.get("横浜")
+  end
 end

data/test/weather-report/test_day.rb

@@ -34,4 +34,9 @@ class TestDay < MiniTest::Unit::TestCase
     assert_respond_to @day, :temperature_max
     assert_instance_of Fixnum, @day.temperature_max
   end
+
+  def test_to_h
+    assert_respond_to @day, :to_h
+    puts @day.to_h
+  end
 end

data/test/weather-report/test_weather.rb

@@ -46,4 +46,9 @@ class TestWeather < MiniTest::Unit::TestCase
       Weather.request_cityid(nil)
     end
   end
+
+  def test_to_h
+    assert_respond_to @weather, :to_h
+    puts @weather.to_h
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weather-report
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri