eeml 0.0.5 → 0.0.6

data/Manifest

@@ -13,6 +13,7 @@ test/data/list.xml
 test/data/out_empty.xml
 test/data/complete_namespaced.xml
 test/data/no_namespace.xml
+test/data/difficult_tag.xml
 test/data/doc_1.xml
 test/data/doc_1.json
 test/data/doc_2.xml

data/eeml.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eeml}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-07-08}
+  s.date = %q{2009-08-18}
   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 = ["LICENSE", "CHANGELOG", "README", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/output_registry.rb", "lib/eeml/parser_registry.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/exceptions.rb", "lib/eeml/csv_parser.rb", "lib/eeml/json_output.rb", "lib/eeml/environment.rb", "lib/blank.rb"]
-  s.files = ["example.rb", "LICENSE", "CHANGELOG", "README", "test/test_environment.rb", "test/test_libxml_test_helper.rb", "test/libxml_test_helper.rb", "test/test_libxml_eeml_parser_v005.rb", "test/test_helper.rb", "test/data/minimal.xml", "test/data/doc_2_expected.json", "test/data/list.xml", "test/data/out_empty.xml", "test/data/complete_namespaced.xml", "test/data/no_namespace.xml", "test/data/doc_1.xml", "test/data/doc_1.json", "test/data/doc_2.xml", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/output_registry.rb", "lib/eeml/parser_registry.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/exceptions.rb", "lib/eeml/csv_parser.rb", "lib/eeml/json_output.rb", "lib/eeml/environment.rb", "lib/blank.rb", "schemas/eeml/005.xsd", "Rakefile", "Manifest", "eeml.gemspec"]
+  s.files = ["example.rb", "LICENSE", "CHANGELOG", "README", "test/test_environment.rb", "test/test_libxml_test_helper.rb", "test/libxml_test_helper.rb", "test/test_libxml_eeml_parser_v005.rb", "test/test_helper.rb", "test/data/minimal.xml", "test/data/doc_2_expected.json", "test/data/list.xml", "test/data/out_empty.xml", "test/data/complete_namespaced.xml", "test/data/no_namespace.xml", "test/data/difficult_tag.xml", "test/data/doc_1.xml", "test/data/doc_1.json", "test/data/doc_2.xml", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/output_registry.rb", "lib/eeml/parser_registry.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/exceptions.rb", "lib/eeml/csv_parser.rb", "lib/eeml/json_output.rb", "lib/eeml/environment.rb", "lib/blank.rb", "schemas/eeml/005.xsd", "Rakefile", "Manifest", "eeml.gemspec"]
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Eeml", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -140,7 +140,7 @@ module Eeml
       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|
-        data.tags << tag_node.content
+        data.tags << tag_node.content.strip
       end
 
       value_nodes = node.find('x:value', "x:#{EEML_HREF}")
@@ -150,7 +150,7 @@ module Eeml
       value_node = value_nodes.first
       data.min_value = value_node['minValue']
       data.max_value = value_node['maxValue']
-      data.value = value_node.content
+      data.value = value_node.content.strip
 
       unit_nodes = node.find('x:unit', "x:#{EEML_HREF}")
       raise exception_for_node(node, DataHasMultipleUnits, "Data node has multiple 'unit' nodes.") if unit_nodes.size > 1
@@ -159,7 +159,7 @@ module Eeml
       unless unit_node.nil?
         data.unit_symbol = unit_node['symbol']
         data.unit_type = unit_node['type']
-        data.unit_value = unit_node.content
+        data.unit_value = unit_node.content.strip
       end
 
       return data

data/lib/eeml.rb

@@ -14,7 +14,7 @@ require 'eeml/output_registry'
 module Eeml
 
   # library version number
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   # TODO: put in some configuration file, not here
   LOCAL_EEML_SCHEMA_LOCATION = 'schemas/eeml/005.xsd'

data/test/data/difficult_tag.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml version="5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.eeml.org/xsd/005" xsi:schemaLocation="http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd">
+  <environment>
+    <data id="4773635294300160">
+      <tag>
+        10.F59894010800</tag>
+      <tag>
+        Living Room, S wall</tag>
+      <value>
+        24.1875</value>
+      <unit type="derivedSI">
+        celsius</unit>
+    </data>
+    <data id="11318471228981248">
+      <tag>
+        28.3616F1010000</tag>
+      <tag>
+        Living Room, .7m above wood stove</tag>
+      <value>
+        24.4375</value>
+      <unit type="derivedSI">
+        celsius</unit>
+    </data>
+  </environment>
+</eeml>
+

data/test/test_environment.rb

@@ -175,6 +175,22 @@ class TestEnvironment < Test::Unit::TestCase
     assert_raise(MissingNamespace) {env = create_env_from_xml_file('no_namespace.xml')}
   end
 
+  test "ok parsing oddly tagged eeml file" do
+    env = create_env_from_xml_file('difficult_tag.xml')
+    assert_equal 2, env.datastreams.size
+    d = env.datastreams[0]
+    assert_equal 2, d.tags.size
+    assert_equal '10.F59894010800', d.tags[0]
+    assert_equal 'Living Room, S wall', d.tags[1]
+    d2 = env.datastreams[1]
+    assert_equal 2, d2.tags.size
+    assert_equal '28.3616F1010000', d2.tags[0]
+    assert_equal 'Living Room, .7m above wood stove', d2.tags[1]
+    assert_equal '24.1875', d.value
+    assert_equal '24.4375', d2.value
+    assert_equal 'celsius', d.unit_value
+  end
+
   test "creates multiple environments from list xml" do
     xml = File.read('test/data/list.xml')
     list = Environment.new_list_from_eeml(xml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Neill Bogie, Sam Mulube
@@ -30,7 +30,7 @@ cert_chain:
   yyRwZdVyDdsafg==
   -----END CERTIFICATE-----
 
-date: 2009-07-08 00:00:00 +01:00
+date: 2009-08-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - test/data/out_empty.xml
 - test/data/complete_namespaced.xml
 - test/data/no_namespace.xml
+- test/data/difficult_tag.xml
 - test/data/doc_1.xml
 - test/data/doc_1.json
 - test/data/doc_2.xml