eeml 0.0.17 → 0.0.18

data/.gitignore

@@ -2,4 +2,4 @@ pkg
 doc
 eeml.gemspec
 client_config.yml
-
+.*.swp

data/CHANGELOG

@@ -1,3 +1,13 @@
+commit 9835edb290ef16b274d9ab59e3c6adca2ce97fcf
+Author: Levent Ali <lebreeze@gmail.com>
+Date:   Wed Jul 7 18:48:34 2010 +0100
+
+  Version 0.0.18
+
+    json v1.0.0 changed to have current_value, min, max and at at top level within a datastream
+    Added eeml 0.5.1 parser
+
+
 commit 245dae9ae8e246d3f933106e70df4eadb33823fe
 Author: Levent Ali <lebreeze@gmail.com>
 Date:   Fri Jul 2 16:03:27 2010 +0100

data/lib/eeml/constants.rb

@@ -1,18 +1,49 @@
 module Eeml
   module Constants
-    LOCAL_EEML5_SCHEMA_LOCATION = "schemas/eeml/005.xsd" # :nodoc:
-    EEML5_HREF = "http://www.eeml.org/xsd/005"
-    EEML5_VERSION = "5"
-    EEML5_SCHEMA_LOCATION = "http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd"
+#    LOCAL_EEML5_SCHEMA_LOCATION = "schemas/eeml/005.xsd" # :nodoc:
+#    EEML5_HREF = "http://www.eeml.org/xsd/005"
+#    EEML5_VERSION = "5"
+#    EEML5_SCHEMA_LOCATION = "http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd"
 
-    EEML5_NAMESPACE = ":#{EEML5_HREF}"
+#    EEML5_NAMESPACE = ":#{EEML5_HREF}"
     XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance"
 
-    EEML6_VERSION = "0.6-alpha1"
+    # EEML6_VERSION = "0.6-alpha1"
 
     # Not calling this EEML as json is not part of the eeml spec
-    JSON_1_0_0_VERSION = "1.0.0"
+    # JSON_1_0_0_VERSION = "1.0.0"
+    
     # EEML6_RC1_VERSION = "0.6-rc1"
+    JSON_API = {}
+    EEML = {}
+
+    # This is what we called version 5
+    EEML["0.5.0"] =
+      {
+        :href => 'http://www.eeml.org/xsd/005',
+        :version => '5',
+        :schema_location => 'http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd'
+      }
+
+    # This is NEWER than version 5
+    EEML["0.5.1"] = 
+      {
+        :href => 'http://www.eeml.org/xsd/0.5.1',
+        :version => '0.5.1',
+        :schema_location => 'http://www.eeml.org/xsd/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.xsd'
+      }
+
+    JSON_API["0.6-alpha"] =
+      {
+        :version => '0.6-alpha'
+      }
+
+    JSON_API["1.0.0"] =
+      {
+        :version => "1.0.0"
+      }
+
+
   end
 end
 

data/lib/eeml/environment.rb

@@ -164,7 +164,7 @@ module Eeml
       end
     end
 
-    def to_eeml(version = Constants::EEML5_VERSION)
+    def to_eeml(version = Constants::EEML['0.5.0'][:version])
       outputter = OutputRegistry.get_xml_output_for(version)
       outputter.to_eeml(self)
     end

data/lib/eeml/environment_builder.rb

@@ -1,4 +1,5 @@
 require 'eeml/libxml_eeml_parser_v005'
+require 'eeml/libxml_eeml_parser_v051'
 require 'eeml/json_environment_parser_v005'
 require 'eeml/json_environment_parser_v006'
 require 'eeml/json_environment_parser_v100'
@@ -6,8 +7,19 @@ require 'eeml/json_environment_parser_v100'
 module Eeml
   class EnvironmentBuilder # :nodoc:
 
+    include LibXML
+
     def self.build_from_xml(xml_str)
-      parser = LibXMLEemlParserV005.new
+      begin
+        xml = XML::Parser.string(xml_str).parse
+        if xml.root.namespaces.default.to_s == Constants::EEML['0.5.1'][:href]
+          parser = LibXMLEemlParserV051.new 
+        else
+          parser = LibXMLEemlParserV005.new
+        end
+      rescue => e
+        parser = LibXMLEemlParserV005.new
+      end
       return parser.make_environment_from_xml(xml_str)
     end
 
