weather-forecasts 1.1.1 → 1.2.0

data/spec/lib/ndfd/client/query/select_hourly_query_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe WeatherForecasts::Client::SelectHourlyQuery do
+  let(:conditions) {
+    {
+      :latitude  =>  38.99,
+      :longitude => -77.01
+    }
+  }
+
+  subject { WeatherForecasts.client.select_hourly }
+
+  describe "#execute" do
+    before(:each) do
+      VCR.use_cassette('select_hourly_query') do
+        @response = subject.where(conditions).execute
+      end
+    end
+
+    it "returns a valid response" do
+      @response.should be_a(Hash)
+      @response[:parameters]["point1"][:temperature][:hourly][:values].first[:value].should be_a(Numeric)
+    end
+  end
+end

data/weather-forecasts.gemspec

@@ -23,10 +23,12 @@ Gem::Specification.new do |s|
 
   s.executables << 'wf-console'
 
+  s.add_runtime_dependency 'dwml', '~> 1.1.0', '>= 1.1.0'
   s.add_runtime_dependency 'savon', '~> 2.4.0', '>= 2.4.0'
+  s.add_runtime_dependency 'httpi', '~>2.1.0', '>= 2.1.0'
   s.add_runtime_dependency 'nokogiri', '~> 1.6.1', '>= 1.6.1'
   s.add_runtime_dependency 'multi_json', '~> 1.9.0', '>= 1.9.0'
-  s.add_runtime_dependency 'activesupport', '~> 4.0.3', '>= 4.0.3'
+  s.add_runtime_dependency 'activesupport', '~> 4.1.0', '>= 4.1.0'
   s.add_runtime_dependency 'http_logger', '~> 0.4.2', '>= 0.4.2'
 
   s.post_install_message = "To start querying weather forecasts immediately, type `wf-console`."

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: weather-forecasts
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Angelo Lakra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dwml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: httpi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -76,20 +116,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: http_logger
   requirement: !ruby/object:Gem::Requirement
@@ -140,22 +180,18 @@ files:
 - lib/weather_forecasts/client/query/select_coordinates_by_zip_query.rb
 - lib/weather_forecasts/client/query/select_corner_coordinates_query.rb
 - lib/weather_forecasts/client/query/select_gridpoint_coordinates_query.rb
+- lib/weather_forecasts/client/query/select_hourly_query.rb
 - lib/weather_forecasts/client/query/select_linepoint_coordinates_query.rb
 - lib/weather_forecasts/client/query/select_query.rb
 - lib/weather_forecasts/client/query/select_square_coordinates_query.rb
 - lib/weather_forecasts/client/query/selection_attributes.rb
 - lib/weather_forecasts/client/version.rb
-- lib/weather_forecasts/dwml.rb
-- lib/weather_forecasts/dwml/data_extractor.rb
-- lib/weather_forecasts/dwml/head_extractor.rb
-- lib/weather_forecasts/dwml/location.rb
-- lib/weather_forecasts/dwml/parameter_extractor.rb
-- lib/weather_forecasts/dwml/time_layout.rb
 - spec/fixtures/vcr_cassettes/select_by_days_query.yml
 - spec/fixtures/vcr_cassettes/select_coordinates_by_cities_query.yml
 - spec/fixtures/vcr_cassettes/select_coordinates_by_zip_query.yml
 - spec/fixtures/vcr_cassettes/select_corner_coordinates_query.yml
 - spec/fixtures/vcr_cassettes/select_gridpoint_coordinates_query.yml
+- spec/fixtures/vcr_cassettes/select_hourly_query.yml
 - spec/fixtures/vcr_cassettes/select_linepoint_coordinates_query.yml
 - spec/fixtures/vcr_cassettes/select_query.yml
 - spec/fixtures/vcr_cassettes/select_square_coordinates_query.yml
@@ -165,6 +201,7 @@ files:
 - spec/lib/ndfd/client/query/select_coordinates_by_zip_query_spec.rb
 - spec/lib/ndfd/client/query/select_corner_coordinates_query_spec.rb
 - spec/lib/ndfd/client/query/select_gridpoint_coordinates_query_spec.rb
+- spec/lib/ndfd/client/query/select_hourly_query_spec.rb
 - spec/lib/ndfd/client/query/select_linepoint_coordinates_query_spec.rb
 - spec/lib/ndfd/client/query/select_query_spec.rb
 - spec/lib/ndfd/client/query/select_square_coordinates_query_spec.rb
@@ -204,6 +241,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/select_coordinates_by_zip_query.yml
 - spec/fixtures/vcr_cassettes/select_corner_coordinates_query.yml
 - spec/fixtures/vcr_cassettes/select_gridpoint_coordinates_query.yml
+- spec/fixtures/vcr_cassettes/select_hourly_query.yml
 - spec/fixtures/vcr_cassettes/select_linepoint_coordinates_query.yml
 - spec/fixtures/vcr_cassettes/select_query.yml
 - spec/fixtures/vcr_cassettes/select_square_coordinates_query.yml
@@ -213,6 +251,7 @@ test_files:
 - spec/lib/ndfd/client/query/select_coordinates_by_zip_query_spec.rb
 - spec/lib/ndfd/client/query/select_corner_coordinates_query_spec.rb
 - spec/lib/ndfd/client/query/select_gridpoint_coordinates_query_spec.rb
+- spec/lib/ndfd/client/query/select_hourly_query_spec.rb
 - spec/lib/ndfd/client/query/select_linepoint_coordinates_query_spec.rb
 - spec/lib/ndfd/client/query/select_query_spec.rb
 - spec/lib/ndfd/client/query/select_square_coordinates_query_spec.rb

data/lib/weather_forecasts/dwml.rb

@@ -1,38 +0,0 @@
-require 'multi_json'
-
-require 'weather_forecasts/dwml/head_extractor'
-require 'weather_forecasts/dwml/data_extractor'
-
-#
-# Note: See http://graphical.weather.gov/xml/mdl/XML/Design/MDL_XML_Design.pdf
-# for authoritative type definitions
-################################################################################
-
-module WeatherForecasts
-  class DWML
-    attr_reader :output, :xmldoc
-
-    def initialize(xmldoc)
-      @xmldoc = xmldoc
-      @output = {}
-    end
-
-    def process
-      build_head
-      build_data
-      output
-    end
-
-    protected
-
-    def build_head
-      extractor = HeadExtractor.new(xmldoc.xpath("//dwml/head").first)
-      @output.merge!(extractor.process)
-    end
-
-    def build_data
-      extractor = DataExtractor.new(xmldoc.xpath("//dwml/data").first)
-      @output.merge!(extractor.process)
-    end
-  end
-end

data/lib/weather_forecasts/dwml/data_extractor.rb

@@ -1,55 +0,0 @@
-require 'weather_forecasts/dwml/location'
-require 'weather_forecasts/dwml/time_layout'
-require 'weather_forecasts/dwml/parameter_extractor'
-
-module WeatherForecasts
-  class DWML
-    class DataExtractor
-      attr_reader :output, :element
-
-      def initialize(element)
-        @element = element
-        @locations = []
-        @time_layouts = []
-        @output = {}
-      end
-
-      def process
-        extract_locations
-        extract_time_layouts
-        extract_parameters
-
-        output
-      end
-
-      protected
-
-      def extract_locations
-        @locations = Location.extract(element.xpath("location"))
-      end
-
-      def extract_time_layouts
-        @time_layouts = TimeLayout.extract(element.xpath("time-layout"))
-      end
-
-      def extract_parameters
-        parameters = element.xpath("parameters")
-
-        @output.merge!(
-          :parameters => parameters.inject({}) do |memo, parameter|
-            location = location_for_parameter(parameter)
-            extractor = ParameterExtractor.new(parameter, location, @time_layouts)
-            memo.merge!(location.location_key => extractor.process)
-            memo
-          end
-        )
-      end
-
-      def location_for_parameter(parameter)
-        @locations.detect do |location|
-          parameter.attributes["applicable-location"].text == location.location_key
-        end
-      end
-    end
-  end
-end

data/lib/weather_forecasts/dwml/head_extractor.rb

@@ -1,49 +0,0 @@
-module WeatherForecasts
-  class DWML
-    class HeadExtractor
-      attr_reader :output, :element
-
-      def initialize(element)
-        @element = element
-        @output = {}
-      end
-
-      def process
-        build_product
-        build_source
-        output
-      end
-
-      protected
-
-      def build_product
-        creation_date = Time.zone.parse(element.xpath('product/creation-date').text)
-
-        @output.merge!(
-          :product => {
-            :title         => element.xpath('product/title').text,
-            :field         => element.xpath('product/field').text,
-            :category      => element.xpath('product/category').text,
-            :creation_date => creation_date
-          }
-        )
-      end
-
-      def build_source
-        sub_center = element.xpath('source/production-center/sub-center').text
-        production_center = element.xpath('source/production-center').text
-
-        @output.merge!(
-          :source => {
-            :more_information => element.xpath('source/more-information').text,
-            :product_center   => production_center.gsub(sub_center, " - #{sub_center}"),
-            :disclaimer       => element.xpath('source/disclaimer').text,
-            :credit           => element.xpath('source/credit').text,
-            :credit_logo      => element.xpath('source/credit-logo').text,
-            :feedback         => element.xpath('source/feedback').text
-          }
-        )
-      end
-    end
-  end
-end

