accuweather 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f3ee685b1cd0ac59857ca0e30c05303a629b7e
-  data.tar.gz: 5e37439f9fff9227179b52aca21a75670b2425d3
+  metadata.gz: bc7bfc4757609cb611775de025b9612c43913cbd
+  data.tar.gz: 630af49fdd6319f9016b1ae43955e979f19d1d34
 SHA512:
-  metadata.gz: 4aee4ca65e116409bf9dde962658f5e188ed815241421a98fcb6941d802a749b092f30738dac251f4a46b932c0b3e47c4f64253ddbc7e33c558df83615cd477d
-  data.tar.gz: 5e051ade5ab455035db25aeb4186001175bed0b03b959400355ebd0ba2b7f1af6aa5bcb6451ed32f213b2a61279ba3899500aea0c91512b9fceec4fd0af35182
+  metadata.gz: e7b5678dc93483e02ad3cc0f4b73ddeeff09266f43888ad663583684a9b21b5f2b6e6d7a7dc9eb24b3511f1f9d2a2626a7126efa54a934ee212a4664e4b305cf
+  data.tar.gz: d74ea8bf168345691bffeea22b9171911d3f180bf63f0b75603776c1f8afd881bdd25f4a9cbbd1930ef07f95a86eba795c79b0ba361cffcab421646d6c93b030

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 Search for an accuweather location:
 
 ```ruby
-location_array = Accuweather.city_search('vancouver') # returns an array
+location_array = Accuweather.city_search(name: 'vancouver')
 vancouver = location_array.first
 
 vancouver.id        # => 'cityId:53286'
@@ -37,7 +37,7 @@ vancouver.longitude # => '123.1154'
 Search for weather conditions for a given location id:
 
 ```ruby
-current_weather = Accuweather.get_conditions('cityId:53286').current
+current_weather = Accuweather.get_conditions(location_id: 'cityId:53286').current
 current_weather.temperature    # => '41'
 current_weather.weather_text   # => 'Partly Sunny'
 current_weather.pressure       # => '30.35'
@@ -48,27 +48,33 @@ current_weather.cloud_cover    # => '40%'
 Get the units for the conditions:
 
 ```ruby
-units = Accuweather.get_conditions('cityId:53286').units
-units.temp  # => 'F'
-units.dist  # => 'MI'
-units.speed # => 'MPH'
+units = Accuweather.get_conditions(location_id: 'cityId:53286').units
+units.temperature  # => 'F'
+units.distance     # => 'MI'
+units.speed        # => 'MPH'
 ```
 
 Get more information on the location including time and time zone:
 
 ```ruby
-local = Accuweather.get_conditions('cityId:53286').local
+local = Accuweather.get_conditions(location_id: 'cityId:53286').local
 local.time                   # => '13:41'
 local.time_zone              # => '-8'
 local.time_zone_abbreviation # => 'PST'
 ```
 
+Imperial units are returned by default, but metric results are available:
+
+```ruby
+Accuweather.get_conditions(location_id: 'cityId:53286', metric: true)
+```
+
 Each `Accuweather::Conditions` object implements a `to_s` method that displays all attribute
 name, value pairs. This makes it easy to explore the API. For example:
 
 ```ruby
-Accuweather.get_conditions('cityId:53286').local.to_s
-# => "city: Vancouver, state: British Columbia, lat: 49.2448, lon: -123.1154, time: 13:41, time_zone: -8, obs_daylight: 0, current_gmt_offset: -8, time_zone_abbreviation: PST"
+Accuweather.get_conditions(location_id: 'cityId:53286').local.to_s
+# => "city: Vancouver, state: British Columbia, latitude: 49.2448, longitude: -123.1154, time: 16:58, time_zone: -8, obs_daylight: 0, current_gmt_offset: -8, time_zone_abbreviation: PST"
 ```
 
 ## Development

data/lib/accuweather.rb

@@ -1,5 +1,6 @@
 require 'accuweather/version'
-require 'accuweather/location'
+require 'accuweather/location/city'
+require 'accuweather/location/parser'
 require 'accuweather/conditions/parser'
 require 'accuweather/conditions/units'
 require 'accuweather/conditions/local'