@@ -18,14 +30,14 @@ module Eeml
 
     def self.build_from_json(json_str)
       json = JSON.parse(json_str)
-      if json["version"].to_i == Constants::EEML5_VERSION.to_i
+      if json["version"].to_i == Constants::EEML['0.5.0'][:version].to_i
         parser = JsonEnvironmentParserV005.new
-      elsif json["version"] == Constants::JSON_1_0_0_VERSION
+      elsif json["version"] == Constants::JSON_API['1.0.0'][:version]
 	parser = JsonEnvironmentParserV100.new
-      elsif json["version"].to_f == Constants::EEML6_VERSION.to_f
+      elsif json["version"].to_f == Constants::JSON_API['0.6-alpha'][:version].to_f
         parser = JsonEnvironmentParserV006.new
       else
-        raise "Invalid version specification. Permitted versions are #{Constants::EEML5_VERSION}, #{Constants::EEML6_VERSION} and #{Constants::JSON_1_0_0_VERSION}"
+        raise "Invalid version specification. Permitted versions are #{Constants::EEML['0.5.0'][:version]}, #{Constants::JSON_API["0.6-alpha"][:version]} and #{Constants::JSON_API["1.0.0"][:version]}"
       end
       return parser.make_environment_from_hash(json)
     end

data/lib/eeml/json_environment_parser_v100.rb

@@ -52,18 +52,18 @@ module Eeml
         datastream.identifier = datastream_hash['id']
         datastream.tags = datastream_hash['tags'] unless datastream_hash['tags'].nil?
         
-        values_arr = datastream_hash["values"]
+        #values_arr = datastream_hash["history"]
 
-        raise DataMissingValue if values_arr.nil?
+        #raise DataMissingValue if values_arr.nil?
 
-        values_arr.each do |v|
-          value = Value.new(:value => v["value"],
+        #values_arr.each do |v|
+          value = Value.new(:value => datastream_hash["current_value"],
                             :min_value => datastream_hash["min_value"],
                             :max_value => datastream_hash["max_value"],
-                            :recorded_at => v["at"])
+                            :recorded_at => datastream_hash["at"])
 
           datastream.add_value(value)
-        end
+        #end
 
         unit_hash = datastream_hash["unit"]
         unless unit_hash.nil?

data/lib/eeml/json_output.rb

@@ -16,7 +16,7 @@ module Eeml
                            :website => environment.website,
                            :email => environment.email,
                            :icon => environment.icon,
-                           :version => EEML5_VERSION }
+                           :version => EEML['0.5.0'][:version] }
 
       environment_hash[:updated] = environment.updated.utc.iso8601 unless environment.updated.nil?  #TODO: was retrieved_at
 

data/lib/eeml/libxml_eeml_output_v005.rb

@@ -6,10 +6,10 @@ module Eeml
     def to_eeml(environment)
       doc = XML::Document.new
       eeml = doc.root = XML::Node.new('eeml')
-      XML::Namespace.new(eeml, nil, Constants::EEML5_HREF)
+      XML::Namespace.new(eeml, nil, Constants::EEML['0.5.0'][:href])
       XML::Namespace.new(eeml, 'xsi', Constants::XSI_NAMESPACE)
-      eeml['version'] = Constants::EEML5_VERSION
-      eeml['xsi:schemaLocation'] = Constants::EEML5_SCHEMA_LOCATION
+      eeml['version'] = Constants::EEML['0.5.0'][:version]
+      eeml['xsi:schemaLocation'] = Constants::EEML['0.5.0'][:schema_location]
       eeml << xml_node_for_environment(environment)
 
       return doc.to_s(:encoding => XML::Encoding::UTF_8)

data/lib/eeml/libxml_eeml_output_v051.rb