data/lib/weather_forecasts/dwml/location.rb

@@ -1,33 +0,0 @@
-module WeatherForecasts
-  class DWML
-    class Location
-      class << self
-        def extract(elements)
-          elements.map { |element| new(element) }
-        end
-      end
-
-      attr_reader :element, :location_key, :latitude, :longitude
-
-      def initialize(element)
-        @element = element
-
-        extract_key
-        extract_coords
-      end
-
-      protected
-
-      def extract_key
-        @location_key = element.xpath("location-key").first.text
-      end
-
-      def extract_coords
-        point = element.xpath('point').first
-
-        @latitude  = point.attributes["latitude"].text.to_f
-        @longitude = point.attributes["longitude"].text.to_f
-      end
-    end
-  end
-end

data/lib/weather_forecasts/dwml/parameter_extractor.rb

@@ -1,281 +0,0 @@
-module WeatherForecasts
-  class DWML
-    class ParameterExtractor
-      attr_reader :output, :element, :location, :time_layouts
-
-      def initialize(element, location, time_layouts)
-        @element      = element
-        @location     = location
-        @time_layouts = time_layouts
-
-        @output = {
-          :latitude  => location.latitude,
-          :longitude => location.longitude
-        }
-      end
-
-      def process
-        extract_temperatures
-        extract_precipitation
-        extract_wind_speed
-        extract_wind_direction
-        extract_cloud_cover
-        extract_probability_of_precipitation
-        extract_fire_weather
-        extract_convective_hazard
-        extract_climate_anomaly
-        extract_humidity
-        extract_weather
-        extract_conditions_icons
-        extract_hazards
-        extract_water_state
-
-        output
-      end
-
-      protected
-
-      def extract_temperatures
-        extract_basic_time_series(:temperature)
-      end
-
-      def extract_precipitation
-        extract_basic_time_series(:precipitation)
-      end
-
-      def extract_wind_speed
-        extract_basic_time_series(:"wind-speed")
-      end
-
-      def extract_wind_direction
-        extract_basic_time_series(:direction)
-      end
-
-      def extract_cloud_cover
-        extract_basic_time_series(:"cloud-amount")
-      end
-
-      def extract_probability_of_precipitation
-        extract_basic_time_series(:"probability-of-precipitation")
-      end
-
-      def extract_humidity
-        extract_basic_time_series(:humidity)
-      end
-
-      def extract_fire_weather
-        extract_basic_time_series(:"fire-weather")
-      end
-
-      def extract_water_state
-        node = element.xpath("water-state").first
-        return if node.blank?
-
-        @output[:"water-state"] = {}
-        layout = lookup_time_layout(node)
-
-        waves_node = node.xpath("waves").first
-        @output[:"water-state"][:type] = waves_node.attributes["type"].text
-        @output[:"water-state"][:unit] = waves_node.attributes["units"].text
-        @output[:"water-state"][:values] = []
-
-        waves_node.xpath("value").each_with_index do |value, index|
-          @output[:"water-state"][:values] << {
-            :value      => value.text,
-            :start_time => layout.valid_times[index].start
-          }
-        end
-      end
-
-      def extract_hazards
-        node = element.xpath("hazards").first
-        return if node.blank?
-
-        layout = lookup_time_layout(node)
-
-        @output[:hazards] = {
-          :name => node.xpath("name").first.text,
-          :conditions => node.xpath("hazard-conditions").each_with_index.map do |condition_node, index|
-            hazard_node = condition_node.xpath("hazard").first
-            next if hazard_node.blank?
-
-            {
-              :code         => hazard_node.attributes["hazardCode"].text,
-              :phenomena    => hazard_node.attributes["phenomena"].text,
-              :significance => hazard_node.attributes["significance"].text,
-              :type         => hazard_node.attributes["hazardType"].text,
-              :url          => hazard_node.xpath("hazardTextURL").first.text,
-              :start_time   => layout.valid_times[index].start
-            }
-          end.compact
-        }
-      end
-
-      def extract_conditions_icons
-        node = element.xpath("conditions-icon").first
-        return if node.blank?
-
-        layout = lookup_time_layout(node)
-
-        @output[:"conditions-icon"] = {
-          :name  => node.xpath("name").text,
-          :type  => node.attributes["type"].text,
-          :links => node.xpath("icon-link").each_with_index.map do |icon_node, index|
-            {
-              :link        => icon_node.text,
-              :start_time  => layout.valid_times[index].start
-            }
-          end
-        }
-      end
-
-      def extract_convective_hazard
-        return if element.xpath("convective-hazard").blank?
-
-        @output[:"convective-hazard"] ||= {
-          :outlook => { :name => nil, :values => []},
-          :"severe-component" => []
-        }
-
-        extract_convective_hazard_outlook
-        extract_convective_hazard_severity
-      end
-
-      def extract_convective_hazard_outlook
-        outlook_node = element.xpath("convective-hazard/outlook").first
-        layout = lookup_time_layout(outlook_node)
-
-        @output[:"convective-hazard"][:outlook][:name] = outlook_node.xpath("node").text
-
-        outlook_node.xpath("value").each_with_index do |value, index|
-          @output[:"convective-hazard"][:outlook][:values] << {
-            :start_time => layout.valid_times[index].start,
-            :end_time   => layout.valid_times[index].stop,
-            :value      => value.text
-          }
-        end
-      end
-
-      def extract_convective_hazard_severity
-        element.xpath("convective-hazard/severe-component").each do |node|
-          layout = lookup_time_layout(node)
-
-          hsh = {
-            :name   => node.xpath("name").first.text,
-            :type   => node.attributes["type"].text,
-            :unit   => node.attributes["units"].text,
-            :values => node.xpath("value").each_with_index.map do |value, index|
-              {
-                :value      => value.text,
-                :start_time => layout.valid_times[index].start,
-                :end_time   => layout.valid_times[index].stop
-              }
-            end
-          }
-
-          @output[:"convective-hazard"][:"severe-component"] << hsh
-        end
-      end
-
-      def extract_climate_anomaly
-        return if element.xpath("climate-anomaly").blank?
-
-        [:weekly, :monthly, :seasonal].each do |period|
-          element.xpath("climate-anomaly/#{period.to_s}").each_with_index do |node|
-            layout = lookup_time_layout(node)
-            valid_time = layout.valid_times.first
-
-            @output[:"climate-anomaly"] ||= {}
-            @output[:"climate-anomaly"][period] ||= []
-            @output[:"climate-anomaly"][period] << {
-              :name       => node.xpath("name").first.text,
-              :value      => node.xpath("value").first.text,
-              :type       => node.attributes["type"].text,
-              :unit       => node.attributes["units"].text,
-              :start_time => valid_time.start,
-              :end_time   => valid_time.stop
-            }
-          end
-        end
-      end
-
-      def extract_weather
-        node = element.xpath("weather")
-        return if node.blank?
-
-        node.map do |weather_node|
-          @output[:weather] ||= {}
-          @output[:weather][:name] = weather_node.xpath("name").text
-          @output[:weather][:conditions] ||= []
-
-          layout = lookup_time_layout(weather_node)
-
-          weather_node.xpath("weather-conditions").each_with_index do |condition, index|
-            value = condition.xpath("value").first
-            next if value.blank?
-
-            visibility_node = value.xpath("visibility").first
-            visibility = if visibility_node.present? && visibility_node.text.present?
-                           {
-                             :unit => visibility_node.attributes["units"].text,
-                             :value => visibility_node.text.to_f
-                           }
-                         else
-                           ""
-                         end
-
-            hsh = {
-              :start_time     => layout.valid_times[index].start,
-              :coverage       => value.attributes["coverage"].text,
-              :intensity      => value.attributes["intensity"].text,
-              :"weather-type" => value.attributes["weather-type"].text,
-              :qualifier      => value.attributes["qualifier"].text,
-              :visibility     => visibility
-            }
-
-            additive = value.attributes["additive"]
-            hsh.merge!(:additive => additive) if additive.present?
-
-            @output[:weather][:conditions] << hsh
-          end
-        end
-      end
-
-      def extract_basic_time_series(metric)
-        metric_node = element.xpath(metric.to_s)
-        return if metric_node.blank?
-
-        metric_node.map do |node|
-          layout = lookup_time_layout(node)
-          type = node.attributes["type"].text.to_sym
-          unit = node.attributes["units"].try(:text)
-
-          @output[metric] ||= {}
-          @output[metric][type] ||= {}
-          @output[metric][type][:name] = node.xpath("name").text
-          @output[metric][type][:values] = []
-
-          node.xpath("value").each_with_index do |value, index|
-            hsh = {
-              :value      => value.text.to_f,
-              :start_time => layout.valid_times[index].start
-            }
-
-            end_time = layout.valid_times[index].stop
-
-            hsh.merge!(:unit => unit) if unit.present?
-            hsh.merge!(:end_time => end_time) if end_time.present?
-
-            @output[metric][type][:values] << hsh
-          end
-        end
-      end
-
-      def lookup_time_layout(node)
-        @time_layouts.detect do |layout|
-          node.attributes["time-layout"].text == layout.layout_key
-        end
-      end
-    end
-  end
-end