@@ -9,26 +10,19 @@ require 'net/http'
 require 'nokogiri'
 
 module Accuweather
-  def self.city_search(name)
+  def self.city_search(name:)
     response = Net::HTTP.get('samsungmobile.accu-weather.com',
                              "/widget/samsungmobile/city-find.asp?returnGeoPosition=1&location=#{name}")
 
-
-    xml = Nokogiri::XML.parse(response)
-    xml.css('location').map do |location|
-      Accuweather::Location.new(id: location.attr('location'),
-                                city: location.attr('city'),
-                                state: location.attr('state'),
-                                latitude: location.attr('latitude'),
-                                longitude: location.attr('longitude'))
-    end
+    Accuweather::Location::Parser.new(response).cities
   rescue StandardError
     []
   end
 
-  def self.get_conditions(location_id)
+  def self.get_conditions(location_id:, metric: false)
+    metric_value = metric ? '1' : '0'
     response = Net::HTTP.get('samsungmobile.accu-weather.com',
-                             "/widget/samsungmobile/weather-data.asp?metric=0&location=#{location_id}")
+                             "/widget/samsungmobile/weather-data.asp?metric=#{metric_value}&location=#{location_id}")
 
     Accuweather::Conditions::Parser.new(response)
   rescue StandardError

data/lib/accuweather/conditions/local.rb

@@ -1,13 +1,13 @@
 module Accuweather
   module Conditions
     class Local
-      attr_reader :city, :state, :lat, :lon, :time, :time_zone, :obs_daylight, :current_gmt_offset, :time_zone_abbreviation
+      attr_reader :city, :state, :latitude, :longitude, :time, :time_zone, :obs_daylight, :current_gmt_offset, :time_zone_abbreviation
 
-      def initialize(city:, state:, lat:, lon:, time:, time_zone:, obs_daylight:, current_gmt_offset:, time_zone_abbreviation:)
+      def initialize(city:, state:, latitude:, longitude:, time:, time_zone:, obs_daylight:, current_gmt_offset:, time_zone_abbreviation:)
         @city = city
         @state = state
-        @lat = lat
-        @lon = lon
+        @latitude = latitude
+        @longitude = longitude
         @time = time
         @time_zone = time_zone
         @obs_daylight = obs_daylight
@@ -18,8 +18,8 @@ module Accuweather
       def ==(other)
         city == other.city &&
           state == other.state &&
-          lat == other.lat &&
-          lon == other.lon &&
+          latitude == other.latitude &&
+          longitude == other.longitude &&
           time == other.time &&
           time_zone == other.time_zone &&
           obs_daylight == other.obs_daylight &&
@@ -30,7 +30,7 @@ module Accuweather
       end
 
       def to_s
-        "city: #{city}, state: #{state}, lat: #{lat}, lon: #{lon}, time: #{time}, time_zone: #{time_zone}, obs_daylight: #{obs_daylight}, current_gmt_offset: #{current_gmt_offset}, time_zone_abbreviation: #{time_zone_abbreviation}"
+        "city: #{city}, state: #{state}, latitude: #{latitude}, longitude: #{longitude}, time: #{time}, time_zone: #{time_zone}, obs_daylight: #{obs_daylight}, current_gmt_offset: #{current_gmt_offset}, time_zone_abbreviation: #{time_zone_abbreviation}"
       end
     end
   end

data/lib/accuweather/conditions/parser.rb

@@ -7,19 +7,19 @@ module Accuweather
 
       def units
         units = @doc.css('units').first