@@ -0,0 +1,118 @@
+module Eeml
+  class LibXMLEemlOutputV051 # :nodoc:
+    include LibXML
+    
+    @@eeml_version = Constants::EEML['0.5.1']
+    # main method. creates an EEML 0.5.1 document for the given environment.
+    def to_eeml(environment)
+      doc = XML::Document.new
+      eeml = doc.root = XML::Node.new('eeml')
+      XML::Namespace.new(eeml, nil, @@eeml_version[:href])
+      XML::Namespace.new(eeml, 'xsi', Constants::XSI_NAMESPACE)
+      eeml['version'] = @@eeml_version[:version]
+      eeml['xsi:schemaLocation'] = @@eeml_version[:schema_location]
+      eeml << xml_node_for_environment(environment)
+      return doc.to_s(:encoding => XML::Encoding::UTF_8)
+    end
+
+    def xml_node_for_environment(environment)
+      environment_node = XML::Node.new('environment')
+
+      #TODO: write all these strings out safely for xml
+      
+      environment_node['updated'] = environment.updated.utc.iso8601 unless environment.updated.nil?      
+      environment_node['id'] = environment.identifier.to_s unless environment.identifier.blank?
+      environment_node['creator'] = environment.creator.to_s unless environment.creator.blank?
+      
+      unless environment.title.blank?
+        environment_node << title_node = XML::Node.new('title')
+        title_node << environment.title
+      end
+
+      unless environment.feed_url.blank?
+        environment_node << feed_node = XML::Node.new('feed')
+        feed_node << environment.feed_url
+      end
+      
+      unless environment.status.blank?
+        environment_node << status_node = XML::Node.new('status')
+        status_node << environment.status
+      end
+
+      unless environment.description.blank?
+        environment_node << description_node = XML::Node.new('description')
+        description_node << environment.description
+      end
+
+      unless environment.icon.blank?
+        environment_node << icon_node = XML::Node.new('icon')
+        icon_node << environment.icon
+      end
+
+      unless environment.website.blank?
+        environment_node << website_node = XML::Node.new('website')
+        website_node << environment.website
+      end
+
+      unless environment.email.blank?
+        environment_node << email_node = XML::Node.new('email')
+        email_node << environment.email
+      end
+
+      unless environment.location.nil?
+        environment_node << location_node = XML::Node.new('location')
+        location_node['domain'] = environment.location.domain
+        location_node['exposure'] = environment.location.exposure unless environment.location.exposure.blank?
+        location_node['disposition'] = environment.location.disposition unless environment.location.disposition.blank?
+        
+        unless environment.location.name.blank?
+          location_node << location_name_node = XML::Node.new('name')
+          location_name_node << environment.location.name
+        end
+
+        location_node << lat_node = XML::Node.new('lat')
+        lat_node << environment.location.latitude
+
+        location_node << lng_node = XML::Node.new('lon')
+        lng_node << environment.location.longitude
+
+        unless environment.location.elevation.blank?
+          location_node << elevation_node = XML::Node.new('ele')
+          elevation_node << environment.location.elevation
+        end
+      end
+
+      environment.datastreams.each do |datastream|
+        environment_node << datastream_to_xml_node(datastream)
+      end
+
+      return environment_node
+    end
+
+    def datastream_to_xml_node(datastream)
+      datastream_node = XML::Node.new('data')
+      datastream_node['id'] = datastream.identifier.to_s
+
+      datastream.tags.each do |tag|
+        tag_node = XML::Node.new('tag')
+        tag_node << tag
+        datastream_node << tag_node
+      end    
+
+      datastream_node << value_node = XML::Node.new('current_value')
+      datastream_node << max_value_node = XML::Node.new('max_value', datastream.max_value.to_s) unless datastream.max_value.to_s.empty?
+      datastream_node << min_value_node = XML::Node.new('min_value', datastream.min_value.to_s) unless datastream.min_value.to_s.empty?
+
+      value_node << datastream.value.to_s
+      
+      unless datastream.unit_value.to_s.empty? && datastream.unit_type.to_s.empty? && datastream.unit_symbol.to_s.empty?
+        datastream_node << unit_node = XML::Node.new('unit')
+        unit_node['type'] = datastream.unit_type.to_s unless datastream.unit_type.to_s.empty?
+        unit_node['symbol'] = datastream.unit_symbol.to_s unless datastream.unit_symbol.to_s.empty?
+        unit_node << datastream.unit_value.to_s unless datastream.unit_value.to_s.empty?
+      end
+
+      return datastream_node
+    end
+  end
+end

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -5,6 +5,7 @@ module Eeml
     include LibXML
     include Exceptions
 
+    @@eeml_version = Constants::EEML['0.5.0']
     #main method
     
     #take an xml string, and create an Environment from it. 
@@ -53,13 +54,13 @@ module Eeml
 
     #multiple (zero or more)
     def extract_environments_from_doc(doc)
-      env_nodes = doc.find('x:environment', "x:#{Constants::EEML5_HREF}")
+      env_nodes = doc.find('x:environment', "x:#{@@eeml_version[:href]}")
       return env_nodes.map{|env_node| new_env = Environment.new; extract_environment_from_node(env_node, new_env)}
     end
 
     #single, mandatory
     def extract_environment_from_doc(doc, env_to_populate)
-      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{Constants::EEML5_HREF}")
+      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{Constants::EEML['0.5.0'][:href]}")
       return extract_environment_from_node(env_node, env_to_populate)
     end
 
@@ -71,20 +72,20 @@ module Eeml
       
       env.creator = env_node['creator']
 
-      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{Constants::EEML5_HREF}")
-      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{Constants::EEML5_HREF}")
-      env.description = optional_content(env_node, 'x:description', 'description', "x:#{Constants::EEML5_HREF}")
-      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{Constants::EEML5_HREF}")
-      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{Constants::EEML5_HREF}")
-      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{Constants::EEML5_HREF}")
-      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{Constants::EEML5_HREF}")
-      env.private     = optional_content(env_node, 'x:private', 'private', "x:#{Constants::EEML5_HREF}")
+      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{@@eeml_version[:href]}")
+      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{@@eeml_version[:href]}")
+      env.description = optional_content(env_node, 'x:description', 'description', "x:#{@@eeml_version[:href]}")
+      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{@@eeml_version[:href]}")
+      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{@@eeml_version[:href]}")
+      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{@@eeml_version[:href]}")
+      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{@@eeml_version[:href]}")
+      env.private     = optional_content(env_node, 'x:private', 'private', "x:#{@@eeml_version[:href]}")
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
-      loc_node = env_node.find_first('x:location', "x:#{Constants::EEML5_HREF}")
+      loc_node = env_node.find_first('x:location', "x:#{@@eeml_version[:href]}")
       env.location    = extractLocation(loc_node) if loc_node
 
-      datastream_nodes = env_node.find('x:data', "x:#{Constants::EEML5_HREF}")
+      datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
       env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
 
@@ -102,10 +103,10 @@ module Eeml
       loc.domain = node['domain']
       loc.disposition = node['disposition']
       loc.exposure = node['exposure']
-      loc.name = optional_content(node, 'x:name', 'name', "x:#{Constants::EEML5_HREF}")
-      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{Constants::EEML5_HREF}")
-      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{Constants::EEML5_HREF}")
-      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{Constants::EEML5_HREF}")
+      loc.name = optional_content(node, 'x:name', 'name', "x:#{@@eeml_version[:href]}")
+      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{@@eeml_version[:href]}")
+      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{@@eeml_version[:href]}")
+      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{@@eeml_version[:href]}")
       return loc
     end
 
@@ -139,11 +140,11 @@ module Eeml
       data = DataStream.new
       raise MissingAttribute.new(node.name, 'id') if node['id'].nil?
       data.identifier = node['id']
-      node.find('x:tag', "x:#{Constants::EEML5_HREF}").each do |tag_node|
+      node.find('x:tag', "x:#{@@eeml_version[:href]}").each do |tag_node|
         data.tags << tag_node.content.strip
       end
 
-      value_nodes = node.find('x:value', "x:#{Constants::EEML5_HREF}")
+      value_nodes = node.find('x:value', "x:#{@@eeml_version[:href]}")
       raise exception_for_node(node, DataMissingValue, "Data node is missing value node.") if value_nodes.empty?
       raise exception_for_node(node, DataHasMultipleValues, "Data node has multiple 'value' nodes.") if value_nodes.size > 1
 
@@ -156,7 +157,7 @@ module Eeml
 
       data.add_value(value)
 
-      unit_nodes = node.find('x:unit', "x:#{Constants::EEML5_HREF}")
+      unit_nodes = node.find('x:unit', "x:#{@@eeml_version[:href]}")
       raise exception_for_node(node, DataHasMultipleUnits, "Data node has multiple 'unit' nodes.") if unit_nodes.size > 1
 
       unit_node = unit_nodes.first

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -0,0 +1,211 @@
+require "parsedate.rb"
+module Eeml
+  #a parser for xml eeml v051, implemented with LibXML
+  class LibXMLEemlParserV051 # :nodoc:
+    include LibXML
+    include Exceptions
+
+    @@eeml_version = Constants::EEML['0.5.1']
+    #main method
+    
+    #take an xml string, and create an Environment from it. 
+    #If an optional environment is given, that will be populated (overwritten) instead of a new environment.
+    def make_environment_from_xml(xml_str, given_environment = nil)
+      doc = parse_xml(xml_str)
+      raise MissingNamespace if doc.root.namespaces.namespace.blank?
+      env = given_environment || Environment.new
+      #TODO: what has to be reset in a given environment before passing it for re-population?
+      return extract_environment_from_doc(doc, env)
+    end
+
+    #take an xml string containing zero or more environment nodes, and create an array of Environment objects from it. 
+    def make_environments_from_xml(xml_str)
+      doc = parse_xml(xml_str)
+      raise MissingNamespace if doc.root.namespaces.namespace.blank?
+      return extract_environments_from_doc(doc)
+    end
+
+    protected
+
+    def parse_xml(xml_str)
+      errors = []
+      #http://libxml.rubyforge.org/rdoc/classes/LibXML/XML/Error.html
+      #TODO: is the error handler set up per thread? (XML::Error.set_handler)
+      XML::Error.set_handler { |error| errors << error } 
+  
+      #TODO: performance - is this expensive?
+      #TODO: are these configurations per-thread?  If they're global (e.g. class variables) then we shouldn't be setting them here.
+      XML.default_line_numbers=true
+      
+      parser = XML::Parser.string(xml_str)
+      begin
+        doc = parser.parse
+      rescue XML::Error => e
+        #note: errors var available here, too.        
+        raise BadXML, "Malformed xml: #{e.class}: #{e}", e.backtrace
+      end
+      #validation?
+      # seems we have to recreate our XML::Schema object on each invocation
+      # else libxml segfaults very quickly
+      #doc.validate_schema(XML::Schema.from_string(IO.read(LOCAL_EEML5_SCHEMA_LOCATION)))
+      return doc
+    end
+
+
+    #multiple (zero or more)
+    def extract_environments_from_doc(doc)
+      env_nodes = doc.find('x:environment', "x:#{@@eeml_version[:href]}")
+      return env_nodes.map{|env_node| new_env = Environment.new; extract_environment_from_node(env_node, new_env)}
+    end
+
+    #single, mandatory
+    def extract_environment_from_doc(doc, env_to_populate)
+      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{@@eeml_version[:href]}")
+      return extract_environment_from_node(env_node, env_to_populate)
+    end
+
+    #single, from node (everyone uses this to get the work done)
+    def extract_environment_from_node(env_node, env_to_populate)
+      env = env_to_populate
+      env.identifier = env_node['id']
+      env.updated = Time.gm(*ParseDate.parsedate(env_node['updated'])).utc if !env_node['updated'].nil?
+      
+      env.creator = env_node['creator']
+
+      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{@@eeml_version[:href]}")
+      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{@@eeml_version[:href]}")
+      env.description = optional_content(env_node, 'x:description', 'description', "x:#{@@eeml_version[:href]}")
+      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{@@eeml_version[:href]}")
+      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{@@eeml_version[:href]}")
+      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{@@eeml_version[:href]}")
+      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{@@eeml_version[:href]}")
+      env.private     = optional_content(env_node, 'x:private', 'private', "x:#{@@eeml_version[:href]}")
+
+      #find_first_node_or_fail(env_node, 'x:location', 'location')
+      loc_node = env_node.find_first('x:location', "x:#{@@eeml_version[:href]}")
+      env.location    = extractLocation(loc_node) if loc_node
+
+      datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
+      # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
+      env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
+
+      return env
+    end
+
+    def extractLocation(node)
+      #<location domain="physical" exposure="outdoor" disposition="mobile">
+      #  <lat>50.1</lat>
+      #  <lon>48.7</lon>
+      #  <ele>1.34</ele>
+      #</location>
+      raise "given nil node" if node.nil?
+      loc = Location.new
+      loc.domain = node['domain']
+      loc.disposition = node['disposition']
+      loc.exposure = node['exposure']
+      loc.name = optional_content(node, 'x:name', 'name', "x:#{@@eeml_version[:href]}")
+      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{@@eeml_version[:href]}")
+      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{@@eeml_version[:href]}")
+      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{@@eeml_version[:href]}")
+      return loc
+    end
+
+    #return an array (TODO: or a hash?) of DataStream objects from the given list of data nodes
+    def extractDataStreams(nodes)
+      #<data id="blah1">...</data><data id="blah2">...</data>
+      dataStreams = []
+      nodes.each do |node|        
+        dataStreams << extractDataStream(node)
+      end
+      return dataStreams
+    end
+
+    #builds and returns a detailed exception of the given class, for problems concerning the given node (or its missing children)
+    #details include node's name and line number (zero if not available)
+    def exception_for_node(node, exception_class, message)
+      ex = exception_class.new(message)
+      ex.line_num = node.line_num
+      ex.node_name = node_name_or_root(node)
+      return ex
+    end
+
+
+    def extractDataStream(node)
+      #<data id="0">
+      #<tag>some_tag</tag>
+      #<tag>another_tag</tag>
+      #<current_value>0</current_value>
+      #<min_value>0.0</min_value>
+      #<max_value>1022.0</max_value>
+      #<unit symbol="C" type="basicSI">Celsius</unit>
+      #</data>
+      data = DataStream.new
+      raise MissingAttribute.new(node.name, 'id') if node['id'].nil?
+      data.identifier = node['id']
+      node.find('x:tag', "x:#{@@eeml_version[:href]}").each do |tag_node|
+        data.tags << tag_node.content.strip
+      end
+
+      value_nodes = node.find('x:current_value', "x:#{@@eeml_version[:href]}")
+      raise exception_for_node(node, DataMissingValue, "Data node is missing value node.") if value_nodes.empty?
+      raise exception_for_node(node, DataHasMultipleValues, "Data node has multiple 'value' nodes.") if value_nodes.size > 1
+
+      value_node = value_nodes.first
+
+      max_value_node = node.find_first('x:max_value', "x:#{@@eeml_version[:href]}")
+      min_value_node = node.find_first('x:min_value', "x:#{@@eeml_version[:href]}")
+
+      value = Value.new
+      value.min_value = min_value_node.content if min_value_node
+      value.max_value = max_value_node.content if max_value_node
+      value.value = value_node.content.strip
+
+      data.add_value(value)
+
+      unit_nodes = node.find('x:unit', "x:#{@@eeml_version[:href]}")
+      raise exception_for_node(node, DataHasMultipleUnits, "Data node has multiple 'unit' nodes.") if unit_nodes.size > 1
+
+      unit_node = unit_nodes.first
+      unless unit_node.nil?
+        data.unit_symbol = unit_node['symbol']
+        data.unit_type = unit_node['type']
+        data.unit_value = unit_node.content.strip
+      end
+
+      return data
+    end
+
+    #Helpers ------------------------------------------------------------------
+    #Consider mixing these in to the libxml parser for more readable code
+    
+    #raises MissingNode if the node isn't there
+    def mandatory_content(base_node, xpath, description, nslist = nil)
+      node = base_node.find_first(xpath, nslist)
+      raise(MissingNode.new(node_name_or_root(base_node), description, xpath)) if node.nil?
+      return node.content
+    end
+
+    #returns the node's content, or the given default if the node isn't there (default itself defaults to nil)
+    #description isn't used, but keeps our signature same as mandatory_content(), up to that point.
+    def optional_content(base_node, xpath, description, nslist = nil, default = nil)
+      node = base_node.find_first(xpath, nslist)
+      return node.nil? ? default : node.content
+    end
+
+
+    #get the name of the given node if it is a node, or 'root' if it is a doc.
+    #for use only for error messages
+    def node_name_or_root(node)
+      node.respond_to?(:name) ? node.name : 'root'
+    end
+
+    def find_first_node_or_fail(base_node, xpath, description, nslist = nil)
+      node = base_node.find_first(xpath, nslist)
+      raise(MissingNode.new(node_name_or_root(base_node), description, xpath)) if node.nil?
+      return node
+    end
+
+  end
+
+end
+

