weather-api 1.1.1 → 1.2.0

data/spec/lib/atmosphere_spec.rb

@@ -2,19 +2,18 @@ require 'spec_helper'
 
 describe Weather::Atmosphere, :vcr do
   let(:response) { Weather.lookup 9848 }
-
-  subject { response.atmosphere }
+  let(:atmosphere) { response.atmosphere }
 
   it 'should contain a string indicating barometric pressure' do
-    expect(subject.barometer).to be_a String
+    expect(atmosphere.barometer).to be_a String
   end
 
   it 'should contain integers representing humidity and visibility' do
-    expect(subject.humidity).to be_a Integer
-    expect(subject.visibility).to be_a Integer
+    expect(atmosphere.humidity).to be_a Integer
+    expect(atmosphere.visibility).to be_a Integer
   end
 
   it 'should contain a float indicating atmospheric pressure' do
-    expect(subject.pressure).to be_a Float
+    expect(atmosphere.pressure).to be_a Float
   end
 end

data/spec/lib/condition_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 
 describe Weather::Condition, :vcr do
   let(:response) { Weather.lookup 9848 }
-
-  subject { response.condition }
+  let(:condition) { response.condition }
 
   it 'should contain a weather condition code, a date, a temperature, and a description' do
-    expect(subject.code).to be_a Integer
-    expect(subject.date).to be_a Time
-    expect(subject.temp).to be_a Integer
-    expect(subject.text).to be_a String
+    expect(condition.code).to be_a Integer
+    expect(condition.date).to be_a Time
+    expect(condition.temp).to be_a Integer
+    expect(condition.text).to be_a String
   end
 end

data/spec/lib/forecast_spec.rb

@@ -2,27 +2,26 @@ require 'spec_helper'
 
 describe Weather::Forecast, :vcr do
   let(:response) { Weather.lookup 9848 }
-
-  subject { response.forecasts[0] }
+  let(:forecast) { response.forecasts[0] }
 
   it 'should have an associated date' do
-    expect(subject.date).to be_a Time
+    expect(forecast.date).to be_a Time
   end
 
   it 'should contain high and low forecasts' do
-    expect(subject.high).to be_a Integer
-    expect(subject.low).to be_a Integer
+    expect(forecast.high).to be_a Integer
+    expect(forecast.low).to be_a Integer
   end
 
   it 'should contain the name of the day associated with the forecast' do
-    expect(subject.day).to be_a String
+    expect(forecast.day).to be_a String
   end
 
   it 'should have a weather condition code' do
-    expect(subject.code).to be_a Integer
+    expect(forecast.code).to be_a Integer
   end
 
   it 'should have a brief description of the forecasted conditions' do
-    expect(subject.text).to be_a String
+    expect(forecast.text).to be_a String
   end
 end

data/spec/lib/image_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe Weather::Image, :vcr do
   let(:response) { Weather.lookup 9848 }
-
-  subject { response.image }
+  let(:image) { response.image }
 
   it 'should contain a string for the image url' do
-    expect(subject.url).to be_a String
+    expect(image.url).to be_a String
   end
 end

data/spec/lib/response_spec.rb

@@ -2,56 +2,59 @@ require 'spec_helper'
 
 describe Weather::Response, :vcr do
   let(:response) { Weather.lookup 9848 }
-
-  subject { response }
+  let(:invalid_response) { Weather.lookup 8888888888 }
 
   it 'should contain a Weather::Astronomy object' do
-    expect(subject.astronomy).to be_a Weather::Astronomy
+    expect(response.astronomy).to be_a Weather::Astronomy
   end
 
   it 'should contain a Weather::Location object' do
-    expect(subject.location).to be_a Weather::Location
+    expect(response.location).to be_a Weather::Location
   end
 
   it 'should contain a Weather::Units object' do
-    expect(subject.units).to be_a Weather::Units
+    expect(response.units).to be_a Weather::Units
   end
 
   it 'should contain a Weather::Wind object' do
-    expect(subject.wind).to be_a Weather::Wind
+    expect(response.wind).to be_a Weather::Wind
   end
 
   it 'should contain a Weather::Atmosphere object' do
-    expect(subject.atmosphere).to be_a Weather::Atmosphere
+    expect(response.atmosphere).to be_a Weather::Atmosphere
   end
 
   it 'should contain a Weather::Condition object' do
-    expect(subject.condition).to be_a Weather::Condition
+    expect(response.condition).to be_a Weather::Condition
   end
 
   it 'should contain a collection of Weather::Forecast objects' do
-    expect(subject.forecasts[0]).to be_a Weather::Forecast
+    expect(response.forecasts[0]).to be_a Weather::Forecast
   end
 
   it 'should contain a Weather::Image object' do
-    expect(subject.image).to be_a Weather::Image
+    expect(response.image).to be_a Weather::Image
   end
 
   it 'should contain the WOEID of the request location and the requested URL' do
-    expect(subject.request_location).to eq 9848
-    expect(subject.request_url).to eq "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%3D9848%20and%20u%3D'f'&format=json"
+    expect(response.request_location).to eq 9848
+    expect(response.request_url).to eq "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%3D9848%20and%20u%3D'c'&format=json"
+  end
+
+  it 'should return a RuntimeError for an invalid WOEID' do
+    expect { invalid_response.location }.to raise_error(RuntimeError, /Failed to get weather/i)
   end
 
   it 'should contain a HTML description summarizing weather conditions' do
-    expect(subject.description).to be_a String
+    expect(response.description).to be_a String
   end
 
   it 'should contain a String title' do
-    expect(subject.title).to be_a String
+    expect(response.title).to be_a String
   end
 
   it 'should contain latitude and longitude in floats' do
-    expect(subject.latitude).to be_a Float
-    expect(subject.longitude).to be_a Float
+    expect(response.latitude).to be_a Float
+    expect(response.longitude).to be_a Float
   end
 end

data/spec/lib/units_spec.rb

@@ -2,29 +2,29 @@ require 'spec_helper'
 
 describe Weather::Units do
   describe 'constants' do
-    it 'should have constants for celsius and farenheit' do
-      expect(Weather::Units::FARENHEIT).to eq 'f'
+    it 'should have constants for celsius and fahrenheit' do
+      expect(Weather::Units::FAHRENHEIT).to eq 'f'
       expect(Weather::Units::CELSIUS).to eq 'c'
     end
   end
 
   describe 'defaults', :vcr do
-    it 'should default to imperial units' do
+    it 'should default to metric units' do
       response = Weather.lookup 9848
 
-      expect(response.units.distance).to eq 'mi'
-      expect(response.units.pressure).to eq 'in'
-      expect(response.units.speed).to eq 'mph'
-      expect(response.units.temperature).to eq 'F'
-    end
-
-    it 'should switch to metric if specified' do
-      response = Weather.lookup 9848, 'c'
-
       expect(response.units.distance).to eq 'km'
       expect(response.units.pressure).to eq 'mb'
       expect(response.units.speed).to eq 'km/h'
       expect(response.units.temperature).to eq 'C'
     end
+
+    it 'should switch to imperial if specified' do
+      response = Weather.lookup 9848, Weather::Units::FAHRENHEIT
+
+      expect(response.units.distance).to eq 'mi'
+      expect(response.units.pressure).to eq 'in'
+      expect(response.units.speed).to eq 'mph'
+      expect(response.units.temperature).to eq 'F'
+    end
   end
 end

data/spec/lib/wind_spec.rb

@@ -2,12 +2,11 @@ require 'spec_helper'
 
 describe Weather::Wind, :vcr do
   let(:response) { Weather.lookup 9848 }
-
-  subject { response.wind }
+  let(:wind) { response.wind }
 
   it 'should contain chill, direction, and speed as integers' do
-    expect(subject.chill).to be_a Integer
-    expect(subject.direction).to be_a Integer
-    expect(subject.speed).to be_a Integer
+    expect(wind.chill).to be_a Integer
+    expect(wind.direction).to be_a Integer
+    expect(wind.speed).to be_a Integer
   end
 end

data/weather-api.gemspec

