weather-report 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1d8192f60c896b77e6ce11143ab06ed934ff7f
-  data.tar.gz: e1d2070cb70c0ce54e8b6f521ef023cd01b66a69
+  metadata.gz: e40fcae0d080a18d08175ed911738a01caaff265
+  data.tar.gz: cec9d9bd30cdf41f4533cd4a327097372cacbf47
 SHA512:
-  metadata.gz: 4197fa2fdb3e78d748d4423c940e2910c7b328be3d195dc410e4e420ff6b13dc9f8480b2282b5a292d83b67fe1d36eeab45768d246eb011f961be347fd5e030a
-  data.tar.gz: ced5d01c569fa21cc33ea9383326b075a906c941fadc758c205a3fe531db5200316d46e69f21ebd43b63dfcd590b5c94c5c514199db9adb8b74c1e5ef06b90d9
+  metadata.gz: 1931597a94a6bfba4666ea5703397826a8f9b244944fa88a2641a971a0ac6c39ccb45339025c0a794029c4b7833cffc434fe3dc3165f0057ed55ddfe8577cf67
+  data.tar.gz: 5e06046a028d6294de4e0cd680fd05953045d3b7d5a921adeb2d84d337aaba10c35613f861aa094b968b2932344d9c6a77cb75184d9373669654419fc1ae5b57

data/README.md

@@ -1,6 +1,6 @@
 # Weather Report
 
-A Ruby library and CLI to access Livedoor Weather Web Service(http://weather.livedoor.com/weather_hacks/webservice).
+A Ruby library and CLI to get Japanese Weather via Livedoor Weather Web Service(http://weather.livedoor.com/weather_hacks/webservice).
 
 ## Installation
 
@@ -23,6 +23,9 @@ 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.telop  # => "雨"
+weather.tomorrow.temperature_min  # => 12
 ```
 
 ## Contributing

data/lib/weather-report/day.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+module WeatherReport
+  class Day
+    attr_reader :date, :telop, :temperature_min, :temperature_max
+
+    def initialize(forecasts, dateLabel)
+      @forecast = forecast(forecasts, dateLabel)
+    end
+
+    def date
+      year, month, day = @forecast["date"].split('-')
+      @date ||= Date.new(year.to_i, month.to_i, day.to_i)
+    end
+
+    def telop
+      @telop ||= @forecast["telop"]
+    end
+
+    def temperature_min
+      min = @forecast["temperature"]["min"]
+      @temperature ||= 
+        min ? min["celsius"].to_i : nil
+    end
+
+    def temperature_max
+      max = @forecast["temperature"]["max"]
+      @temperature_max ||= 
+        max ? max["celsius"].to_i : nil
+    end
+
+    private
+
+    def forecast(forecasts, dateLabel)
+      forecasts["forecasts"].each {|elem| return elem if elem["dateLabel"] == dateLabel}
+    end
+  end
+end

data/lib/weather-report/version.rb

@@ -1,3 +1,3 @@
 module WeatherReport
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/weather-report/weather.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+module WeatherReport
+  class Weather
+    attr_reader :today, :tomorrow, :day_after_tomorrow
+
+    def initialize(city_id)
+      @uri = URI.parse("http://weather.livedoor.com/forecast/webservice/json/v1?city=#{city_id}")
+    end
+
+    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
+      raise WeatherReportError
+    end
+
+    def today
+      @today ||= Day.new(forecasts, "今日")
+    end
+    
+    def tomorrow
+      @tomorrow ||= Day.new(forecasts, "明日")
+    end
+
+    def day_after_tomorrow
+      @day_after_tomorrow ||= Day.new(forecasts, "明後日")
+    end
+
+    private
+
+    def forecasts
+      @forecasts ||= read
+    end
+
+    def read
+      @response ||= JSON.parse(@uri.read)
+    rescue e
+      raise WeatherReportError
+    end
+  end
+end

data/lib/weather-report.rb

@@ -1,52 +1,12 @@
 # -*- coding: utf-8 -*-
+require 'date'
 require 'json'
 require 'open-uri'
 require 'nokogiri'
-require "weather-report/version"
+require 'weather-report/weather'
+require 'weather-report/day'
+require 'weather-report/version'
 
 module WeatherReport
   class WeatherReportError < StandardError; end
-
-  class Weather
-    attr_reader :today, :tomorrow, :day_after_tomorrow
-
-    def initialize(city_id)
-      @uri = URI.parse("http://weather.livedoor.com/forecast/webservice/json/v1?city=#{city_id}")
-    end
-
-    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
-      raise WeatherReportError
-    end
-
-    def today
-      @today ||= forecast("今日")
-    end
-    
-    def tomorrow
-      @tomorrow ||= forecast("明日")
-    end
-
-    def day_after_tomorrow
-      @day_after_tomorrow ||= forecast("明後日")
-    end
-
-    private
-
-    def forecast(dateLabel)
-      forecasts.each {|elem| return elem if elem["dateLabel"] == dateLabel}
-    end
-    
-    def forecasts
-      @forecasts ||= read["forecasts"]
-    end
-
-    def read
-      @response ||= JSON.parse(@uri.read)
-    rescue
-      raise WeatherReportError
-    end
-  end
 end

data/test/test_weather-report.rb

@@ -3,53 +3,5 @@
 require 'test_helper'
 
 class TestWeatherReport < MiniTest::Unit::TestCase
-  include WeatherReport
 
-  def setup
-    @id = Weather.request_cityid("東京")
-    @weather = Weather.new(@id)
-  end
-
-  def test_initialize
-    assert_raises ArgumentError do
-      Weather.new
-    end
-    assert_instance_of Weather, Weather.new(@id)
-  end
-
-  def test_today
-    assert_respond_to @weather, :today
-
-    today = @weather.today
-    assert_includes(today, "date")
-    assert_includes(today, "telop")
-    assert_includes(today, "temperature")
-  end
-
-  def test_tomorrow
-    assert_respond_to @weather, :tomorrow
-
-    tomorrow = @weather.tomorrow
-    assert_includes(tomorrow, "date")
-    assert_includes(tomorrow, "telop")
-    assert_includes(tomorrow, "temperature")
-  end
-
-  def test_day_after_tomorrow
-    assert_respond_to @weather, :day_after_tomorrow
-
-    day_after_tomorrow = @weather.day_after_tomorrow
-    assert_includes(day_after_tomorrow, "date")
-    assert_includes(day_after_tomorrow, "telop")
-    assert_includes(day_after_tomorrow, "temperature")
-  end
-
-  def test_request_cityid
-    assert_respond_to Weather, :request_cityid
-    assert_equal "130010", Weather.request_cityid("東京")
-    assert_equal "140010", Weather.request_cityid("横浜")
-    assert_raises(WeatherReportError) do
-      Weather.request_cityid(nil)
-    end
-  end
 end

data/test/weather-report/test_day.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'test_helper'
+
+class TestDay < MiniTest::Unit::TestCase
+  include WeatherReport
+
+  def setup
+    city_id = Weather.request_cityid("東京")
+    uri = URI.parse("http://weather.livedoor.com/forecast/webservice/json/v1?city=#{city_id}")
+    @forecasts = JSON.parse(uri.read)
+    @day = Day.new(@forecasts, "明日")
+  end
+
+  def test_initialize
+    assert_instance_of Day, Day.new(@forecasts, "明日")
+  end
+
+  def test_date
+    assert_respond_to @day, :date
+    assert_instance_of Date, @day.date
+  end
+
+  def test_telop
+    assert_respond_to @day, :telop
+  end
+
+  def test_temperature_min
+    assert_respond_to @day, :temperature_min
+    assert_instance_of Fixnum, @day.temperature_min
+  end
+
+  def test_temperature_max
+    assert_respond_to @day, :temperature_max
+    assert_instance_of Fixnum, @day.temperature_max
+  end
+end

data/test/weather-report/test_weather.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'test_helper'
+
+class TestWeather < MiniTest::Unit::TestCase
+  include WeatherReport
+
+  def setup
+    @id = Weather.request_cityid("東京")
+    @weather = Weather.new(@id)
+  end
+
+  def test_initialize
+    assert_raises ArgumentError do
+      Weather.new
+    end
+    assert_instance_of Weather, Weather.new(@id)
+  end
+
+  def test_today
+    assert_respond_to @weather, :today
+
+    today = @weather.today
+    assert_instance_of Day, today
+  end
+
+  def test_tomorrow
+    assert_respond_to @weather, :tomorrow
+
+    tomorrow = @weather.tomorrow
+    assert_instance_of Day, tomorrow
+  end
+
+  def test_day_after_tomorrow
+    assert_respond_to @weather, :day_after_tomorrow
+
+    day_after_tomorrow = @weather.day_after_tomorrow
+    assert_instance_of Day, day_after_tomorrow
+  end
+
+  def test_request_cityid
+    assert_respond_to Weather, :request_cityid
+    assert_equal "130010", Weather.request_cityid("東京")
+    assert_equal "140010", Weather.request_cityid("横浜")
+    assert_raises(WeatherReportError) do
+      Weather.request_cityid(nil)
+    end
+  end
+end

data/weather-report.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = WeatherReport::VERSION
   spec.authors       = ["zakuni"]
   spec.email         = ["kunio038@gmail.com"]
-  spec.description   = %q{A Ruby library and CLI to access Livedoor Weather Web Service(http://weather.livedoor.com/weather_hacks/webservice).}
+  spec.description   = %q{A Ruby library and CLI to get Japanese Weather via Livedoor Weather Web Service(http://weather.livedoor.com/weather_hacks/webservice).}
   spec.summary       = %q{A Ruby client of Livedoor Weather Web Service.}
   spec.homepage      = "https://github.com/zakuni/weather-report"
   spec.license       = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weather-report
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -108,7 +108,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A Ruby library and CLI to access Livedoor Weather Web Service(http://weather.livedoor.com/weather_hacks/webservice).
+description: A Ruby library and CLI to get Japanese Weather via Livedoor Weather Web
+  Service(http://weather.livedoor.com/weather_hacks/webservice).
 email:
 - kunio038@gmail.com
 executables:
@@ -124,9 +125,13 @@ files:
 - Rakefile
 - bin/weather-report
 - lib/weather-report.rb
+- lib/weather-report/day.rb
 - lib/weather-report/version.rb
+- lib/weather-report/weather.rb
 - test/test_helper.rb
 - test/test_weather-report.rb
+- test/weather-report/test_day.rb
+- test/weather-report/test_weather.rb
 - weather-report.gemspec
 homepage: https://github.com/zakuni/weather-report
 licenses:
@@ -155,4 +160,6 @@ summary: A Ruby client of Livedoor Weather Web Service.
 test_files:
 - test/test_helper.rb
 - test/test_weather-report.rb
+- test/weather-report/test_day.rb
+- test/weather-report/test_weather.rb
 has_rdoc: