eeml 0.0.36 → 0.0.37

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.authors = ["Neill Bogie", "Sam Mulube", "Levent Ali", "Paul Bellamy"]
     gem.version = Eeml::VERSION
     gem.add_dependency("libxml-ruby", ">=1.1.3")
-    gem.add_dependency("yajl-ruby", ">=0.7.8")
+    gem.add_dependency("yajl-ruby", ">=0.8.1")
     gem.add_dependency("lightcsv", ">=0.2.2")
     gem.files.exclude("test/data/real_xmls/*")
   end

data/lib/eeml.rb

@@ -6,7 +6,6 @@ require 'blank'
 require 'libxml'
 require 'yajl/json_gem'
 require 'lightcsv'
-require 'eeml/attr_alias'
 require 'eeml/constants'
 require 'eeml/exceptions'
 require 'eeml/helpers'
@@ -17,6 +16,6 @@ require 'time'
 module Eeml
 
   # library version number
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 
 end #module

data/lib/eeml/constants.rb

@@ -21,14 +21,6 @@ module Eeml
         :schema_location => 'http://www.eeml.org/xsd/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.xsd'
       }
 
-    # This is NEWER than version 5
-    EEML["0.5.2"] = 
-      {
-        :href => 'http://www.eeml.org/xsd/0.5.2',
-        :versions => '0.5.2',
-        :schema_location => 'http://www.eeml.org/xsd/0.5.2 http://www.eeml.org/xsd/0.5.2/0.5.2.xsd'
-      }
-
     JSON_API["0.6-alpha"] =
       {
         :versions => ['0.6', '0.6-alpha']

data/lib/eeml/environment.rb

@@ -93,27 +93,25 @@ module Eeml
     end
   end
 
-  # This class represents the main point of entry to this library. In general we will be creating instances of this class, either
-  # by manually specifying the parameters, or probably more commonly, by passing in either an EEML or JSON formatted string which
-  # will be parsed to initialize the object.
+  # This class represents the main point of entry to this library. In general
+  # we will be creating instances of this class, either by manually specifying
+  # the parameters, or probably more commonly, by passing in either an EEML or
+  # JSON formatted string which will be parsed to initialize the object.
   class Environment
-    attr_accessor :identifier, :updated, :publisher
+    attr_accessor :identifier, :updated, :creator, :publisher
     attr_accessor :title, :description, :feed_url, :website, :email, :icon, :status
-    attr_accessor :owner
     attr_accessor :location
     attr_accessor :csv_version
     attr_accessor :datastreams
     attr_accessor :tags
     attr_writer :private
-    attr_accessor :owner
 
-    attr_alias :creator, :publisher
-
-    # Create a new Environment object by passing parameters in a hash (just like creating an ActiveRecord object)
+    # Create a new Environment object by passing parameters in a hash (just
+    # like creating an ActiveRecord object)
     def initialize(options = {})
       @datastreams = []
       @identifier = options[:identifier]
-      @publisher = options[:publisher] || options[:creator]
+      @creator = options[:creator]
       @title = options[:title]
       @status = options[:status]
       @feed_url = options[:feed_url]
@@ -123,7 +121,7 @@ module Eeml
       @icon = options[:icon]
       @private = options[:private]
       @csv_version = options[:csv_version]
-      @owner = options[:owner]
+      @publisher = options[:publisher]
       @tags = []
     end
 

data/lib/eeml/environment_builder.rb

@@ -2,7 +2,6 @@ require 'eeml/csv_parser_v1'
 require 'eeml/csv_parser_v2'
 require 'eeml/libxml_eeml_parser_v005'
 require 'eeml/libxml_eeml_parser_v051'
-require 'eeml/libxml_eeml_parser_v052'
 require 'eeml/json_environment_parser_v005'
 require 'eeml/json_environment_parser_v006'
 require 'eeml/json_environment_parser_v100'
@@ -17,8 +16,6 @@ module Eeml
         xml = XML::Parser.string(xml_str).parse
         if xml.root.namespaces.default.to_s == Constants::EEML['0.5.1'][:href]
           parser = LibXMLEemlParserV051.new 
-        elsif xml.root.namespaces.default.to_s == Constants::EEML['0.5.2'][:href]
-          parser = LibXMLEemlParserV052.new
         else
           parser = LibXMLEemlParserV005.new
         end

data/lib/eeml/json_environment_parser_v100.rb

@@ -14,7 +14,7 @@ module Eeml
                             :identifier => env_hash["id"],
                             :private => env_hash["private"].to_s == "true",
                             :publisher => env_hash["publisher"],
-                            :owner => env_hash["owner"])
+                            :creator => env_hash["creator"])
 
       env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
 

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

@@ -39,5 +39,5 @@
 "title":"title here",
 "private":"false",
 "publisher":"http://www.pachube.com",
-"owner":"http://www.pachube.com/users/joe",
+"creator":"http://www.pachube.com/users/joe",
 "version":"1.0.0"}

data/test/test_environment.rb

@@ -36,24 +36,6 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal('http://example.com/creator/', env.creator)
   end
 
-  test "creating minimal Env object from some 0.5.2 eeml" do
-    env = create_env_from_eeml_052
-
-    # simple text nodes available
-    assert_equal("Pachube Office environment", env.title)
-  end
-
-  test "creating complete Env object from some 0.5.2 eeml" do
-    env = create_complete_env_from_eeml_052
-
-    # simple text nodes available
-    assert_equal("title here", env.title)
-
-    # new attributes
-    assert_equal("http://www.pachube.com", env.publisher)
-    assert_equal("http://www.pachube.com/users/joe", env.owner)
-  end
-
   test 'location parses ok' do
     env = create_env_from_xml_file_one
 
@@ -442,7 +424,7 @@ class TestEnvironment < Test::Unit::TestCase
 
     # new stuff
     assert_equal("http://www.pachube.com", env.publisher)
-    assert_equal("http://www.pachube.com/users/joe", env.owner)
+    assert_equal("http://www.pachube.com/users/joe", env.creator)
   end
 
   test "location parses ok from json when parsing a v1.0.0 file" do
@@ -787,12 +769,4 @@ CSV
     return nil if json.nil?
     json.gsub(/","/, '"' + "\n" + '"').sort
   end
-
-  def create_env_from_eeml_052
-    return create_env_from_xml_file("environment_minimal_052.xml")
-  end
-
-  def create_complete_env_from_eeml_052
-    return create_env_from_xml_file("eeml_datastream_052.xml")
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 0
-  - 36
-  version: 0.0.36
+  - 37
+  version: 0.0.37
 platform: ruby
 authors: 
 - Neill Bogie
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 61
         segments: 
         - 0
-        - 7
         - 8
-        version: 0.7.8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,6 @@ files:
 - example.rb
 - lib/blank.rb
 - lib/eeml.rb
-- lib/eeml/attr_alias.rb
 - lib/eeml/constants.rb
 - lib/eeml/csv_parser_v1.rb
 - lib/eeml/csv_parser_v2.rb
@@ -102,9 +101,7 @@ files:
 - lib/eeml/json_environment_parser_v100.rb
 - lib/eeml/libxml_eeml_parser_v005.rb
 - lib/eeml/libxml_eeml_parser_v051.rb
-- lib/eeml/libxml_eeml_parser_v052.rb
 - schemas/eeml/0.5.1.xsd
-- schemas/eeml/0.5.2.xsd
 - schemas/eeml/005.xsd
 - test/data/.gitignore
 - test/data/complete_namespaced.xml
@@ -122,9 +119,7 @@ files:
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
 - test/data/eeml_datastream_051.xml
-- test/data/eeml_datastream_052.xml
 - test/data/environment_minimal_051.xml
-- test/data/environment_minimal_052.xml
 - test/data/environment_tags.json
 - test/data/environment_tags.xml
 - test/data/list.xml

data/lib/eeml/attr_alias.rb

@@ -1,8 +0,0 @@
-class Module
-  def attr_alias(new_attr, original)
-    alias_method(new_attr, original) if method_defined?(original)
-    new_writer = "#{new_attr}="
-    original_writer = "#{original}="
-    alias_method(new_writer, original_writer) if method_defined?(original_writer)
-  end
-end

data/lib/eeml/libxml_eeml_parser_v052.rb

