current_metar 0.1.2 → 0.2

data/lib/current_metar/metar.rb

@@ -1,23 +1,19 @@
 class CurrentMetar::Metar
   require 'rexml/document'
-  require 'time'
-  attr_accessor :wind_speed, :wind_direction, :wind_gust_speed, :observation_time, :visibility, :temperature, :available, :no_results, :observation_time
-  attr_reader :icao
+  attr_accessor :wind_speed, :wind_direction, :wind_gust_speed, :observation_time, :visibility, :temperature, :available, :no_results, :icao
 
   METAR_ATTRIBUTE_MAPPING = {
     :wind_speed => "wind_speed_kt",
     :wind_direction => "wind_dir_degrees",
     :wind_gust_speed => "wind_gust_kt",
-    :visibility => "visibility_statute_mi"
+    :visibility => "visibility_statute_mi",
+    :icao => 'station_id'
   }
 
-  def initialize(icao)
-    @icao = icao
-  end
 
   def self.get_metar(icao)
-
-    metar = CurrentMetar::Metar.new(icao)
+    metar = CurrentMetar::Metar.new()
+    metar.icao = icao
     begin
       metar_response_body  = REXML::Document.new(CurrentMetar::Request.query_adds(metar.icao))
       if metar_response_body.root.elements['data'].attributes.get_attribute('num_results').value == '0'
@@ -25,13 +21,7 @@ class CurrentMetar::Metar
         metar.no_results = true
       else
         metar_response_body.root.elements.each("data/METAR") do |metar_xml|
-          unless metar_xml.elements['temp_c'].nil?
-            metar.temperature = (9/5.0 * metar_xml.elements['temp_c'].text.to_i + 32).round
-          end
-          unless metar_xml.elements['observation_time'].nil?
-            metar.observation_time = Time.parse(metar_xml.elements['observation_time'].text)
-          end
-          metar.parse_standard_attributes(metar_xml)
+          metar.parse_metar_xml(metar_xml)
         end
         metar.available = true
         metar.no_results = false
@@ -44,6 +34,27 @@ class CurrentMetar::Metar
     end
   end
 
+  def self.new_from_xml(metar_xml)
+    metar = CurrentMetar::Metar.new()
+    begin
+      metar.parse_metar_xml(metar_xml)
+      metar.available = true
+      metar.no_results = false
+    rescue
+      metar.availabe = false
+      metar.no_results = false
+    ensure
+      return metar
+    end
+  end
+
+  def parse_metar_xml(metar_xml)
+    unless metar_xml.elements['temp_c'].nil?
+      self.temperature = (9/5.0 * metar_xml.elements['temp_c'].text.to_i + 32).round
+    end
+    self.parse_standard_attributes(metar_xml)
+  end
+
   def parse_standard_attributes(metar_xml)
     METAR_ATTRIBUTE_MAPPING.each do |key, value|
       unless metar_xml.elements[value].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: current_metar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &16209180 !ruby/object:Gem::Requirement
+  requirement: &70338441703020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16209180
+  version_requirements: *70338441703020
 description: current_metar queries the ADDS Experimental server to pull back current
   weather data for a specific reporting station
 email: