eeml 0.0.32 → 0.0.33

data/CHANGELOG

@@ -1,3 +1,11 @@
+commit 3ff4ebaa57c67011da5e8942c390a767108b9526
+Author: Levent Ali <lebreeze@gmail.com>
+Date:   Mon Feb 14 13:55:21 2011 +0000
+
+  Version 0.0.33
+
+    Current value is now optional on eeml 0.5.1
+
 commit 750283de4b56996f05adae5bc02f992c56af4ef5
 Author: Paul Bellamy <paul@connectedenvironments.com>
 Date:   Mon Jan 17 10:30:15 2011 +0000

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -151,7 +151,7 @@ module Eeml
       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, 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
@@ -162,8 +162,10 @@ module Eeml
       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
-      value.recorded_at = value_node['at'] unless value_node['at'].blank?
+      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)
 

data/lib/eeml.rb

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

data/schemas/eeml/0.5.1.xsd

@@ -81,7 +81,7 @@
                 <xsd:complexType>
                   <xsd:sequence>
                     <xsd:element minOccurs="0" maxOccurs="unbounded" name="tag" type="xsd:string" />
-                    <xsd:element name="current_value">
+                    <xsd:element minOccurs="0" maxOccurs="1" name="current_value">
                       <xsd:complexType>
                         <xsd:simpleContent>
                           <xsd:extension base="xsd:string">

data/test/data/environment_minimal_051.xml

@@ -0,0 +1,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>
+    <title>Pachube Office environment</title>
+    <data id="0" />
+    <data id="1" />
+  </environment>
+</eeml>
+

data/test/test_environment.rb

@@ -200,6 +200,11 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal 'celsius', d.unit_value
   end
 
+  test "parses environment with stub datastreams v051 xml" do
+    env = create_env_from_xml_file('environment_minimal_051.xml')
+    assert_equal 2, env.datastreams.size
+  end
+
   test "parses environment level tags from v051 xml" do
     env = create_env_from_xml_file('environment_tags.xml')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: false
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 33
+  version: 0.0.33
 platform: ruby
 authors: 
 - Neill Bogie
@@ -79,7 +79,6 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
-- .gitignore
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -119,6 +118,7 @@ files:
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
 - test/data/eeml_datastream_051.xml
+- test/data/environment_minimal_051.xml
 - test/data/environment_tags.json
 - test/data/environment_tags.xml
 - test/data/list.xml
@@ -137,8 +137,8 @@ homepage:
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -168,9 +168,9 @@ specification_version: 3
 summary: Simple little library for programmatically manipulating EEML documents.
 test_files: 
 - test/libxml_test_helper.rb
-- test/test_libxml_test_helper.rb
-- test/test_libxml_eeml_parser_v005.rb
-- test/test_csv_parser_v2.rb
-- test/test_helper.rb
 - test/test_csv_parser_v1.rb
+- test/test_csv_parser_v2.rb
 - test/test_environment.rb
+- test/test_helper.rb
+- test/test_libxml_eeml_parser_v005.rb
+- test/test_libxml_test_helper.rb

data/.gitignore

@@ -1,9 +0,0 @@
-.rvmrc
-pkg
-coverage/
-doc
-eeml.gemspec
-client_config.yml
-coverage/
-.*.swp
-gem_deps_manual/