-        Accuweather::Conditions::Units.new(temp: units.css('temp').text,
-                                           dist: units.css('dist').text,
+        Accuweather::Conditions::Units.new(temperature: units.css('temp').text,
+                                           distance: units.css('dist').text,
                                            speed: units.css('speed').text,
-                                           pres: units.css('pres').text,
-                                           prec: units.css('prec').text)
+                                           pressure: units.css('pres').text,
+                                           precipitation: units.css('prec').text)
       end
 
       def local
         local = @doc.css('local').first
         Accuweather::Conditions::Local.new(city: local.css('city').text,
                                            state: local.css('state').text,
-                                           lat: local.css('lat').text,
-                                           lon: local.css('lon').text,
+                                           latitude: local.css('lat').text,
+                                           longitude: local.css('lon').text,
                                            time: local.css('time').text,
                                            time_zone: local.css('timeZone').text,
                                            obs_daylight: local.css('obsDaylight').text.strip,

data/lib/accuweather/conditions/units.rb

@@ -1,28 +1,28 @@
 module Accuweather
   module Conditions
     class Units
-      attr_reader :temp, :dist, :speed, :pres, :prec
+      attr_reader :temperature, :distance, :speed, :pressure, :precipitation
 
-      def initialize(temp:, dist:, speed:, pres:, prec:)
-        @temp = temp
-        @dist = dist
+      def initialize(temperature:, distance:, speed:, pressure:, precipitation:)
+        @temperature = temperature
+        @distance = distance
         @speed = speed
-        @pres = pres
-        @prec = prec
+        @pressure = pressure
+        @precipitation = precipitation
       end
 
       def ==(other)
-        temp == other.temp &&
-          dist == other.dist &&
+        temperature == other.temperature &&
+          distance == other.distance &&
           speed == other.speed &&
-          pres == other.pres &&
-          prec == other.prec
+          pressure == other.pressure &&
+          precipitation == other.precipitation
       rescue NoMethodError
         false
       end
 
       def to_s
-        "temp: #{temp}, dist: #{dist}, speed: #{speed}, pres: #{pres}, prec: #{prec}"
+        "temperature: #{temperature}, distance: #{distance}, speed: #{speed}, pressure: #{pressure}, precipitation: #{precipitation}"
       end
     end
   end

data/lib/accuweather/location/city.rb

@@ -0,0 +1,29 @@
+module Accuweather
+  module Location
+    class City
+      attr_reader :id, :city, :state, :latitude, :longitude
+
+      def initialize(id:, city:, state:, latitude:, longitude:)
+        @id = id
+        @city = city
+        @state = state
+        @latitude = latitude
+        @longitude = longitude
+      end
+
+      def ==(other)
+        id == other.id &&
+          city == other.city &&
+          state == other.state &&
+          latitude == other.latitude &&
+          longitude == other.longitude
+      rescue NoMethodError
+        false
+      end
+
+      def to_s
+        "id: #{id}, city: #{city}, state: #{state}, latitude: #{latitude}, longitude: #{longitude}"
+      end
+    end
+  end
+end

data/lib/accuweather/location/parser.rb

@@ -0,0 +1,19 @@
+module Accuweather
+  module Location
+    class Parser
+      def initialize(response)
+        @doc = Nokogiri::XML.parse(response)
+      end
+
+      def cities
+        @doc.css('location').map do |location|
+          Accuweather::Location::City.new(id: location.attr('location'),
+                                          city: location.attr('city'),
+                                          state: location.attr('state'),
+                                          latitude: location.attr('latitude'),
+                                          longitude: location.attr('longitude'))
+        end
+      end
+    end
+  end
+end

data/lib/accuweather/version.rb

@@ -1,3 +1,3 @@
 module Accuweather
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accuweather
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Aschenbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,8 @@ files:
 - lib/accuweather/conditions/local.rb
 - lib/accuweather/conditions/parser.rb
 - lib/accuweather/conditions/units.rb
-- lib/accuweather/location.rb
+- lib/accuweather/location/city.rb
+- lib/accuweather/location/parser.rb
 - lib/accuweather/version.rb
 homepage: https://github.com/nick-aschenbach/accuweather
 licenses: []

data/lib/accuweather/location.rb

@@ -1,27 +0,0 @@
-module Accuweather
-  class Location
-    attr_reader :id, :city, :state, :latitude, :longitude
-
-    def initialize(id:, city:, state:, latitude:, longitude:)
-      @id = id
-      @city = city
-      @state = state
-      @latitude = latitude
-      @longitude = longitude
-    end
-
-    def ==(other)
-      id == other.id &&
-        city == other.city &&
-        state == other.state &&
-        latitude == other.latitude &&
-        longitude == other.longitude
-    rescue NoMethodError
-      false
-    end
-
-    def to_s
-      "id: #{id}, city: #{city}, state: #{state}, latitude: #{latitude}, longitude: #{longitude}"
-    end
-  end
-end