eeml 0.0.7 → 0.0.8

data/Manifest

@@ -9,18 +9,20 @@ lib/eeml.rb
 lib/eeml/constants.rb
 lib/eeml/csv_parser.rb
 lib/eeml/environment.rb
+lib/eeml/environment_builder.rb
 lib/eeml/exceptions.rb
 lib/eeml/json_environment_parser_v005.rb
+lib/eeml/json_environment_parser_v006.rb
 lib/eeml/json_output.rb
 lib/eeml/libxml_eeml_output_v005.rb
 lib/eeml/libxml_eeml_parser_v005.rb
 lib/eeml/output_registry.rb
-lib/eeml/parser_registry.rb
 schemas/eeml/005.xsd
 test/data/complete_namespaced.xml
 test/data/difficult_tag.xml
 test/data/doc_1.json
 test/data/doc_1.xml
+test/data/doc_1_v6.json
 test/data/doc_2.xml
 test/data/doc_2_expected.json
 test/data/list.xml

data/eeml.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eeml}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Neill Bogie, Sam Mulube"]
   s.cert_chain = ["/home/sam/.gem/gem-public_cert.pem"]
-  s.date = %q{2009-09-29}
+  s.date = %q{2009-11-21}
   s.description = %q{Simple little library for programmatically manipulating EEML documents, in particular this library is designed to work with the Pachube web service.}
   s.email = %q{sam.mulube@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb", "lib/eeml/parser_registry.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "example.rb", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb", "lib/eeml/parser_registry.rb", "schemas/eeml/005.xsd", "test/data/complete_namespaced.xml", "test/data/difficult_tag.xml", "test/data/doc_1.json", "test/data/doc_1.xml", "test/data/doc_2.xml", "test/data/doc_2_expected.json", "test/data/list.xml", "test/data/minimal.xml", "test/data/no_namespace.xml", "test/data/out_empty.xml", "test/libxml_test_helper.rb", "test/test_environment.rb", "test/test_helper.rb", "test/test_libxml_eeml_parser_v005.rb", "test/test_libxml_test_helper.rb", "eeml.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/environment_builder.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_environment_parser_v006.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "example.rb", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/environment_builder.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_environment_parser_v006.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb", "schemas/eeml/005.xsd", "test/data/complete_namespaced.xml", "test/data/difficult_tag.xml", "test/data/doc_1.json", "test/data/doc_1.xml", "test/data/doc_1_v6.json", "test/data/doc_2.xml", "test/data/doc_2_expected.json", "test/data/list.xml", "test/data/minimal.xml", "test/data/no_namespace.xml", "test/data/out_empty.xml", "test/libxml_test_helper.rb", "test/test_environment.rb", "test/test_helper.rb", "test/test_libxml_eeml_parser_v005.rb", "test/test_libxml_test_helper.rb", "eeml.gemspec"]
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Eeml", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/eeml/constants.rb

@@ -1,18 +1,14 @@
 module Eeml
   module Constants
-    LOCAL_EEML_SCHEMA_LOCATION = "schemas/eeml/005.xsd" # :nodoc:
-    EEML_HREF = "http://www.eeml.org/xsd/005"
-    EEML_VERSION = "5"
-    EEML_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"
 
-    EEML_NAMESPACE = ":#{EEML_HREF}"
+    EEML5_NAMESPACE = ":#{EEML5_HREF}"
     XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance"
 
-    #--
-    # TODO: better encapsulated as a set of methods. 
-    #++
-    XML_TIME_FORMAT_STRING = "%Y-%m-%dT%H:%M:%SZ"
-
+    EEML6_VERSION = "0.6"
   end
 end
 

data/lib/eeml/environment.rb

@@ -20,23 +20,76 @@ module Eeml
   # One of the component classes of Environment. Represents an individual datastream, and provides access to it's value
   # and other attributes. Environments can have zero or more datastreams.
   class DataStream
-    attr_accessor :identifier, :value, :tags, :min_value, :max_value, :unit_symbol, :unit_type, :unit_value
+    attr_accessor :identifier, :tags, :unit_symbol, :unit_type, :unit_value
+    attr_accessor :values
 
     def initialize(options = {})
       @identifier = options[:identifier]
-      @value = options[:value]
-      @max_value = options[:max_value]
-      @min_value = options[:min_value]
       @tags = []
       @unit_symbol = options[:unit_symbol]
       @unit_type = options[:unit_type]
       @unit_value = options[:unit_value]
+      @values = []
+      @values << Value.new(:value => options[:value], 
+                           :max_value => options[:max_value], 
+                           :min_value => options[:min_value], 
+                           :recorded_at => options[:recorded_at])
+    end
+
+    def add_value(value)
+      @values << value
+    end
+
+    def remove_last_value
+      @values.pop
+    end
+
+    def min_value
+      unless @values.last.nil?
+        return @values.last.min_value
+      else
+        return nil
+      end
+    end
+
+    def max_value
+      unless @values.last.nil?
+        return @values.last.max_value
+      else
+        return nil
+      end
+    end
+
+    def value
+      unless @values.last.nil?
+        return @values.last.value
+      else
+        return nil
+      end
+    end
+
+    def recorded_at
+      unless @values.last.nil?
+        return @values.last.recorded_at
+      else
+        return nil
+      end
     end
 
     def to_s
       "identifier: '#{@identifier}', value: '#{@value}', min_value: '#{@min_value}', max_value: '#{@max_value}', tags: '#{@tags.join(", ")}'"
     end
+  end
 
+  class Value
+    attr_accessor :min_value, :max_value, :value, :recorded_at
+
+    def initialize(options = {})
+      @min_value = options[:min_value]
+      @max_value = options[:max_value]
+      @value = options[:value]
+      @recorded_at = options[:recorded_at]
+    end
   end
 
   # This class represents the main point of entry to this library. In general we will be creating instances of this class, either
@@ -73,20 +126,17 @@ module Eeml
 
     # Create multiple Environment objects from an EEML string containing multiple `environment` stanzas.
     def self.new_list_from_eeml(xml_str)
-      parser = ParserRegistry.get_xml_parser_for(xml_str)
-      return parser.make_environments_from_xml(xml_str)
+      return EnvironmentBuilder.build_list_from_xml(xml_str)
     end
 
     # Create a new Environment object from an EEML string.
     def self.new_from_eeml(xml_str)
-      parser = ParserRegistry.get_xml_parser_for(xml_str)
-      return parser.make_environment_from_xml(xml_str)
+      return EnvironmentBuilder.build_from_xml(xml_str)
     end
 
     # Create a new Environment object from a JSON string.
     def self.new_from_json(json_str)
-      parser =  ParserRegistry.get_json_parser_for(json_str)
-      return parser.make_environment_from_json(json_str)
+      return EnvironmentBuilder.build_from_json(json_str)
     end
   
     def update_datastreams_from_csv_values!(csv_values)
@@ -95,10 +145,12 @@ module Eeml
         datastream = datastreams[index]
         #if we don't have an existing datastream at same index, create new one
         if datastream.nil?
-          self.datastreams << DataStream.new(:identifier => index, :value => new_val, :ordering => index)          
+          datastream = DataStream.new(:identifier => index, :ordering => index)
+          datastream.add_value(Value.new(:value => new_val))
+          self.datastreams << datastream
         else
           #we had a match, so update the existing datastream
-          datastream.value = new_val
+          datastream.values.last.value = new_val
         end
       end
 
@@ -110,7 +162,7 @@ module Eeml
       end
     end
 
-    def to_eeml(version = Constants::EEML_VERSION)
+    def to_eeml(version = Constants::EEML5_VERSION)
       outputter = OutputRegistry.get_xml_output_for(version)
       outputter.to_eeml(self)
     end

data/lib/eeml/environment_builder.rb

@@ -0,0 +1,30 @@
+require 'eeml/libxml_eeml_parser_v005'
+require 'eeml/json_environment_parser_v005'
+require 'eeml/json_environment_parser_v006'
+
+module Eeml
+  class EnvironmentBuilder # :nodoc:
+    def self.build_from_xml(xml_str)
+      parser = LibXMLEemlParserV005.new
+      return parser.make_environment_from_xml(xml_str)
+    end
+
+    def self.build_list_from_xml(xml_str)
+      parser = LibXMLEemlParserV005.new
+      return parser.make_environments_from_xml(xml_str)
+    end
+
+    def self.build_from_json(json_str)
+      json = JSON.parse(json_str)
+      if json["version"] == EEML5_VERSION
+        parser = JsonEnvironmentParserV005.new
+      elsif json["version"] == EEML6_VERSION
+        parser = JsonEnvironmentParserV006.new
+      else
+        raise "Invalid version specification. Permitted versions are #{EEML5_VERSION} and #{EEML6_VERSION}"
+      end
+      return parser.make_environment_from_hash(json)
+    end
+  end
+end
+

data/lib/eeml/json_environment_parser_v005.rb

@@ -3,8 +3,7 @@ module Eeml
   class JsonEnvironmentParserV005 # :nodoc:
     include Exceptions
 
-    def make_environment_from_json(json_str)
-      env_hash = JSON.parse(json_str)
+    def make_environment_from_hash(env_hash)
       env = Environment.new(:title => env_hash["title"],
                             :description => env_hash["description"],
                             :feed_url => env_hash["feed"],
@@ -14,7 +13,7 @@ module Eeml
                             :status => env_hash["status"],
                             :identifier => env_hash["id"])
 
-      env.updated = Time.mktime(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
+      env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
 
       env.location = buildLocation(env_hash)
 
@@ -23,6 +22,11 @@ module Eeml
       return env
     end
 
+    def make_environment_from_json(json_str)
+      env_hash = JSON.parse(json_str)
+      return make_environment_from_hash(env_hash)
+    end
+
     private
 
     def buildLocation(env_hash)
@@ -49,10 +53,13 @@ module Eeml
         
         value_hash = datastream_hash["value"]
         raise DataMissingValue if value_hash.nil?
-        # raise DataHasMultipleValues if value_hash.size > 1
-        datastream.value = value_hash["current_value"]
-        datastream.min_value = value_hash["min_value"]
-        datastream.max_value = value_hash["max_value"]
+        #raise DataHasMultipleValues if value_hash.size > 1
+        
+        value = Value.new(:value => value_hash["current_value"],
+                          :min_value => value_hash["min_value"],
+                          :max_value => value_hash["max_value"])
+
+        datastream.add_value(value)
 
         unit_hash = datastream_hash["unit"]
         unless unit_hash.nil?

data/lib/eeml/json_environment_parser_v006.rb

@@ -0,0 +1,81 @@
+module Eeml
+  # A parser for json environments based on the EEML 5 specification.
+  class JsonEnvironmentParserV006 # :nodoc:
+    include Exceptions
+
+    def make_environment_from_hash(env_hash)
+      env = Environment.new(:title => env_hash["title"],
+                            :description => env_hash["description"],
+                            :feed_url => env_hash["feed"],
+                            :website => env_hash["website"],
+                            :email => env_hash["email"],
+                            :icon => env_hash["icon"],
+                            :status => env_hash["status"],
+                            :identifier => env_hash["id"])
+
+      env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
+
+      env.location = buildLocation(env_hash)
+
+      env.datastreams = buildDatastreams(env_hash)
+  
+      return env
+    end
+
+    def make_environment_from_json(json_str)
+      env_hash = JSON.parse(json_str)
+      return make_environment_from_hash(env_hash)
+    end
+
+    private
+
+    def buildLocation(env_hash)
+      location_hash = env_hash["location"]
+      return if location_hash.nil?
+      Location.new(:name => location_hash["name"],
+                   :latitude => location_hash["lat"],
+                   :longitude => location_hash["lon"],
+                   :elevation => location_hash["ele"],
+                   :domain => location_hash["domain"],
+                   :disposition => location_hash["disposition"],
+                   :exposure => location_hash["exposure"])
+    end
+
+    def buildDatastreams(env_hash)
+      datastreams_hash = env_hash["datastreams"]
+      return if datastreams_hash.nil?
+      datastreams = []
+      datastreams_hash.each do |datastream_hash|
+        datastream = DataStream.new
+        raise MissingAttribute.new('id', "data") if datastream_hash['id'].nil?
+        datastream.identifier = datastream_hash['id']
+        datastream.tags = datastream_hash['tags'] unless datastream_hash['tags'].nil?
+        
+        values_arr = datastream_hash["values"]
+
+        raise DataMissingValue if values_arr.nil?
+
+        values_arr.each do |v|
+          value = Value.new(:value => v["value"],
+                            :min_value => v["min_value"],
+                            :max_value => v["max_value"],
+                            :recorded_at => v["recorded_at"])
+
+          datastream.add_value(value)
+        end
+
+        unit_hash = datastream_hash["unit"]
+        unless unit_hash.nil?
+          datastream.unit_symbol = unit_hash["symbol"]
+          datastream.unit_type = unit_hash["type"]
+          datastream.unit_value = unit_hash["label"]
+        end
+
+        datastreams << datastream
+      end
+      return datastreams
+    end
+  end
+end
+
+

data/lib/eeml/json_output.rb

@@ -16,9 +16,9 @@ module Eeml
                            :website => environment.website,
                            :email => environment.email,
                            :icon => environment.icon,
-                           :version => EEML_VERSION}
+                           :version => EEML5_VERSION}
 
-      environment_hash[:updated] = environment.updated.strftime("%Y-%m-%dT%H:%M:%SZ") unless environment.updated.nil?  #TODO: was retrieved_at
+      environment_hash[:updated] = environment.updated.utc.iso8601 unless environment.updated.nil?  #TODO: was retrieved_at
 
       environment_hash.delete_if { |key, value| value.blank? }
 

data/lib/eeml/libxml_eeml_output_v005.rb

@@ -7,10 +7,10 @@ module Eeml
     def to_eeml(environment)
       doc = XML::Document.new
       eeml = doc.root = XML::Node.new('eeml')
-      XML::Namespace.new(eeml, nil, EEML_HREF)
+      XML::Namespace.new(eeml, nil, EEML5_HREF)
       XML::Namespace.new(eeml, 'xsi', XSI_NAMESPACE)
-      eeml['version'] = EEML_VERSION
-      eeml['xsi:schemaLocation'] = EEML_SCHEMA_LOCATION
+      eeml['version'] = EEML5_VERSION
+      eeml['xsi:schemaLocation'] = EEML5_SCHEMA_LOCATION
       eeml << xml_node_for_environment(environment)
 
       return doc.to_s(:encoding => XML::Encoding::UTF_8)
@@ -21,7 +21,7 @@ module Eeml
 
       #TODO: write all these strings out safely for xml
       
