dwml 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd148c3dd2ef35a098cdaab6f8dc37e7c35276ee
-  data.tar.gz: c4844f0451e8cba714da7af6837aad3756d713b8
+  metadata.gz: 0ad3fa1473b54cef4122ad9ff01aa394627674fa
+  data.tar.gz: 7599b77d6b7eb5861e8416dd6f3193747cb059a6
 SHA512:
-  metadata.gz: c8f59e69faa76af529e15c2b1722b7e26fdeb4d380dd93d36ebe6fde37419a4ef94cfd92ea32b606f0830741d53a7abb1ec83895a2e631820a37b1bd8fa62213
-  data.tar.gz: 3e17350c0a31ee30197f2c3beef7914043f02b30e6903d6226fce9d06f4f9a0c5b71b51d254f6adf900c6f1841a3e275272e11848870015d71a5f915873d2060
+  metadata.gz: be7c1920941e3d56fea05f7662b49e94ee728b39267c809527048b73a83ec2f0b4e2b556af8bad548ff5e3b655c08a58835e3201608be769a898ff7726ee3fe0
+  data.tar.gz: 69cc7789a51d860406c997e042feecec5c779798ab7a0e0c17af9012cba185fe5234354b64d4be2d44c7c55884e815f48fdf15d138bdb556e8b6812f2fbc9e99

data/lib/dwml/head_extractor.rb

@@ -20,9 +20,9 @@ class DWML
 
       @output.merge!(
         :product => {
-          :title         => element.xpath('product/title').text,
-          :field         => element.xpath('product/field').text,
-          :category      => element.xpath('product/category').text,
+          :title         => normalize_content( 'product/title' ),
+          :field         => normalize_content( 'product/field' ),
+          :category      => normalize_content( 'product/category' ),
           :creation_date => creation_date
         }
         )
@@ -34,14 +34,24 @@ class DWML
 
       @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
+          :more_information => normalize_content( 'source/more-information' ),
+          :disclaimer       => normalize_content( 'source/disclaimer' ),
+          :credit           => normalize_content( 'source/credit' ),
+          :credit_logo      => normalize_content( 'source/credit-logo' ),
+          :feedback         => normalize_content( 'source/feedback' )
         }
         )
     end
+
+    def normalize_content(selector)
+      node = element.xpath(selector)
+
+      if node.blank?
+        ""
+      else
+        node.text
+      end
+    end
   end
 end

data/lib/dwml/parameter_extractor.rb

@@ -213,27 +213,21 @@ class DWML
           value = condition.xpath("value").first
           next if value.blank?
 
+          hsh = { :start_time => layout.valid_times[index].start }
+
           visibility_node = value.xpath("visibility").first
-          visibility = if visibility_node.present? && visibility_node.text.present?
-                         {
+          if visibility_node.present? && visibility_node.text.present?
+            visibility = {
               :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
-          }
+            hsh.merge!( :visibility => visibility)
+          end
 
-          additive = value.attributes["additive"]
-          hsh.merge!(:additive => additive) if additive.present?
+          [:coverage, :intensity, :additive, :qualifier, :"weather-type"].each do |key|
+            attribute = value.attributes[key.to_s]
+            hsh.merge!(key => attribute.to_s) if attribute.present?
+          end
 
           @output[:weather][:conditions] << hsh
         end

data/lib/dwml/version.rb

@@ -1,3 +1,3 @@
 class DWML
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Angelo Lakra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri