weatherhacks 0.1.1 → 0.2.0

data/History.txt

@@ -1,9 +1,18 @@
+== 0.2.0 2008-04-11
+
+* Keita Yamaguchi
+  * GitHub: http://github.com/keita/ruby-weatherhacks/tree/master
+  * Reduced files included in the gem package
+  * New: WeatherHacks.lwws and WeatherHacks::LWWS[] are alias of WeatherHacks::LWWS.request
+  * WeatherHacks::LWWS.request can handle city name(e.g. request("松江"))
+  * WeatherHacks::LWWS.request(city, :all) returns 3 days forecasts.
+
 == 0.1.1 2007-12-12
 
-* Keita Yamaguchi:
-  * fix bin/lwws
+* Keita Yamaguchi
+  * Fixed bin/lwws
 
 == 0.1.0 2007-12-12
 
-* Keita Yamaguchi:
+* Keita Yamaguchi
   * Initial release

data/License.txt

@@ -1,4 +1,4 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+ruby-weatherhacks is copyrighted free software by Keita Yamaguchi <keita.yamaguchi@gmail.com>.
 You can redistribute it and/or modify it under either the terms of the GPL
 (see the file GPL), or the conditions below:
 

data/Manifest.txt

@@ -4,27 +4,9 @@ Manifest.txt
 README.txt
 Rakefile
 bin/lwws
-config/hoe.rb
-config/requirements.rb
 lib/weatherhacks.rb
 lib/weatherhacks/forecastmap.rb
 lib/weatherhacks/lwws.rb
-lib/weatherhacks/version.rb
 misc/forecastmap.xsl
-script/destroy
-script/generate
-script/txt2html
 setup.rb
 spec/lwws_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rspec.rake
-tasks/weatherhacks.rake
-tasks/website.rake
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/README.txt

@@ -1,9 +1,20 @@
-README for ruby-weatherhacks
-============================
-ruby-weatherhacks is a wrapper library for livdoor WeatherHacks API.
+= ruby-weatherhacks
 
-livedoor ... http://www.livedoor.com/
-WeatherHacks ... http://weather.livedoor.com/weather_hacks/
+Author::    Keita Yamaguchi(山口 慶太) <keita.yamaguchi@gmail.com>
+Copyright:: © Keita Yamaguchi, 2007ー2008. All rights reserved.
+License::   Ruby License
 
