weather-report 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d94f027fd2507b577ed28553f002ad8b1daeacfa8c4cf9b45df023ad85b4e5
-  data.tar.gz: 8179f05a5fdc3b61b442afb214499736105ef432624836ebd02588363aab5178
+  metadata.gz: 940926ddd30861ac84a28085e33ea3a5545b26c8e6594bfe95f385bc4cd02968
+  data.tar.gz: 91d5683c8c07b435493f0e8a6f676360e96b9f48625ca2b761837eda78795e1d
 SHA512:
-  metadata.gz: 91d4c37a2841d6cde6fce7224b02b5fcaa63b508c38acc27a191b664ea34f0150593a173bccd4e80c1d231eef3ff9350ecb6d3b78a3bdd63e105c430c83886a3
-  data.tar.gz: 632fcda99ad2eb42aef55725e4fb565a5f11b6a52ad6a0e238d7589b239a0151bf2783a7a54113009f977de1b696a1345c0d43184fe16a552b74b1ff913b117f
+  metadata.gz: 63da6c9c80a1b8ca054cb5ed8d5e021505e2f90b8774097817402bb8015a046ab29eeba34a0cdb421c4b40a4bf3aad3f0d134c458efd3056d3a5bdad78189d2b
+  data.tar.gz: 39350cfa70debae80bafe58d4591fed4ccb025a36864dc64fb2d7fc74bcec1d95f537105fcaf3ed75c20efefe3a766bbd8c344158a21add5694f8e3a2fe430cb

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
 cache: bundler
 rvm:
-  - "2.5"
-  - "2.6"
-  - "2.7"
-  # - jruby
-  # - rbx-3
+- '2.5'
+- '2.6'
+- '2.7'
+# - jruby
+# - rbx-3
 before_install: gem install bundler -v 2.1.4
+notifications:
+  slack:
+    secure: V4ek++4NqkVvL44PrDrycKUdIVIGUM5lkBydkyNl1CU8+wf2l/GzeMnI/d8rF+ok8DgWTvEoEr15+/d9tzec34M91GbVnHI5+MeOWuZcp7LDVvKMZc67kZcHqplurBFcKuTty8AJgGmLOjUqmlrXoXSceTachaqdU/0u1MQV2Sg=

data/Gemfile

@@ -2,3 +2,14 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in weather-report.gemspec
 gemspec
+
+gem 'nokogiri'
+gem 'slop', '~> 3.6.0'
+
+group :development do
+  gem "rake"
+  gem "guard"
+  gem "guard-minitest"
+  gem "rb-fsevent"
+  gem "minitest-reporters"
+end

data/Gemfile.lock

@@ -1,20 +1,34 @@
 PATH
   remote: .
   specs:
-    weather-report (0.4.1)
-      nokogiri
-      slop (~> 3.6.0)
+    weather-report (0.4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
     builder (3.2.4)
-    growl (1.0.3)
+    coderay (1.1.3)
+    ffi (1.13.1)
+    formatador (0.2.5)
+    guard (2.16.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
     minitest-reporters (1.4.2)
@@ -22,22 +36,35 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    nenv (0.3.0)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.0.1)
     rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     ruby-progressbar (1.10.1)
+    shellany (0.0.1)
     slop (3.6.0)
+    thor (1.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  growl
+  guard
   guard-minitest
   minitest-reporters
+  nokogiri
   rake
   rb-fsevent
+  slop (~> 3.6.0)
   weather-report!
 
 BUNDLED WITH

data/lib/weather-report.rb

@@ -21,7 +21,7 @@ module WeatherReport
   # @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 = Nokogiri::XML(URI.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"]
     }

data/lib/weather-report/day.rb

@@ -6,7 +6,17 @@ module WeatherReport
 
     def initialize(forecasts, dateLabel)
       raise ArgumentError, "dateLabel must be 今日, 明日 or 明後日" unless dateLabel =~ /(今日|明日|明後日)/
-      @forecast = forecast(forecasts, dateLabel)
+
+      forecast = forecast(forecasts, dateLabel)
+      @telop = forecast['telop']
+      year, month, day = forecast['date'].split('-')
+      @date = Date.new(year.to_i, month.to_i, day.to_i)
+
+      temperature = forecast['temperature']
+      min = temperature['min']
+      max = temperature['max']
+      @temperature_min = min ? min['celsius'].to_i : nil
+      @temperature_max = max ? max['celsius'].to_i : nil
     end
 
     # @return [Boolean] return true if it rains.
@@ -24,33 +34,6 @@ module WeatherReport
       telop =~ /[雨雪霙雹]/ ? true : false
     end
 
-    # @return [Date] the date
-    def date
-      year, month, day = @forecast["date"].split('-')
-      @date ||= Date.new(year.to_i, month.to_i, day.to_i)
-    end
-
-    # @return [String] the telop
-    def telop
-      @telop ||= @forecast["telop"]
-    end
-
-    # @return [Fixnum] the minimum temperature.
-    # Temperature of today could be nil.
-    def temperature_min
-      min = @forecast["temperature"]["min"]
-      @temperature ||=
-        min ? min["celsius"].to_i : nil
-    end
-
-    # @return [Fixnum] the maximum temperature.
-    # Temperature of today could be nil.
-    def temperature_max
-      max = @forecast["temperature"]["max"]
-      @temperature_max ||=
-        max ? max["celsius"].to_i : nil
-    end
-
     # @return [Hash] return with hash format.
     def to_h
       {

data/lib/weather-report/version.rb

@@ -1,3 +1,3 @@
 module WeatherReport
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/lib/weather-report/weather.rb

@@ -12,7 +12,7 @@ module WeatherReport
     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("https://weather.tsukumijima.net/primary_area.xml", :proxy_http_basic_authentication => [proxy.server, proxy.user, proxy.pass]))
+      doc = Nokogiri::XML(URI.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 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."

data/sig/day.rbs

@@ -0,0 +1,8 @@
+module WeatherReport
+  class Day
+    attr_reader date: Date
+    attr_reader telop: String
+    attr_reader temperature_min: Integer?
+    attr_reader temperature_max: Integer?
+  end
+end

data/weather-report.gemspec

@@ -1,28 +1,21 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'weather-report/version'
+require_relative 'lib/weather-report/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "weather-report"
   spec.version       = WeatherReport::VERSION
   spec.authors       = ["zakuni"]
   spec.email         = ["kunio038@gmail.com"]
-  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.description   = %q{A Ruby library and CLI to get Japanese Weather via 天気予報 API(https://weather.tsukumijima.net/) which is compatible with Livedoor Weather Web Service.}
+  spec.summary       = %q{A Ruby client of 天気予報 API(https://weather.tsukumijima.net/).}
   spec.homepage      = "https://github.com/zakuni/weather-report"
   spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "slop", "~> 3.6.0"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "guard-minitest"
-  spec.add_development_dependency "rb-fsevent"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "growl"
 end

metadata

@@ -1,115 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: weather-report
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-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: slop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.6.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
-  Service(http://weather.livedoor.com/weather_hacks/webservice).
+date: 2020-12-12 00:00:00.000000000 Z
+dependencies: []
+description: A Ruby library and CLI to get Japanese Weather via 天気予報 API(https://weather.tsukumijima.net/)
+  which is compatible with Livedoor Weather Web Service.
 email:
 - kunio038@gmail.com
 executables:
@@ -130,10 +32,7 @@ files:
 - lib/weather-report/day.rb
 - lib/weather-report/version.rb
 - lib/weather-report/weather.rb
-- test/test_day.rb
-- test/test_helper.rb
-- test/test_weather-report.rb
-- test/test_weather.rb
+- sig/day.rbs
 - weather-report.gemspec
 homepage: https://github.com/zakuni/weather-report
 licenses:
@@ -147,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -157,9 +56,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: A Ruby client of Livedoor Weather Web Service.
-test_files:
-- test/test_day.rb
-- test/test_helper.rb
-- test/test_weather-report.rb
-- test/test_weather.rb
+summary: A Ruby client of 天気予報 API(https://weather.tsukumijima.net/).
+test_files: []

data/test/test_day.rb

@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require File.expand_path 'test_helper', File.dirname(__FILE__)
-
-class TestDay < MiniTest::Unit::TestCase
-  include WeatherReport
-
-  def setup
-    city_id = Weather.request_cityid("東京")
-    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
-  end
-
-  def test_telop
-    assert_respond_to @day, :telop
-    assert_instance_of String, @day.telop
-  end
-
-  def test_temperature_min
-    assert_respond_to @day, :temperature_min
-    assert [Fixnum, NilClass].include? @day.temperature_min.class
-  end
-
-  def test_temperature_max
-    assert_respond_to @day, :temperature_max
-    assert [Fixnum, NilClass].include? @day.temperature_max.class
-  end
-
-  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

@@ -1,9 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'minitest/pride'
-
-$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
-require 'weather-report'
-
-MiniTest::Reporters.use! [MiniTest::Reporters::DefaultReporter.new]

data/test/test_weather-report.rb

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require File.expand_path 'test_helper', File.dirname(__FILE__)
-
-class TestWeatherReport < MiniTest::Unit::TestCase
-  
-  def test_get
-    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

@@ -1,61 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require File.expand_path 'test_helper', File.dirname(__FILE__)
-
-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_link
-    assert_respond_to @weather, :link
-    assert_instance_of String, @weather.link
-  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(ArgumentError) do
-      Weather.request_cityid(nil)
-    end
-    assert_raises(NoCityError) do
-      Weather.request_cityid("存在しない街")
-    end
-  end
-
-  def test_to_h
-    assert_respond_to @weather, :to_h
-  end
-end