data/lib/eeml/output_registry.rb

@@ -1,14 +1,16 @@
 require 'eeml/libxml_eeml_output_v005'
+require 'eeml/libxml_eeml_output_v051'
 require 'eeml/json_output'
 
 module Eeml
   class OutputRegistry # :nodoc:
     #look at the given xml, build and return a new v005 or 006 parser, accordingly
-    def self.get_xml_output_for(version = Constants::EEML5_VERSION)
+    def self.get_xml_output_for(version = Constants::EEML['0.5.0'][:version])
+      return LibXMLEemlOutputV051.new if version == Constants::EEML['0.5.1'][:version]
       LibXMLEemlOutputV005.new
     end
 
-    def self.get_json_output_for(version = Constants::EEML5_VERSION)
+    def self.get_json_output_for(version = Constants::EEML['0.5.0'][:version])
       JsonOutput.new
     end
 

data/lib/eeml.rb

@@ -15,7 +15,7 @@ require 'time'
 module Eeml
 
   # library version number
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 
   # TODO: put in some configuration file, not here
   LOCAL_EEML_SCHEMA_LOCATION = 'schemas/eeml/005.xsd'

data/test/data/doc_1_v1-0-0.json

@@ -1,15 +1,21 @@
 {"datastreams":[
-  {"tags":["tagD0"],
-  "values":[{"value":"0","at":"2009-02-11T10:56:56Z"}],
-  "min_value":"-9999.0",
-  "max_value":"1022.0",
-  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
-  "id":"0"},
-  {"values":[{"value":"33","at":"2009-02-11T10:56:55Z"}],
+  {
+	"tags":["tagD0"],
+	  "current_value":"0",
+	  "at":"2009-02-11T10:56:56Z",
+	  "min_value":"-9999.0",
+	  "max_value":"1022.0",
+	  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
+	  "id":"0"
+},
+  {
+  "current_value":"33",
+  "at":"2009-02-11T10:56:55Z",
   "min_value":"0.0","max_value":"1023.0",
   "id":"1"},
   {"tags":["tagD2a","tagD2b","tagD2c"],
-  "values":[{"value":"42.1","at":"2009-02-11T10:55:10Z"}],
+  "current_value":"42.1",
+  "at":"2009-02-11T10:55:10Z",
   "min_value":"23.4","max_value":"1021.0",
   "id":"2"}
 ],

data/test/data/eeml_datastream_051.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml xmlns="http://www.eeml.org/xsd/0.5.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="0.5.1" xsi:schemaLocation="http://www.eeml.org/xsd/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.xsd">
+  <environment>
+    <data id="0">
+      <tag>sometag</tag>
+      <current_value>65</current_value>
+      <max_value>100.0</max_value>
+      <min_value>4.0</min_value>
+    </data>
+  </environment>
+</eeml>

data/test/test_environment.rb

@@ -566,6 +566,16 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal expected_xml, xml_output
   end
 
+  test "should output to eeml 0.5.1 ok" do
+    env = create_env_from_xml_file('eeml_datastream_051.xml')
+    xml_output = env.to_eeml('0.5.1')
+    assert_not_nil xml_output
+
+    expected_xml = File.read('test/data/eeml_datastream_051.xml')
+    assert_equal expected_xml, xml_output
+
+  end
+
   implement "output - check that 'feed' url is correctly assembled" do
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Neill Bogie
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +01:00
+date: 2010-07-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 1
@@ -37,9 +40,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -76,7 +81,9 @@ files:
 - lib/eeml/json_environment_parser_v100.rb
 - lib/eeml/json_output.rb
 - lib/eeml/libxml_eeml_output_v005.rb
+- lib/eeml/libxml_eeml_output_v051.rb
 - lib/eeml/libxml_eeml_parser_v005.rb
+- lib/eeml/libxml_eeml_parser_v051.rb
 - lib/eeml/output_registry.rb
 - schemas/eeml/005.xsd
 - test/data/.gitignore
@@ -91,6 +98,7 @@ files:
 - test/data/doc_1_v6_private.json
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
+- test/data/eeml_datastream_051.xml
 - test/data/list.xml
 - test/data/minimal.xml
 - test/data/no_namespace.xml
@@ -110,23 +118,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple little library for programmatically manipulating EEML documents.