eeml 0.0.39 → 0.0.40

data/lib/eeml.rb

@@ -16,6 +16,6 @@ require 'time'
 module Eeml
 
   # library version number
-  VERSION = '0.0.39'
+  VERSION = '0.0.40'
 
 end #module

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -142,7 +142,7 @@ module Eeml
       node.find('x:tag', "x:#{@@eeml_version[:href]}").each do |tag_node|
         data.tags << tag_node.content.strip
       end
-      data.has_tag_element = true
+      data.has_tag_element = data.tags.size > 0
 
       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?

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -87,7 +87,7 @@ module Eeml
       env_node.find('x:tag', "x:#{@@eeml_version[:href]}").each do |tag_node|
         env.tags << tag_node.content.strip
       end
-      env.has_tag_element = true
+      env.has_tag_element = env.tags.size > 0
 
       datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
@@ -149,7 +149,7 @@ module Eeml
       node.find('x:tag', "x:#{@@eeml_version[:href]}").each do |tag_node|
         data.tags << tag_node.content.strip
       end
-      data.has_tag_element = true
+      data.has_tag_element = data.tags.size > 0
 
       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?

data/test/data/environment_no_datastream_tags.xml

@@ -0,0 +1,13 @@
+<?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>
+    <tag>Cambodia</tag>
+    <tag>House</tag>
+    <data id="0">
+      <current_value>65</current_value>
+      <max_value>100.0</max_value>
+      <min_value>4.0</min_value>
+    </data>
+  </environment>
+</eeml>
+

data/test/data/environment_no_datastream_tags_005.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml xmlns="http://www.eeml.org/xsd/005" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd">
+  <environment updated="2009-02-11T10:56:56Z" id="1247" creator="http://example.com/creator/">
+    <title>title here</title>
+    <feed>http://example.com/api/1247.xml</feed>
+    <status>frozen</status>
+    <description>description here</description>
+    <icon>http://example.com/some/icon.gif</icon>
+    <website>http://example.com/studio/</website>
+    <email>someone@example.com</email>
+    <data id="0">
+      <value minValue="-9999.0" maxValue="1022.0">0</value>
+      <unit type="basicSI" symbol="C">Celsius</unit>
+    </data>
+  </environment>
+</eeml>

data/test/data/environment_no_feed_tags.xml

@@ -0,0 +1,12 @@
+<?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

@@ -496,6 +496,36 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal true, env.has_tag_element
   end
 
+  test "sets has_tag_element to false if no feed tag elements v051 xml" do
+    env = create_env_from_xml_file('environment_no_feed_tags.xml')
+
+    assert_equal 0, env.tags.size
+
+    assert_equal 1, env.datastreams.size
+    assert_equal false, env.has_tag_element
+  end
+
+  test "sets has_tag_element to false if no datastream tag elements v051 xml" do
+    env = create_env_from_xml_file('environment_no_datastream_tags.xml')
+
+    assert_equal 1, env.datastreams.size
+    assert_equal 0, env.datastreams.first.tags.size
+    assert_equal false, env.datastreams.first.has_tag_element
+  end
+
+  test "sets has_tag_element to false if no datastream tag elements v005 xml" do
+    env = create_env_from_xml_file('environment_no_datastream_tags_005.xml')
+
+    assert_equal 0, env.tags.size
+    assert_equal false, env.has_tag_element
+
+    assert_equal 1, env.datastreams.size
+    assert_equal 0, env.datastreams.first.tags.size
+    assert_equal false, env.datastreams.first.has_tag_element
+  end
+
+
+
   test "sets has_tag_element to false if there are no tag elements" do
     env = create_env_from_json_file('test/data/environment_no_tags.json')
     assert_equal 3, env.datastreams.size

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 0
-  - 39
-  version: 0.0.39
+  - 40
+  version: 0.0.40
 platform: ruby
 authors: 
 - Neill Bogie
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +00:00
+date: 2011-05-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,6 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
-- .gitignore
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -121,6 +120,9 @@ files:
 - test/data/eeml_datastream_051.xml
 - test/data/environment_empty_tags.json
 - test/data/environment_minimal_051.xml
+- test/data/environment_no_datastream_tags.xml
+- test/data/environment_no_datastream_tags_005.xml
+- test/data/environment_no_feed_tags.xml
 - test/data/environment_no_tags.json
 - test/data/environment_tags.json
 - test/data/environment_tags.xml
@@ -140,8 +142,8 @@ homepage:
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -171,9 +173,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/