weather-report 0.3.5 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c875ad79a6273a3ae783c2313fed32da33d4944d
-  data.tar.gz: b1cf98f6afb7f6fa2cfad698b49734f57b7b6dd7
+SHA256:
+  metadata.gz: 940926ddd30861ac84a28085e33ea3a5545b26c8e6594bfe95f385bc4cd02968
+  data.tar.gz: 91d5683c8c07b435493f0e8a6f676360e96b9f48625ca2b761837eda78795e1d
 SHA512:
-  metadata.gz: d9bcdae7626f0a63ec77f6558d3e338043ea5152bcfb58e5a6ac86bd44efb05e8cd71aa825621560d5f1ba95c7605bb1c160b0ba79c21cb5e7e85a5616f3e323
-  data.tar.gz: fd2bf8c73508327ed756e4da2f82af18e8793de8237ecdbc42e3f7ac92301b1a449c547950100f6629153ed5ee49eff991da3a6e7306bd9a95bca34e7b9ec9e9
+  metadata.gz: 63da6c9c80a1b8ca054cb5ed8d5e021505e2f90b8774097817402bb8015a046ab29eeba34a0cdb421c4b40a4bf3aad3f0d134c458efd3056d3a5bdad78189d2b
+  data.tar.gz: 39350cfa70debae80bafe58d4591fed4ccb025a36864dc64fb2d7fc74bcec1d95f537105fcaf3ed75c20efefe3a766bbd8c344158a21add5694f8e3a2fe430cb

data/.gitignore

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

data/.travis.yml

@@ -1,7 +1,12 @@
 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
+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

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    weather-report (0.4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    builder (3.2.4)
+    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)
+      ansi
+      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
+  guard
+  guard-minitest
+  minitest-reporters
+  nokogiri
+  rake
+  rb-fsevent
+  slop (~> 3.6.0)
+  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,42 +1,46 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'rubygems'
-$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
-require 'weather-report'
-require 'optparse'
-require 'ostruct'
 
-options = OpenStruct.new
+require 'bundler/setup'
+require 'weather-report'
+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
+  on :v, :version, "Show version" do
     puts "weather-report v#{WeatherReport::VERSION}"
     exit
   end
 end
 
+exit if opts.help?
+
 if ARGV.empty?
-  puts opt_parser.help
-  exit 1
+  puts opts.help
+  exit
 end
 
-city = opt_parser.parse(ARGV)
+city = ARGV
 weather = WeatherReport::Weather.new(WeatherReport::Weather.request_cityid(*city))
 
 [weather.today, weather.tomorrow, weather.day_after_tomorrow].each do |day|
-  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
+  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(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"]
+    }
+  end
 end

data/lib/weather-report/day.rb

@@ -5,8 +5,19 @@ module WeatherReport
     attr_reader :date, :telop, :temperature_min, :temperature_max
 
     def initialize(forecasts, dateLabel)
-      @forecast = forecast(forecasts, dateLabel)
-    end    
+      raise ArgumentError, "dateLabel must be 今日, 明日 or 明後日" unless 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.
     def rain?
@@ -23,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
       {
@@ -64,6 +48,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.5"
+  VERSION = '0.4.2'.freeze
 end

data/lib/weather-report/weather.rb

@@ -5,18 +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(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 WeatherReportError, "It seems like city #{city_name} does not exist.\nPlease look at http://weather.livedoor.com/forecast/rss/primary_area.xml for city list."
-    rescue => e
-      raise WeatherReportError
+      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)
@@ -27,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
@@ -75,7 +74,7 @@ module WeatherReport
     def read
       @response ||= JSON.parse(@uri.read)
     rescue => e
-      raise WeatherReportError
+      raise Error
     end
   end
 end

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_development_dependency "bundler", "~> 1.3"
-  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.3.5
+  version: 0.4.2
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !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:
@@ -117,9 +19,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -129,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:
@@ -144,22 +44,17 @@ require_paths:
 - lib
 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:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+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,54 +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("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_rain?
-    assert_respond_to @day, :rain?
-  end
-
-  def test_snow?
-    assert_respond_to @day, :snow?
-  end
-
-  def test_umbrella?
-    assert_respond_to @day, :umbrella?
-  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
-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,11 +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
-end

data/test/test_weather.rb

@@ -1,58 +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(WeatherReportError) do
-      Weather.request_cityid(nil)
-    end
-  end
-
-  def test_to_h
-    assert_respond_to @weather, :to_h
-  end
-end