@@ -1,25 +1,27 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path '../lib/weather-api/version', __FILE__
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Andrew Stewart"]
-  gem.email         = ["andrew@averagestudios.com"]
-  gem.description   = %q{A wrapper for the Yahoo! Weather XML RSS feed}
-  gem.summary       = %q{Weather-API provides an object-oriented interface to
+Gem::Specification.new do |spec|
+  spec.name          = "weather-api"
+  spec.version       = Weather::VERSION
+  spec.authors       = ["Andrew Stewart"]
+  spec.email         = ["andrew@stwrt.com"]
+  spec.description   = %q{A wrapper for the Yahoo! Weather XML RSS feed}
+  spec.summary       = %q{Weather-API provides an object-oriented interface to
                          the Yahoo! Weather XML RSS feed service.}
-  gem.homepage      = "https://github.com/stewart/weather-api"
+  spec.homepage      = "https://github.com/stewart/weather-api"
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "weather-api"
-  gem.require_paths = ["lib"]
-  gem.version       = Weather::VERSION
+  spec.files         = `git ls-files`.split($\)
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_dependency "chronic", "~> 0.10.2"
-  gem.add_dependency "map", "~> 6.5.1"
-  gem.add_development_dependency "rspec", "~> 2.14.1"
-  gem.add_development_dependency "webmock", "~> 1.13.0"
-  gem.add_development_dependency "rake", "~> 10.1.0"
-  gem.add_development_dependency "vcr", "~> 2.6.0"
+  spec.add_dependency "chronic", "~> 0.10.2"
+  spec.add_dependency "map", "~> 6.5.1"
+  spec.add_dependency "json"
+  spec.add_development_dependency "rspec", "~> 2.14.1"
+  spec.add_development_dependency "webmock", "~> 1.13.0"
+  spec.add_development_dependency "rake", "~> 10.1.0"
+  spec.add_development_dependency "vcr", "~> 2.6.0"
 end

metadata

@@ -1,108 +1,122 @@
 --- !ruby/object:Gem::Specification
 name: weather-api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 6.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 6.5.1
+- !ruby/object:Gem::Dependency
+  name: json
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 description: A wrapper for the Yahoo! Weather XML RSS feed
 email:
-- andrew@averagestudios.com
+- andrew@stwrt.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -146,7 +160,10 @@ files:
 - spec/fixtures/cassettes/Weather_Response/should_contain_a_collection_of_Weather_Forecast_objects.yml
 - spec/fixtures/cassettes/Weather_Response/should_contain_latitude_and_longitude_in_floats.yml
 - spec/fixtures/cassettes/Weather_Response/should_contain_the_WOEID_of_the_request_location_and_the_requested_URL.yml
+- spec/fixtures/cassettes/Weather_Response/should_return_a_RuntimeError_for_an_invalid_WOEID.yml
 - spec/fixtures/cassettes/Weather_Units/defaults/should_default_to_imperial_units.yml
+- spec/fixtures/cassettes/Weather_Units/defaults/should_default_to_metric_units.yml
+- spec/fixtures/cassettes/Weather_Units/defaults/should_switch_to_imperial_if_specified.yml
 - spec/fixtures/cassettes/Weather_Units/defaults/should_switch_to_metric_if_specified.yml
 - spec/fixtures/cassettes/Weather_Wind/should_contain_chill_direction_and_speed_as_integers.yml
 - spec/lib/astronomy_spec.rb
@@ -163,7 +180,8 @@ files:
 - spec/spec_helper.rb
 - weather-api.gemspec
 homepage: https://github.com/stewart/weather-api
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,17 +189,17 @@ 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.1.5
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Weather-API provides an object-oriented interface to the Yahoo! Weather XML
@@ -214,7 +232,10 @@ test_files:
 - spec/fixtures/cassettes/Weather_Response/should_contain_a_collection_of_Weather_Forecast_objects.yml
 - spec/fixtures/cassettes/Weather_Response/should_contain_latitude_and_longitude_in_floats.yml
 - spec/fixtures/cassettes/Weather_Response/should_contain_the_WOEID_of_the_request_location_and_the_requested_URL.yml
+- spec/fixtures/cassettes/Weather_Response/should_return_a_RuntimeError_for_an_invalid_WOEID.yml
 - spec/fixtures/cassettes/Weather_Units/defaults/should_default_to_imperial_units.yml
+- spec/fixtures/cassettes/Weather_Units/defaults/should_default_to_metric_units.yml
+- spec/fixtures/cassettes/Weather_Units/defaults/should_switch_to_imperial_if_specified.yml
 - spec/fixtures/cassettes/Weather_Units/defaults/should_switch_to_metric_if_specified.yml
 - spec/fixtures/cassettes/Weather_Wind/should_contain_chill_direction_and_speed_as_integers.yml
 - spec/lib/astronomy_spec.rb