-      environment_node['updated'] = environment.updated.strftime(XML_TIME_FORMAT_STRING) unless environment.updated.nil?      
+      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?
       

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -46,20 +46,20 @@ module Eeml
       #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_EEML_SCHEMA_LOCATION)))
+      #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_HREF}")
+      env_nodes = doc.find('x:environment', "x:#{EEML5_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_HREF}")
+      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{EEML5_HREF}")
       return extract_environment_from_node(env_node, env_to_populate)
     end
 
@@ -67,24 +67,23 @@ module Eeml
     def extract_environment_from_node(env_node, env_to_populate)
       env = env_to_populate
       env.identifier = env_node['id']
-      env.updated = Time.mktime(*ParseDate.parsedate(env_node['updated'])) if !env_node['updated'].nil?
-
+      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_HREF}")
-      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{EEML_HREF}")
-      env.description = optional_content(env_node, 'x:description', 'description', "x:#{EEML_HREF}")
-      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{EEML_HREF}")
-      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{EEML_HREF}")
-      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{EEML_HREF}")
-      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{EEML_HREF}")
+      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{EEML5_HREF}")
+      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{EEML5_HREF}")
+      env.description = optional_content(env_node, 'x:description', 'description', "x:#{EEML5_HREF}")
+      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{EEML5_HREF}")
+      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{EEML5_HREF}")
+      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{EEML5_HREF}")
+      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{EEML5_HREF}")
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
-      loc_node = env_node.find_first('x:location', "x:#{EEML_HREF}")
+      loc_node = env_node.find_first('x:location', "x:#{EEML5_HREF}")
       env.location    = extractLocation(loc_node) if loc_node
 
