accuweather 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124f2a15ba49358b7e5295744cfcd0e57f2966c7
-  data.tar.gz: c1d023b93d04c8d304eb88307118dc1b9350ba69
+  metadata.gz: 1549fa0380c0b2be4d6cf1ff807a1538bcd7db79
+  data.tar.gz: 3efea0be0d68e3fee8c74d0e6913bda363dc09c2
 SHA512:
-  metadata.gz: 0580cc1e46e4e32bdca467d0cc04aa562c2828e3ec6d0f619ad410755b4180b8ceeb57166b2a87c71f3320a75bd523503a27d5b7a4dc141f57e373980f5e1506
-  data.tar.gz: d30676ac42391f4f43d91ca24c90e50c883c37f63dbec17860d0d08087c32da3d92cf83522233e3ee82923540a40085bc388163681ea39dc360bdae466d3dc44
+  metadata.gz: 4d19950635990297ebca3b83f59adb867f73b2d7baee1029ed799ec87cef39872df819ddf3a4c05e6351f320905ec7bb1bb96e1c9626f463dbef536cf91b7f80
+  data.tar.gz: 93a6ead68387820cb2cee8496f7f622b960675ba85b91f4d78fb86f1d1dee38e47c77d56bf2fd85c4722bb1ab864e6efdb0281e5aadf5cce30d6bc36187538f9

data/README.md

@@ -1,7 +1,8 @@
 # Accuweather
 
-Get weather information for cities around the world using the accuweather API. Includes
-temperature, pressure, humidity, weather text and GPS coordinates.
+A simple wrapper around the accuweather web API written in Ruby
+
+Get weather information for cities around the world. Includes current current conditions for temperature, pressure and humidity. Forecasts include temperature highs, lows, "real feels", UV, wind speed and direction, rain, snow, ice probabilities and amounts. The web API returns seven days of forecasts with estimates for both day and nighttime.
 
 ## Installation
 
@@ -21,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 
-Search for an accuweather location:
+Search for a city location to determine its id:
 
 ```ruby
 location_array = Accuweather.city_search(name: 'vancouver')
@@ -61,9 +62,7 @@ weather_forecast.map(&:daytime).map(&:high_temperature)  # => ["45", "45", "47",
 weather_forecast.map(&:nighttime).map(&:low_temperature) # => ["27", "28", "31", "32", "40", "42", "36"]
 ```
 
-Here is a full list of attributes for daytime and nighttime forecasts:
-
-`weather_text`,`weather_text_long`,`weather_icon`,`high_temperature`,`low_temperature`,`real_feel_high`,`real_feel_low`,`wind_speed`,`wind_direction`,`wind_gust`,`max_uv`,`rain_amount`,`snow_amount`,`ice_amount`,`precipitation_amount`,`thunderstorm_probability`,`rain_probability`,`snow_probability`,`ice_probability` and `precipitation_probability`
+See `Accuview::Conditions::ForecastWeather` class for a full list of attributes for daytime and nighttime forecasts.
 
 Get the units for the conditions:
 
@@ -83,7 +82,7 @@ local.time_zone              # => '-8'
 local.time_zone_abbreviation # => 'PST'
 ```
 
-Imperial units are returned by default, but metric results are available:
+English units are returned by default, but metric results are available:
 
 ```ruby
 Accuweather.get_conditions(location_id: 'cityId:53286', metric: true)

data/accuweather.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Access current and future weather reports for cities around the world'
   spec.description   = 'Get weather information for cities around the world using the accuweather web API. Includes current current conditions for temperature, pressure and humidity. Forecasts include temperature highs, lows, "real feels", UV, wind speed, rain, snow, ice probabilities and amounts.'
   spec.homepage      = 'https://github.com/nick-aschenbach/accuweather'
+  spec.licenses      = ['MIT']
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
@@ -20,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
 
-  spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
 end

data/lib/accuweather.rb

@@ -1,5 +1,6 @@
 require 'accuweather/version'
 require 'accuweather/location/city'
+require 'accuweather/location/cache'
 require 'accuweather/location/parser'
 require 'accuweather/conditions/parser'
 require 'accuweather/conditions/units'
@@ -12,13 +13,19 @@ require 'net/http'
 require 'nokogiri'
 
 module Accuweather
+  class Error < StandardError; end
+
   def self.city_search(name:)
+    @cache ||= Accuweather::Location::Cache.new
+    cache_result = @cache.cities(name: name)
+    return cache_result unless cache_result == []
+
     response = Net::HTTP.get('samsungmobile.accu-weather.com',
                              "/widget/samsungmobile/city-find.asp?returnGeoPosition=1&location=#{name}")
 
     Accuweather::Location::Parser.new(response).cities
-  rescue StandardError
-    []
+  rescue StandardError => e
+    raise Accuweather::Error.new("#{e.class}: #{e.message}")
   end
 
   def self.get_conditions(location_id:, metric: false)
@@ -27,7 +34,7 @@ module Accuweather
                              "/widget/samsungmobile/weather-data.asp?metric=#{metric_value}&location=#{location_id}")
 
     Accuweather::Conditions::Parser.new(response)
-  rescue StandardError
-    nil
+  rescue StandardError => e
+    raise Accuweather::Error.new("#{e.class}: #{e.message}")
   end
 end

data/lib/accuweather/location/cache.rb

@@ -0,0 +1,28 @@
+module Accuweather
+  module Location
+    class Cache
+      CITIES_CSV_FILE = File.join(File.dirname(__dir__), '..', '..', 'assets', 'cities.z')
+
+      def initialize
+        csv_data = Zlib::Inflate.inflate(File.read(CITIES_CSV_FILE))
+
+        @city_data = {}
+        csv_data.split("\n").each do |line|
+          line_data = line.split('|')
+          arr = @city_data[line_data[1].downcase]
+          arr = [] if arr.nil?
+          arr << Accuweather::Location::City.new(id: line_data[0],
+                                                 city: line_data[1],
+                                                 state: line_data[2],
+                                                 latitude: line_data[3],
+                                                 longitude: line_data[4])
+          @city_data[line_data[1].downcase] = arr
+        end
+      end
+
+      def cities(name:)
+        @city_data.fetch(name.downcase, [])
+      end
+    end
+  end
+end

data/lib/accuweather/version.rb

@@ -1,3 +1,3 @@
 module Accuweather
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accuweather
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Nick Aschenbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: Get weather information for cities around the world using the accuweather
   web API. Includes current current conditions for temperature, pressure and humidity.
   Forecasts include temperature highs, lows, "real feels", UV, wind speed, rain, snow,
@@ -85,6 +85,7 @@ files:
 - README.md
 - Rakefile
 - accuweather.gemspec
+- assets/cities.z
 - bin/console
 - bin/setup
 - lib/accuweather.rb
@@ -94,11 +95,13 @@ files:
 - lib/accuweather/conditions/local.rb
 - lib/accuweather/conditions/parser.rb
 - lib/accuweather/conditions/units.rb
+- lib/accuweather/location/cache.rb
 - lib/accuweather/location/city.rb
 - lib/accuweather/location/parser.rb
 - lib/accuweather/version.rb
 homepage: https://github.com/nick-aschenbach/accuweather
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Access current and future weather reports for cities around the world