-Copyright (C) 2007 Keita Yamaguchi
-Mail: keita.yamaguchi@gmail.com
+ruby-weatherhacks is a wrapper library for {livdoor WeatherHacks}[http://weather.livedoor.com/weather_hacks/] API.
+
+== Usage
+
+See {the documentation}[http://github.com/keita/ruby-weatherhacks/wikis].
+
+== Links
+
+* {livedoor WeatherHacks}[http://weather.livedoor.com/weather_hacks/]
+* ruby-weatherhacks
+  * {RubyForge}[http://rubyforge.org/projects/weatherhacks/]
+  * {GitHub}[http://github.com/keita/ruby-weatherhacks/tree/master]
+* author's blog(written in Japanese)
+  * {¬¬日常日記}[http://d.hatena.ne.jp/keita_yamaguchi/]

data/Rakefile

@@ -1,4 +1,23 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+require "rubygems"
+require "rtask"
+
+RTask.new
+
+desc "Run the specs"
+task :spec do
+  sh "bacon"
+end
+
+desc 'Update forecastmap.rb'
+task :forecastmap do
+  # download forecastmap.xml
+  url = "http://weather.livedoor.com/forecast/rss/forecastmap.xml"
+  sh "wget -O forecastmap.xml #{url}"
+  # generate
+  out = "lib/weatherhacks/forecastmap.rb"
+  xsl = "misc/forecastmap.xsl"
+  sh "xsltproc -o #{out} #{xsl} forecastmap.xml"
+  # remove
+  sh "rm forecastmap.xml"
+end
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }

data/lib/weatherhacks.rb

@@ -1,4 +1,13 @@
 module WeatherHacks
+  module Version #:nodoc:
+    MAJOR = 0
+    MINOR = 2
+    TINY  = 0
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+  VERSION = Version::STRING
+
   module ForecastMap
     class Area
       attr_reader :name, :rss, :prefs
@@ -55,4 +64,11 @@ end
 
 require "weatherhacks/lwws"
 require "weatherhacks/forecastmap"
-require "weatherhacks/version"
+
+module WeatherHacks
+  module_function
+
+  def lwws(city, day = :all)
+    LWWS.request(city, day)
+  end
+end

data/lib/weatherhacks/lwws.rb

@@ -121,20 +121,33 @@ module WeatherHacks::LWWS
     end
   end
 
-  # Returns a Forecast object.
-  # city_id:: city id
-  # day:: :today, :tomorrow or :dayaftertomorrow
-  def self.request(city_id, day = :today)
-    unless day == :today or day == :tomorrow or day == :dayaftertomorrow
-      raise ArgumentError, day
-    end
-    req = Net::HTTP::Get.new(path(city_id, day.to_s))
-    http = Net::HTTP.new(URL.host)
-    case res = http.request(req)
-    when Net::HTTPSuccess
-      Forecast.new(REXML::Document.new(res.body))
-    else
-      raise Error.new(res)
+  class << self
+
+    # Returns a Forecast object.
+    # city_id:: city id
+    # day:: :today, :tomorrow or :dayaftertomorrow
+    def request(city, day = :all)
+      city_id = if city.kind_of?(String)
+                  WeatherHacks::ForecastMap::CITY[city].id
+                else city end
+      unless day.to_s =~ /today|tomorrow|dayaftertomorrow|all/
+        raise ArgumentError, day
+      end
+      if day == :all
+        return [ request(city, :today),
+                 request(city, :tomorrow),
+                 request(city, :dayaftertomorrow) ]
+      end
+      req = Net::HTTP::Get.new(path(city_id, day.to_s))
+      http = Net::HTTP.new(URL.host)
+      case res = http.request(req)
+      when Net::HTTPSuccess
+        Forecast.new(REXML::Document.new(res.body))
+      else
+        raise Error.new(res)
+      end
     end
+
+    alias [] request
   end
 end

data/spec/lwws_spec.rb

@@ -1,106 +1,100 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+$LOAD_PATH.unshift File.join(File.join(File.dirname(__FILE__), ".."), "lib")
+require "weatherhacks"
+require "rubygems"
+require "bacon"
 
-describe WeatherHacks::LWWS::Forecast do
-  before do
-    @forecast = WeatherHacks::LWWS::Forecast.new($today)
-  end
+include WeatherHacks::LWWS
 
-  it "can read author as a String" do
-    @forecast.author.should be_a_kind_of(String)
-  end
-
-  it "can read location as a WeatherHacks::LWWS::Location" do
-    @forecast.location.should be_a_kind_of(WeatherHacks::LWWS::Location)
-  end
+$today, $tomorrow, $dayaftertomorrow = WeatherHacks.lwws("松江")
 
-  it "can read title as a String" do
-    @forecast.title.should be_a_kind_of(String)
-  end
+describe "WeatherHacks::LWWS::Forecast" do
 
-  it "can read link as a URI" do
-    @forecast.link.should be_a_kind_of(URI)
+  def forecast(&block)
+    [$today, $tomorrow, $dayaftertomorrow].each {|f| yield f }
   end
 
-  it "can read forecastday as a String" do
-    @forecast.forecastday.should be_a_kind_of(String)
+  it "#author" do
+    forecast {|f| f.author.should.be.kind_of(String) }
   end
 
-  it "can read day as a String" do
-    @forecast.day.should match(/Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday/)
+  it "#location" do
+    forecast {|f| f.location.should.be.kind_of(::Location) }
   end
 
-  it "can read forecastdate as a Time" do
-    @forecast.forecastdate.should be_a_kind_of(Time)
+  it "#title" do
+    forecast {|f| f.title.should.be.kind_of(String) }
   end
 
-  it "can read publictime as a Time" do
-    @forecast.publictime.should be_a_kind_of(Time)
+  it "#link" do
+    forecast {|f| f.link.should.be.kind_of(URI) }
   end
 
-  it "can read telop as a String" do
-    @forecast.telop.should be_a_kind_of(String)
+  it "#forecastday" do
+    $today.forecastday.should == "today"
+    $tomorrow.forecastday.should == "tomorrow"
+    $dayaftertomorrow.forecastday.should == "dayaftertomorrow"
   end
 
-  it "can read description as String" do
-    @forecast.description.should be_a_kind_of(String)
+  it "#day" do
+    forecast {|f| f.day.should =~ /(Sun|Mon|Tues|Wednes|Thurs|Fri|Satur)day/ }
   end
 
-  it "can read image as a WeatherHacks::LWWS::Image" do
-    @forecast.image.should be_a_kind_of(WeatherHacks::LWWS::Image)
+  it "#forecastdate" do
+    forecast {|f| f.forecastdate.should.be.kind_of(Time) }
   end
 
-  it "can read celsius as a WeatherHacks::LWWS::Celsius" do
-    @forecast.celsius.should be_a_kind_of(WeatherHacks::LWWS::Celsius)
+  it "#publictime" do
+    forecast {|f| f.publictime.should.be.kind_of(Time) }
   end
 
-  it "can read fahrenheit as a WeatherHacks::LWWS::Fahrenheit" do
-    @forecast.fahrenheit.should be_a_kind_of(WeatherHacks::LWWS::Fahrenheit)
+  it "#telop" do
+    forecast {|f| f.telop.should.be.kind_of(String) }
   end
 
-  it "can read pinpoints as a list of WeatherHacks::LWWS::PinpointLocation" do
-    @forecast.pinpoints.each do |location|
-      location.should be_a_kind_of(WeatherHacks::LWWS::PinpointLocation)
-    end
+  it "#description" do
+    forecast {|f| f.description.should.be.kind_of(String) }
   end
 
-  it "can read copyright as a WeatherHacks::LWWS::Copyright" do
-    @forecast.copyright.should be_a_kind_of(WeatherHacks::LWWS::Copyright)
+  it "#image" do
+    forecast {|f| f.image.should.be.kind_of(Image) }
   end
 
-  after do
-    @forecast = nil
+  it "#celsius" do
+    forecast {|f| f.celsius.should.be.kind_of(Celsius) }
   end
-end
 
-describe WeatherHacks::LWWS::Forecast, "#forecastday" do
-  it "allows 'today'" do
-    WeatherHacks::LWWS::Forecast.new($today).forecastday.should eql("today")
+  it "#fahrenheit" do
+    forecast {|f| f.fahrenheit.should.be.kind_of(Fahrenheit) }
   end
 
-  it "allows 'tomorrow'" do
-    WeatherHacks::LWWS::Forecast.new($tomorrow).forecastday.should eql("tomorrow")
+  it "#pinpoints" do
+    forecast do |f|
+      f.pinpoints.each do |location|
+        location.should.be.kind_of(PinpointLocation)
+      end
+    end
   end
 
-  it "allows 'dayaftertomorrow'" do
-    WeatherHacks::LWWS::Forecast.new($dayaftertomorrow).forecastday.should eql("dayaftertomorrow")
+  it "#copyright" do
+    forecast{|f| f.copyright.should.be.kind_of(Copyright) }
   end
 end
 
-describe WeatherHacks::LWWS::Location do
+describe "WeatherHacks::LWWS::Location" do
   before do
-    @location = WeatherHacks::LWWS::Forecast.new($today).location
+    @location = $today.location
   end
 
-  it "can read area as a String" do
-    @location.area.should be_a_kind_of(String)
+  it "area" do
+    @location.area.should.be.kind_of(String)
   end
 
-  it "can read pref as a String" do
-    @location.pref.should be_a_kind_of(String)
+  it "pref" do
+    @location.pref.should.be.kind_of(String)
   end
 
-  it "can read city as a String" do
-    @location.city.should be_a_kind_of(String)
+  it "city" do
+    @location.city.should.be.kind_of(String)
   end
 
   after do
@@ -108,136 +102,135 @@ describe WeatherHacks::LWWS::Location do
   end
 end
 
-describe WeatherHacks::LWWS::Image do
+describe "WeatherHacks::LWWS::Image" do
   before do
-    @image = WeatherHacks::LWWS::Forecast.new($today).image
+    @image = $today.image
   end
 
-  it "can read title as a String" do
-    @image.title.should be_a_kind_of(String)
+  after do
+    @image = nil
   end
 
-  it "can read link as a URI" do
-    @image.link.should be_a_kind_of(URI)
+  it "title" do
+    @image.title.should.be.kind_of(String)
   end
 
-  it "can read url as a URI" do
-    @image.url.should be_a_kind_of(URI)
+  it "link" do
+    @image.link.should.be.kind_of(URI)
   end
 
-  it "can read width as a Integer" do
-    @image.width.should be_a_kind_of(Integer)
+  it "url" do
+    @image.url.should.be.kind_of(URI)
   end
 
-  it "can read height as a Integer" do
-    @image.height.should be_a_kind_of(Integer)
+  it "width" do
+    @image.width.should.be.kind_of(Integer)
   end
 
-  after do
-    @image = nil
+  it "height" do
+    @image.height.should.be.kind_of(Integer)
   end
 end
 
-describe WeatherHacks::LWWS::Temperature do
+describe "WeatherHacks::LWWS::Temperature" do
   before do
-    forecast = WeatherHacks::LWWS::Forecast.new($today)
-    @celsius = forecast.celsius
-    @fahrenheit = forecast.fahrenheit
+    @celsius = $today.celsius
+    @fahrenheit = $today.fahrenheit
   end
 
-  it "can read min of celsius as a Integer" do
-    @celsius.min.should be_a_kind_of(Integer) if @celsius.min
-
+  after do
+    @celsius = nil
+    @fahrenheit = nil
   end
 
-  it "can read max of celsius as a Integer" do
-    @celsius.max.should be_a_kind_of(Integer) if @celsius.max
+  it "min celsius" do
+    @celsius.min.should.be.kind_of(Integer) if @celsius.min
   end
 
-  it "can read min of fahrenheit as a Float" do
-    @fahrenheit.min.should be_a_kind_of(Float) if @fahrenheit.min
+  it "max celsius" do
+    @celsius.max.should.be.kind_of(Integer) if @celsius.max
   end
 
-  it "can read max of fahrenheit as a Float" do
-    @fahrenheit.max.should be_a_kind_of(Float) if @fahrenheit.max
+  it "min fahrenheit" do
+    @fahrenheit.min.should.be.kind_of(Float) if @fahrenheit.min
   end
 
-  after do
-    @celsius = nil
-    @fahrenheit = nil
+  it "max fahrenheit" do
+    @fahrenheit.max.should.be.kind_of(Float) if @fahrenheit.max
   end
 end
 
-describe WeatherHacks::LWWS::PinpointLocation do
+describe "WeatherHacks::LWWS::PinpointLocation" do
   before do
-    @pinpoints = WeatherHacks::LWWS::Forecast.new($today).pinpoints
+    @pinpoints = $today.pinpoints
   end
 
-  it "can read title as a String" do
-    @pinpoints.each do |location|
-      location.title.should be_a_kind_of(String)
-    end
+  after do
+    @pinpoints = nil
   end
 
-  it "can read link as a URI" do
+  it "title" do
     @pinpoints.each do |location|
-      location.link.should be_a_kind_of(URI)
+      location.title.should.be.kind_of(String)
     end
   end
 
-  it "can read publictime as a Time" do
+  it "link" do
     @pinpoints.each do |location|
-      location.publictime.should be_a_kind_of(Time)
+      location.link.should.be.kind_of(URI)
     end
   end
 
-  after do
-    @pinpoints = nil
+  it "publictime" do
+    @pinpoints.each do |location|
+      location.publictime.should.be.kind_of(Time)
+    end
   end
 end
 
-describe WeatherHacks::LWWS::Copyright do
+describe "WeatherHacks::LWWS::Copyright" do
   before do
-    @copyright = WeatherHacks::LWWS::Forecast.new($today).copyright
+    @copyright = $today.copyright
+  end
+
+  after do
+    @copyright = nil
   end
 
-  it "can read title as a String" do
-    @copyright.title.should be_a_kind_of(String)
+  it "title" do
+    @copyright.title.should.be.kind_of(String)
   end
 
-  it "can read link as a URI" do
-    @copyright.link.should be_a_kind_of(URI)
+  it "link" do
+    @copyright.link.should.be.kind_of(URI)
   end
 
-  it "can read image as a WeatherHacks::LWWS::Image" do
-    @copyright.image.should be_a_kind_of(WeatherHacks::LWWS::Image)
+  it "image" do
+    @copyright.image.should.be.kind_of(WeatherHacks::LWWS::Image)
   end
 
-  it "can read providers as a list of WeatherHacks::LWWS::Provider" do
+  it "providers" do
     @copyright.providers.each do |provider|
-      provider.should be_a_kind_of(WeatherHacks::LWWS::Provider)
+      provider.should.be.kind_of(WeatherHacks::LWWS::Provider)
     end
   end
 
-  after do
-    @copyright = nil
-  end
 end
 
-describe WeatherHacks::LWWS::Provider do
+describe "WeatherHacks::LWWS::Provider" do
   before do
-    @provider = WeatherHacks::LWWS::Forecast.new($today).copyright.providers[0]
+    @provider = $today.copyright.providers[0]
   end
 
-  it "can read name as a String" do
-    @provider.name.should be_a_kind_of(String)
+  after do
+    @provider = nil
   end
 
-  it "can read link as a URI" do
-    @provider.link.should be_a_kind_of(URI)
+  it "name" do
+    @provider.name.should.be.kind_of(String)
   end
 
-  after do
-    @provider = nil
+  it "link" do
+    @provider.link.should.be.kind_of(URI)
   end
 end