-      datastream_nodes = env_node.find('x:data', "x:#{EEML_HREF}")
+      datastream_nodes = env_node.find('x:data', "x:#{EEML5_HREF}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
       env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
 
@@ -102,10 +101,10 @@ module Eeml
       loc.domain = node['domain']
       loc.disposition = node['disposition']
       loc.exposure = node['exposure']
-      loc.name = optional_content(node, 'x:name', 'name', "x:#{EEML_HREF}")
-      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{EEML_HREF}")
-      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{EEML_HREF}")
-      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{EEML_HREF}")
+      loc.name = optional_content(node, 'x:name', 'name', "x:#{EEML5_HREF}")
+      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{EEML5_HREF}")
+      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{EEML5_HREF}")
+      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{EEML5_HREF}")
       return loc
     end
 
@@ -139,20 +138,24 @@ module Eeml
       data = DataStream.new
       raise MissingAttribute.new(node.name, 'id') if node['id'].nil?
       data.identifier = node['id']
-      node.find('x:tag', "x:#{EEML_HREF}").each do |tag_node|
+      node.find('x:tag', "x:#{EEML5_HREF}").each do |tag_node|
         data.tags << tag_node.content.strip
       end
 
-      value_nodes = node.find('x:value', "x:#{EEML_HREF}")
+      value_nodes = node.find('x:value', "x:#{EEML5_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
-      data.min_value = value_node['minValue']
-      data.max_value = value_node['maxValue']
-      data.value = value_node.content.strip
 
-      unit_nodes = node.find('x:unit', "x:#{EEML_HREF}")
+      value = Value.new
+      value.min_value = value_node['minValue']
+      value.max_value = value_node['maxValue']
+      value.value = value_node.content.strip
+
+      data.add_value(value)
+
+      unit_nodes = node.find('x:unit', "x:#{EEML5_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/output_registry.rb

@@ -4,11 +4,11 @@ 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 = EEML_VERSION)
+    def self.get_xml_output_for(version = EEML5_VERSION)
       LibXMLEemlOutputV005.new
     end
 
-    def self.get_json_output_for(version = EEML_VERSION)
+    def self.get_json_output_for(version = EEML5_VERSION)
       JsonOutput.new
     end
 

data/lib/eeml.rb

@@ -8,13 +8,14 @@ require 'json'
 require 'eeml/constants'
 require 'eeml/exceptions'
 require 'eeml/environment'
-require 'eeml/parser_registry'
+require 'eeml/environment_builder'
 require 'eeml/output_registry'
+require 'time'
 
 module Eeml
 
   # library version number
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 
   # TODO: put in some configuration file, not here
   LOCAL_EEML_SCHEMA_LOCATION = 'schemas/eeml/005.xsd'

data/test/data/doc_1_v6.json

@@ -0,0 +1,30 @@
+{"datastreams":[
+  {"tags":["tagD0"],
+  "values":[{"value":"0","min_value":"-9999.0","max_value":"1022.0","recorded_at":"2009-02-11T10:56:56Z"}],
+  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
+  "id":"0"},
+  {"values":[{"value":"33","min_value":"0.0","max_value":"1023.0","recorded_at":"2009-02-11T10:56:55Z"}],
+  "id":"1"},
+  {"tags":["tagD2a","tagD2b","tagD2c"],
+  "values":[{"value":"42.1","min_value":"23.4","max_value":"1021.0","recorded_at":"2009-02-11T10:55:10Z"}],
+  "id":"2"}
+],
+"description":"description here",
+"updated":"2009-02-11T10:56:56Z",
+"status":"frozen",
+"website":"http:\/\/example.com\/studio\/",
+"email":"someone@example.com",
+"feed":"http:\/\/example.com\/api\/1247.xml",
+"location":{
+  "lat":"50.1",
+  "lon":"48.7",
+  "ele":"1.34",
+  "name":"Up on the roof (somewhere)",
+  "domain":"physical",
+  "exposure":"outdoor",
+  "disposition":"mobile"
+},
+"icon":"http:\/\/example.com\/some\/icon.gif",
+"id":"1247",
+"title":"title here",
+"version":"0.6"}

data/test/test_environment.rb

@@ -149,7 +149,7 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal('http://example.com/some/icon.gif', env.icon)
     #env attrs
     assert_equal('1247', env.identifier)
-    assert_equal('2009-02-11T10:56:56Z', env.updated.strftime(XML_TIME_FORMAT_STRING))
+    assert_equal('2009-02-11T10:56:56Z', env.updated.utc.iso8601)
     assert_equal('http://example.com/creator/', env.creator)
   end
 
@@ -312,7 +312,7 @@ class TestEnvironment < Test::Unit::TestCase
     
     #env attrs
     assert_equal('1247', env.identifier)
-    assert_equal('2009-02-11T10:56:56Z', env.updated.strftime("%Y-%m-%dT%H:%M:%SZ"))
+    assert_equal('2009-02-11T10:56:56Z', env.updated.utc.iso8601)
   end
 
   test "location parses ok from json" do
@@ -360,6 +360,68 @@ class TestEnvironment < Test::Unit::TestCase
     end
   end
 
+  test "parses a v6 input file ok" do
+    env = create_env_from_json_v6_file_one
+    assert_not_nil env
+    assert_instance_of Environment, env
+    assert_equal('title here', env.title)
+    assert_equal('description here', env.description)
+    assert_equal('http://example.com/api/1247.xml', env.feed_url)
+    assert_equal('http://example.com/studio/', env.website)
+    assert_equal('frozen', env.status)
+    assert_equal('someone@example.com', env.email)
+    assert_equal('http://example.com/some/icon.gif', env.icon)
+    
+    #env attrs
+    assert_equal('1247', env.identifier)
+    assert_equal('2009-02-11T10:56:56Z', env.updated.utc.iso8601)
+  end
+
+  test "location parses ok from json when parsing a v6 file" do
+    env = create_env_from_json_v6_file_one
+    assert_not_nil env.location
+    location = env.location
+    assert_equal "Up on the roof (somewhere)", location.name
+    assert_equal "50.1", location.latitude
+    assert_equal "48.7", location.longitude
+    assert_equal "1.34", location.elevation
+    assert_equal "physical", location.domain
+    assert_equal "outdoor", location.exposure
+    assert_equal "mobile", location.disposition
+  end
+
+  test "datastreams parse ok from v6 json" do
+    env = create_env_from_json_v6_file_one
+    assert_equal 3, env.datastreams.size
+
+    #the expected values for the datastreams in the test doc
+    expectations_list = [
+      #id, tag array, min, max, value, unit_symbol, unit_type, unit_value
+      ['0', ['tagD0'], '-9999.0', '1022.0', '0', 'C', 'basicSI', 'Celsius'], 
+      ['1', [], '0.0', '1023.0', '33', nil, nil, nil], 
+      ['2', ['tagD2a', 'tagD2b', 'tagD2c'], '23.4', '1021.0', '42.1', nil, nil, nil]
+    ]
+    env.datastreams.each_with_index do |ds, i|
+
+      e_identifier, e_tags, e_min_value, e_max_value, e_value, e_unit_symbol, e_unit_type, e_unit_value = expectations_list[i]
+
+      assert_equal e_identifier, ds.identifier
+
+      assert_equal e_tags.size, ds.tags.size, "should have right num of tags"
+      
+      e_tags.each do |expected_tag|
+        ds.tags.member? expected_tag
+      end
+
+      assert_equal e_min_value, ds.min_value
+      assert_equal e_max_value, ds.max_value
+      assert_equal e_value, ds.value
+      assert_equal e_unit_symbol, ds.unit_symbol
+      assert_equal e_unit_type, ds.unit_type
+      assert_equal e_unit_value, ds.unit_value
+    end
+  end
+
   # ---                 -------------------------------------------------------
   # --- csv input stuff -------------------------------------------------------
   # ---                 -------------------------------------------------------
@@ -379,7 +441,7 @@ class TestEnvironment < Test::Unit::TestCase
     #TODO: note, can't unload the class before other tests, so be careful with this approach to conveniences.
       class Eeml::Environment
       def values_quick
-        datastreams.map {|ds| ds.value}
+        datastreams.map {|ds| ds.values.last.value}
       end
     end
 
@@ -448,7 +510,7 @@ class TestEnvironment < Test::Unit::TestCase
     expected_json = File.read('test/data/doc_2_expected.json').rstrip
     expected_hash = JSON.parse(expected_json)
     output_hash = JSON.parse(output_json)
-    assert_equal(expected_hash, output_hash)
+    assert_json_hashes_equal(expected_hash, output_hash)
   end
 
   test "basic output in public json format - no location" do
@@ -516,6 +578,10 @@ class TestEnvironment < Test::Unit::TestCase
     return create_env_from_json_file('test/data/doc_1.json')
   end
 
+  def create_env_from_json_v6_file_one
+    return create_env_from_json_file('test/data/doc_1_v6.json')
+  end
+
   def create_env_from_json_file(filename)
     json = File.read(filename)
     return Environment.new_from_json(json)
@@ -525,8 +591,4 @@ class TestEnvironment < Test::Unit::TestCase
     return nil if json.nil?
     json.gsub(/","/, '"' + "\n" + '"').sort
   end
-  
-
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Neill Bogie, Sam Mulube
@@ -30,7 +30,7 @@ cert_chain:
   yyRwZdVyDdsafg==
   -----END CERTIFICATE-----
 
-date: 2009-09-29 00:00:00 +01:00
+date: 2009-11-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,13 +100,14 @@ extra_rdoc_files:
 - lib/eeml/constants.rb
 - lib/eeml/csv_parser.rb
 - lib/eeml/environment.rb
+- lib/eeml/environment_builder.rb
 - lib/eeml/exceptions.rb
 - lib/eeml/json_environment_parser_v005.rb
+- lib/eeml/json_environment_parser_v006.rb
 - lib/eeml/json_output.rb
 - lib/eeml/libxml_eeml_output_v005.rb
 - lib/eeml/libxml_eeml_parser_v005.rb
 - lib/eeml/output_registry.rb
-- lib/eeml/parser_registry.rb
 files: 
 - CHANGELOG
 - LICENSE
@@ -119,18 +120,20 @@ files:
 - lib/eeml/constants.rb
 - lib/eeml/csv_parser.rb
 - lib/eeml/environment.rb
+- lib/eeml/environment_builder.rb
 - lib/eeml/exceptions.rb
 - lib/eeml/json_environment_parser_v005.rb
+- lib/eeml/json_environment_parser_v006.rb
 - lib/eeml/json_output.rb
 - lib/eeml/libxml_eeml_output_v005.rb
 - lib/eeml/libxml_eeml_parser_v005.rb
 - lib/eeml/output_registry.rb
-- lib/eeml/parser_registry.rb
 - schemas/eeml/005.xsd
 - test/data/complete_namespaced.xml
 - test/data/difficult_tag.xml
 - test/data/doc_1.json
 - test/data/doc_1.xml
+- test/data/doc_1_v6.json
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
 - test/data/list.xml

data/lib/eeml/parser_registry.rb

@@ -1,18 +0,0 @@
-require 'eeml/libxml_eeml_parser_v005'
-require 'eeml/json_environment_parser_v005'
-
-module Eeml
-  class ParserRegistry # :nodoc:
-    #look at the given xml, build and return a new v005 or 006 parser, accordingly
-    #this should work whether the xml given is for a single environment, or for a results list
-    def self.get_xml_parser_for(xml_str)
-      LibXMLEemlParserV005.new
-    end
-
-    def self.get_json_parser_for(json_str)
-      JsonEnvironmentParserV005.new
-    end
-
-  end
-end
-