@@ -1,217 +0,0 @@
-require "parsedate.rb"
-module Eeml
-  #a parser for xml eeml v052, implemented with LibXML
-  class LibXMLEemlParserV052 # :nodoc:
-    include LibXML
-    include Exceptions
-
-    @@eeml_version = Constants::EEML['0.5.2']
-    #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(strip_content(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
-      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.parse(env_node['updated']) if !env_node['updated'].nil?
-      
-      env.publisher = env_node['publisher']
-
-      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]}") == "true")
-      env.owner       = optional_content(env_node, 'x:owner', 'owner', "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
-
-      env_node.find('x:tag', "x:#{@@eeml_version[:href]}").each do |tag_node|
-        env.tags << tag_node.content.strip
-      end
-
-      datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
-      # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
-      env.add_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 current_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
-      if value_node
-        value.value = value_node.content.strip 
-        value.recorded_at = value_node['at'] unless value_node['at'].blank?
-      end
-
-      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/schemas/eeml/0.5.2.xsd

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<xsd:schema xmlns="http://www.eeml.org/xsd/0.5.2" elementFormDefault="qualified" targetNamespace="http://www.eeml.org/xsd/0.5.2" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <xsd:element name="eeml">
-    <xsd:complexType>
-      <xsd:choice>
-        <xsd:element maxOccurs="unbounded" name="environment">
-          <xsd:complexType>         
-            <xsd:sequence>
-              <xsd:element minOccurs="0" name="title" type="xsd:string" />
-              <xsd:element minOccurs="0" name="feed" type="xsd:anyURI" />
-              <xsd:element minOccurs="0" name="status">
-                <xsd:simpleType>
-                  <xsd:restriction base="xsd:string">
-                    <xsd:enumeration value="frozen" />
-                    <xsd:enumeration value="live" />
-                  </xsd:restriction>
-                </xsd:simpleType>
-              </xsd:element>
-              <xsd:element minOccurs="0" name="private">
-                <xsd:simpleType>
-                  <xsd:restriction base="xsd:string">
-                    <xsd:enumeration value="true" />
-                    <xsd:enumeration value="false" />
-                  </xsd:restriction>
-                </xsd:simpleType>
-              </xsd:element>
-              <xsd:element minOccurs="0" name="description" type="xsd:string" />
-              <xsd:element minOccurs="0" name="icon" type="xsd:anyURI" />
-              <xsd:element minOccurs="0" name="website" type="xsd:anyURI" />
-              <xsd:element minOccurs="0" name="email" type="xsd:string" />
-              <xsd:element minOccurs="0" maxOccurs="unbounded" name="tag" type="xsd:string" />
-              <xsd:element minOccurs="0" name="owner">
-                <xsd:complexType>
-                  <xsd:sequence>
-                    <xsd:element minOccurs="0" name="login" type="xsd:string" />
-                    <xsd:element minOccurs="0" name="url" type="xsd:anyURI" />
-                  </xsd:sequence>
-                </xsd:complexType>
-              </xsd:element>
-              <xsd:element minOccurs="0" name="location">
-                <xsd:complexType>
-                  <xsd:sequence>
-                    <xsd:element minOccurs="0" name="name" type="xsd:string" />
-                    <xsd:element name="lat">
-                      <xsd:simpleType>
-                        <xsd:restriction base="xsd:double">
-                          <xsd:minInclusive value="-90" />
-                          <xsd:maxInclusive value="90" />
-                        </xsd:restriction>
-                      </xsd:simpleType>
-                    </xsd:element>
-                    <xsd:element name="lon">
-                      <xsd:simpleType>
-                        <xsd:restriction base="xsd:double">
-                          <xsd:minInclusive value="-180" />
-                          <xsd:maxInclusive value="180" />
-                        </xsd:restriction>
-                      </xsd:simpleType>
-                    </xsd:element>
-                    <xsd:element minOccurs="0" maxOccurs="1" name="ele" type="xsd:double" />
-                  </xsd:sequence>
-                  <xsd:attribute name="exposure" use="optional">
-                    <xsd:simpleType>
-                      <xsd:restriction base="xsd:string">
-                        <xsd:enumeration value="indoor" />
-                        <xsd:enumeration value="outdoor" />
-                      </xsd:restriction>
-                    </xsd:simpleType>
-                  </xsd:attribute>
-                  <xsd:attribute name="domain" use="required">
-                    <xsd:simpleType>
-                      <xsd:restriction base="xsd:string">
-                        <xsd:enumeration value="physical" />
-                        <xsd:enumeration value="virtual" />
-                      </xsd:restriction>
-                    </xsd:simpleType>
-                  </xsd:attribute>
-                  <xsd:attribute name="disposition" use="optional">
-                    <xsd:simpleType>
-                      <xsd:restriction base="xsd:string">
-                        <xsd:enumeration value="fixed" />
-                        <xsd:enumeration value="mobile" />
-                      </xsd:restriction>
-                    </xsd:simpleType>
-                  </xsd:attribute>
-                </xsd:complexType>
-              </xsd:element>            
-              <xsd:element minOccurs="1" maxOccurs="unbounded" name="data">
-                <xsd:complexType>
-                  <xsd:sequence>
-                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="tag" type="xsd:string" />
-                    <xsd:element minOccurs="0" maxOccurs="1" name="current_value">
-                      <xsd:complexType>
-                        <xsd:simpleContent>
-                          <xsd:extension base="xsd:string">
-                            <xsd:attribute name="at" type="xsd:dateTime" use="optional" />
-                          </xsd:extension>
-                        </xsd:simpleContent>
-                      </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element minOccurs="0" maxOccurs="1" name="max_value" type="xsd:string" />
-                    <xsd:element minOccurs="0" maxOccurs="1" name="min_value" type="xsd:string" />
-                    <xsd:element minOccurs="0" maxOccurs="1" name="datapoints">
-                      <xsd:complexType>
-                        <xsd:sequence>
-                          <xsd:element minOccurs="0" maxOccurs="unbounded" name="value">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="at" type="xsd:dateTime" use="optional" />
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                        </xsd:sequence>
-                      </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element minOccurs="0" maxOccurs="1" name="unit">
-                      <xsd:complexType>
-                        <xsd:simpleContent>
-                          <xsd:extension base="xsd:string">
-                            <xsd:attribute name="symbol" type="xsd:string" use="optional">
-                            </xsd:attribute>
-                            <xsd:attribute name="type" use="optional">
-                              <xsd:simpleType>
-                                <xsd:restriction base="xsd:string">
-                                  <xsd:enumeration value="basicSI" />
-                                  <xsd:enumeration value="derivedSI" />
-                                  <xsd:enumeration value="conversionBasedUnits" />
-                                  <xsd:enumeration value="derivedUnits" />
-                                  <xsd:enumeration value="contextDependentUnits" />
-                                </xsd:restriction>
-                              </xsd:simpleType>
-                            </xsd:attribute>
-                          </xsd:extension>
-                        </xsd:simpleContent>
-                      </xsd:complexType>
-                    </xsd:element>
-                  </xsd:sequence>
-                  <xsd:attribute name="id" type="xsd:nonNegativeInteger" use="required" />
-                </xsd:complexType>
-              </xsd:element>
-             </xsd:sequence>            
-            <xsd:attribute name="updated" use="optional">
-              <xsd:simpleType>
-                <xsd:restriction base="xsd:dateTime" />
-              </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="creator" use="optional">
-              <xsd:simpleType>
-                <xsd:restriction base="xsd:string" />
-              </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="id" type="xsd:nonNegativeInteger" use="optional" />
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:attribute name="version" use="optional">
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string">            
-            <xsd:enumeration value="0.5.1" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>

data/test/data/eeml_datastream_052.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eeml xmlns="http://www.eeml.org/xsd/0.5.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="0.5.2" xsi:schemaLocation="http://www.eeml.org/xsd/0.5.2 http://www.eeml.org/xsd/0.5.2/0.5.2.xsd">
-  <environment updated="2010-09-23T09:54:57.873029Z" publisher="http://www.pachube.com">
-    <title>title here</title>
-    <feed>http://appdev.loc:3000/api/feeds/.xml</feed>
-    <status>live</status>
-    <description>description here</description>
-    <icon>http://example.com/some/icon.gif</icon>
-    <website>http://example.com/studio/</website>
-    <email>someone@example.com</email>
-    <private>false</private>
-    <owner>http://www.pachube.com/users/joe</owner>
-    <location domain="physical" exposure="outdoor" disposition="mobile">
-      <name>Up on the roof (somewhere)</name>
-      <lat>50.1</lat>
-      <lon>48.7</lon>
-      <ele>1.34</ele>
-    </location>
-    <data id="0">
-      <tag>tagD0</tag>
-      <current_value at="2010-09-23T09:54:57.873029Z">0</current_value>
-      <max_value>1022.0</max_value>
-      <min_value>-9999.0</min_value>
-      <unit type="basicSI" symbol="C">Celsius</unit>
-    </data>
-    <data id="1">
-      <current_value at="2010-09-23T09:54:57.873029Z">33</current_value>
-      <max_value>1023.0</max_value>
-      <min_value>0.0</min_value>
-    </data>
-    <data id="2">
-      <tag>tagD2a</tag>
-      <tag>tagD2b</tag>
-      <tag>tagD2c</tag>
-      <current_value at="2010-09-23T09:54:57.873029Z">42.1</current_value>
-      <max_value>1021.0</max_value>
-      <min_value>23.4</min_value>
-    </data>
-  </environment>
-</eeml>

data/test/data/environment_minimal_052.xml

@@ -1,8 +0,0 @@
-<eeml xmlns="http://www.eeml.org/xsd/0.5.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="0.5.2" xsi:schemaLocation="http://www.eeml.org/xsd/0.5.2 http://www.eeml.org/xsd/0.5.2/0.5.2.xsd">
-  <environment>
-    <title>Pachube Office environment</title>
-    <data id="0" />
-    <data id="1" />
-  </environment>
-</eeml>
-