weather-report 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1405fd897fc7a64fae00781e20a88ec49034fbe3
-  data.tar.gz: a9e8e87ae7e13ca35a1da79586301c10f3bf901d
+SHA256:
+  metadata.gz: 91182fd85a0f2daafaf887d39b5e29e8688bc5352edf4a1f7a7cd23a3d655b87
+  data.tar.gz: a532ba5d0c9e80671354f62dcab66b5dd726676b7844831922beb1e3e317dd89
 SHA512:
-  metadata.gz: 22abbaa9166755a1d2356444467aeade704adfb97fcb94fa9fad918c5d5d808484b08ad6ab27c50bd64b54afd49d95d626b6edf358115b07b2133d838fc25ce0
-  data.tar.gz: 7ee452d24c48801b26f09684d0dde397021ec29f4fc8ea21c9916f938751b01b4e08116abccca24490b2d8471c7714e58438b8d3c5484a2aee36a457d1b40466
+  metadata.gz: 2d12cf105a1f36d726378d16ca6758181fab1887793b13dc02b3c615550777456ce509515084c0c3ec6516fd917f73cc3ff0ae116e9dc9ad49cd5c15b3bb4b24
+  data.tar.gz: 3b145a1828e505b00b602afc2addd3a0b17a984df4ecfdd8e902a4ceb53806ed259ecf0bed0185f09964a84a5e818da885246b4f5193faac17f158d4d0365d68

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+.ruby-version
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
+cache: bundler
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - "2.5"
+  - "2.6"
+  - "2.7"
+  # - jruby
+  # - rbx-3
+before_install: gem install bundler -v 2.1.4

data/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    weather-report (0.4.0)
+      nokogiri
+      slop (~> 4.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    builder (3.2.4)
+    growl (1.0.3)
+    guard-compat (1.2.1)
+    guard-minitest (2.4.6)
+      guard-compat (~> 1.2)
+      minitest (>= 3.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    ruby-progressbar (1.10.1)
+    slop (4.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  growl
+  guard-minitest
+  minitest-reporters
+  rake
+  rb-fsevent
+  weather-report!
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -1,6 +1,6 @@
 # Weather Report
 
-A Ruby library and CLI to get Japanese Weather via Livedoor Weather Web Service(http://weather.livedoor.com/weather_hacks/webservice).
+A Ruby library and CLI to get Japanese Weather via 天気予報 API(https://weather.tsukumijima.net/) which is compatible with Livedoor Weather Web Service.
 
 [![Build Status](https://travis-ci.org/zakuni/weather-report.png)](https://travis-ci.org/zakuni/weather-report)
 

data/bin/weather-report

@@ -1,30 +1,47 @@
 #!/usr/bin/env ruby
-
+# -*- coding: utf-8 -*-
+require 'rubygems'
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'weather-report'
-require 'optparse'
-require 'ostruct'
-
-exit 1 if ARGV.empty?
-
-options = OpenStruct.new
+require 'slop'
 
-opt_parser = OptionParser.new do |opts|
-  opts.banner = 'Usage: weather-report CITY [options]'
+opts = Slop.parse(help: true) do
+  banner 'Usage: weather-report CITY [options]'
 
-  opts.separator ""
-  opts.separator "Common options:"
+  separator ""
+  separator "Common options:"
 
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
+  on :l, :list, 'Show city list' do
+    WeatherReport.cities.each do |city|
+      puts city
+    end
     exit
   end
 
-  opts.on_tail("-v", "--version", "Show version") do
-    puts WeatherReport::Version
+  on :v, :version, "Show version" do
+    puts "weather-report v#{WeatherReport::VERSION}"
     exit
   end
 end
 
-city = opt_parser.parse(ARGV)
+exit if opts.help?
+
+if ARGV.empty?
+  puts opts.help
+  exit
+end
+
+city = ARGV
 weather = WeatherReport::Weather.new(WeatherReport::Weather.request_cityid(*city))
-puts weather.to_h
+
+[weather.today, weather.tomorrow, weather.day_after_tomorrow].each do |day|
+  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

@@ -8,10 +8,22 @@ require 'weather-report/day'
 require 'weather-report/version'
 
 module WeatherReport
-  class WeatherReportError < StandardError; end
+  class Error < StandardError; end
+  class ArgumentError < Error; end
+  class NoCityError < Error; end
+  class NoForecastError < Error; end
 
   # @return [Weather] get weather of the city
   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("https://weather.tsukumijima.net/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

@@ -5,8 +5,9 @@ module WeatherReport
     attr_reader :date, :telop, :temperature_min, :temperature_max
 
     def initialize(forecasts, dateLabel)
+      raise ArgumentError, "dateLabel must be 今日, 明日 or 明後日" unless dateLabel =~ /(今日|明日|明後日)/
       @forecast = forecast(forecasts, dateLabel)
-    end    
+    end
 
     # @return [Boolean] return true if it rains.
     def rain?
@@ -34,19 +35,19 @@ module WeatherReport
       @telop ||= @forecast["telop"]
     end
 
-    # @return [Fixnum] the minimum temperature. 
+    # @return [Fixnum] the minimum temperature.
     # Temperature of today could be nil.
     def temperature_min
       min = @forecast["temperature"]["min"]
-      @temperature ||= 
+      @temperature ||=
         min ? min["celsius"].to_i : nil
     end
 
-    # @return [Fixnum] the maximum temperature. 
+    # @return [Fixnum] the maximum temperature.
     # Temperature of today could be nil.
     def temperature_max
       max = @forecast["temperature"]["max"]
-      @temperature_max ||= 
+      @temperature_max ||=
         max ? max["celsius"].to_i : nil
     end
 
@@ -64,6 +65,7 @@ module WeatherReport
 
     def forecast(forecasts, dateLabel)
       forecasts["forecasts"].each {|elem| return elem if elem["dateLabel"] == dateLabel}
+      raise NoForecastError
     end
   end
 end

data/lib/weather-report/version.rb

@@ -1,3 +1,3 @@
 module WeatherReport
-  VERSION = "0.3.3"
+  VERSION = '0.4.0'.freeze
 end

data/lib/weather-report/weather.rb

@@ -5,16 +5,17 @@ module WeatherReport
     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}")
+      @uri = URI.parse("https://weather.tsukumijima.net/api/forecast?city=#{city_id}")
     end
 
     # @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 = Nokogiri::XML(open("https://weather.tsukumijima.net/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
+    rescue NoMethodError
+      raise NoCityError, "It seems like city #{city_name} does not exist.\nPlease look at https://weather.tsukumijima.net/primary_area.xml for city list."
     end
 
     def self.parse_proxy(proxy)
@@ -25,8 +26,8 @@ module WeatherReport
       host, port = server.split(":")
       account = raccount.nil? ? "" : raccount.reverse.split(":")
       user, pass = account
-      
-      proxy = OpenStruct.new({      
+
+      proxy = OpenStruct.new({
                                "server" => server.empty? ? nil : "http://#{server}",
                                "user"   => user.nil? ? "" : user,
                                "pass"   => pass.nil? ? "" : pass
@@ -73,7 +74,7 @@ module WeatherReport
     def read
       @response ||= JSON.parse(@uri.read)
     rescue => e
-      raise WeatherReportError
+      raise Error
     end
   end
 end

data/test/test_day.rb

@@ -7,27 +7,60 @@ class TestDay < MiniTest::Unit::TestCase
 
   def setup
     city_id = Weather.request_cityid("東京")
-    uri = URI.parse("http://weather.livedoor.com/forecast/webservice/json/v1?city=#{city_id}")
+    uri = URI.parse("https://weather.tsukumijima.net/api/forecast?city=#{city_id}")
     @forecasts = JSON.parse(uri.read)
     @day = Day.new(@forecasts, "明日")
   end
 
   def test_initialize
     assert_instance_of Day, Day.new(@forecasts, "明日")
+    assert_raises(ArgumentError) do
+      Day.new(@forecasts, "昨日")
+    end
   end
 
   def test_rain?
     assert_respond_to @day, :rain?
+    @day.stub(:telop, '晴れ') do
+      assert_equal @day.rain?, false
+    end
+    @day.stub(:telop, '雨') do
+      assert_equal @day.rain?, true
+    end
+    @day.stub(:telop, '晴れ時々雨') do
+      assert_equal @day.rain?, true
+    end
   end
 
   def test_snow?
     assert_respond_to @day, :snow?
+    @day.stub(:telop, '晴れ') do
+      assert_equal @day.snow?, false
+    end
+    @day.stub(:telop, '雪') do
+      assert_equal @day.snow?, true
+    end
+    @day.stub(:telop, '雪のち晴れ') do
+      assert_equal @day.snow?, true
+    end
   end
 
   def test_umbrella?
     assert_respond_to @day, :umbrella?
+    @day.stub(:telop, '晴れ') do
+      assert_equal @day.umbrella?, false
+    end
+    @day.stub(:telop, '雨') do
+      assert_equal @day.umbrella?, true
+    end
+    @day.stub(:telop, '晴れのち雨') do
+      assert_equal @day.umbrella?, true
+    end
+    @day.stub(:telop, '曇りのち晴れ') do
+      assert_equal @day.umbrella?, false
+    end
   end
-  
+
   def test_date
     assert_respond_to @day, :date
     assert_instance_of Date, @day.date
@@ -51,4 +84,12 @@ class TestDay < MiniTest::Unit::TestCase
   def test_to_h
     assert_respond_to @day, :to_h
   end
+
+  def test_forecast
+    forecasts = {"forecasts" => [{"dateLabel" => "明日"}]}
+    refute_nil @day.send(:forecast, forecasts, "明日")
+    assert_raises NoForecastError do
+      @day.send(:forecast, forecasts, "明後日")
+    end
+  end
 end

data/test/test_helper.rb

@@ -6,4 +6,4 @@ require 'minitest/pride'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'weather-report'
 
-MiniTest::Reporters.use! [MiniTest::Reporters::DefaultReporter.new, MiniTest::Reporters::GuardReporter.new]
+MiniTest::Reporters.use! [MiniTest::Reporters::DefaultReporter.new]

data/test/test_weather-report.rb

@@ -8,4 +8,11 @@ class TestWeatherReport < MiniTest::Unit::TestCase
     assert_respond_to WeatherReport, :get
     assert_instance_of WeatherReport::Weather, WeatherReport.get("横浜")
   end
+
+  def test_cities
+    cities = WeatherReport.cities
+    assert_instance_of Array, cities
+    assert cities.include? "東京"
+    assert cities.include? "横浜"
+  end
 end

data/test/test_weather.rb

@@ -11,7 +11,7 @@ class TestWeather < MiniTest::Unit::TestCase
   end
 
   def test_initialize
-    assert_raises ArgumentError do
+    assert_raises ::ArgumentError do
       Weather.new
     end
     assert_instance_of Weather, Weather.new(@id)
@@ -47,9 +47,12 @@ 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
+    assert_raises(NoCityError) do
+      Weather.request_cityid("存在しない街")
+    end
   end
 
   def test_to_h

data/weather-report.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "nokogiri"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency "slop", "~> 4.0.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "rb-fsevent"

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: weather-report
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 4.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby library and CLI to get Japanese Weather via Livedoor Weather Web
@@ -117,9 +117,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -144,17 +145,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client of Livedoor Weather Web Service.