weather-report 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b75cb645e6ecd1bf0b54880928626456b1194c5
-  data.tar.gz: 443e87046fdbfa512e7cccc8e0c9c66fc8a6f7a1
+  metadata.gz: 1405fd897fc7a64fae00781e20a88ec49034fbe3
+  data.tar.gz: a9e8e87ae7e13ca35a1da79586301c10f3bf901d
 SHA512:
-  metadata.gz: 21e6fa7479494286ab6a38c755678955fe20622a7cac1c3d0140aeaaf987aa650ea515e5f5764975158b25ac72ce623a6b547bab9b6f7f54c33297da56ab80ac
-  data.tar.gz: 888f337f9ae7380e454d9d19a07d2f5558b616aaa9fd66c54bab84c36db58ce8c7f5d7c1548a6fba85a8f481cb83964a0a345d87c92b36251df21d64634741df
+  metadata.gz: 22abbaa9166755a1d2356444467aeade704adfb97fcb94fa9fad918c5d5d808484b08ad6ab27c50bd64b54afd49d95d626b6edf358115b07b2133d838fc25ce0
+  data.tar.gz: 7ee452d24c48801b26f09684d0dde397021ec29f4fc8ea21c9916f938751b01b4e08116abccca24490b2d8471c7714e58438b8d3c5484a2aee36a457d1b40466

data/README.md

@@ -34,6 +34,7 @@ weather.tomorrow.date  # => <Date: 2013-05-04 ((2456417j,0s,0n),+0s,2299161j)>
 weather.tomorrow.telop  # => "雨"
 weather.tomorrow.temperature_min  # => 12
 ```
+for more info, see http://rubydoc.info/gems/weather-report
 
 ## Contributing
 

data/bin/weather-report

@@ -26,5 +26,5 @@ opt_parser = OptionParser.new do |opts|
 end
 
 city = opt_parser.parse(ARGV)
-weather = WeatherReport::Weather.new(WeatherReport::Weather.request_cityid(city))
+weather = WeatherReport::Weather.new(WeatherReport::Weather.request_cityid(*city))
 puts weather.to_h

data/lib/weather-report/day.rb

@@ -8,12 +8,12 @@ module WeatherReport
       @forecast = forecast(forecasts, dateLabel)
     end    
 
-    # @return [Trueclass, Falseclass] return true if it rains.
+    # @return [Boolean] return true if it rains.
     def rain?
       telop =~ /[雨]/ ? true : false
     end
 
-    # @return [Trueclass, Falseclass] return true if it snows.
+    # @return [Boolean] return true if it snows.
     def snow?
       telop =~ /[雪]/ ? true : false
     end

data/lib/weather-report/version.rb

@@ -1,3 +1,3 @@
 module WeatherReport
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/weather-report/weather.rb

@@ -10,12 +10,29 @@ module WeatherReport
 
     # @return [String] the id of given city
     def self.request_cityid(city_name)
-      doc = Nokogiri::XML(open("http://weather.livedoor.com/forecast/rss/primary_area.xml"))
+      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 => e
       raise WeatherReportError
     end
 
+    def self.parse_proxy(proxy)
+      # http://user:pass@host:port のように書かれていることを想定
+      # パスワードに@とか入ってる場合があるので一番後ろの@でだけsplitする
+      rserver, raccount = (proxy || '').sub(/http:\/\//, '').reverse.split("@", 2)
+      server  = rserver.nil? ? "" : rserver.reverse
+      host, port = server.split(":")
+      account = raccount.nil? ? "" : raccount.reverse.split(":")
+      user, pass = account
+      
+      proxy = OpenStruct.new({      
+                               "server" => server.empty? ? nil : "http://#{server}",
+                               "user"   => user.nil? ? "" : user,
+                               "pass"   => pass.nil? ? "" : pass
+                             })
+    end
+
     # @return [Day] the today
     def today
       @today ||= Day.new(forecasts, "今日")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weather-report
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client of Livedoor Weather Web Service.
@@ -163,4 +163,3 @@ test_files:
 - test/test_helper.rb
 - test/test_weather-report.rb
 - test/test_weather.rb
-has_rdoc: