eeml 0.0.38 → 0.0.39

data/lib/eeml.rb

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

data/lib/eeml/environment.rb

@@ -21,12 +21,13 @@ 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, :tags, :unit_symbol, :unit_type, :unit_value
+    attr_accessor :identifier, :tags, :unit_symbol, :unit_type, :unit_value, :has_tag_element
     attr_accessor :values
 
     def initialize(options = {})
       @identifier = options[:identifier]
       @tags = []
+      @has_tag_element = false
       @unit_symbol = options[:unit_symbol]
       @unit_type = options[:unit_type]
       @unit_value = options[:unit_value]
@@ -103,7 +104,7 @@ module Eeml
     attr_accessor :location
     attr_accessor :csv_version
     attr_accessor :datastreams
-    attr_accessor :tags
+    attr_accessor :tags, :has_tag_element
     attr_writer :private
 
     # Create a new Environment object by passing parameters in a hash (just
@@ -123,6 +124,7 @@ module Eeml
       @csv_version = options[:csv_version]
       @publisher = options[:publisher]
       @tags = []
+      @has_tag_element = false
     end
 
     def add_datastream(datastream)

data/lib/eeml/json_environment_parser_v005.rb

@@ -50,6 +50,7 @@ module Eeml
         datastream = DataStream.new
         raise MissingAttribute.new('id', "data") if datastream_hash['id'].nil?
         datastream.identifier = datastream_hash['id']
+        datastream.has_tag_element = !!datastream_hash['tags']
         datastream.tags = datastream_hash['tags'] unless datastream_hash['tags'].nil?
         
         value_hash = datastream_hash["value"]

data/lib/eeml/json_environment_parser_v006.rb

@@ -50,6 +50,7 @@ module Eeml
         datastream = DataStream.new
         raise MissingAttribute.new('id', "data") if datastream_hash['id'].nil?
         datastream.identifier = datastream_hash['id']
+        datastream.has_tag_element = !!datastream_hash['tags']
         datastream.tags = datastream_hash['tags'] unless datastream_hash['tags'].nil?
         
         values_arr = datastream_hash["values"]

data/lib/eeml/json_environment_parser_v100.rb

@@ -17,7 +17,8 @@ module Eeml
                             :creator => env_hash["creator"])
 
       env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
-
+      
+      env.has_tag_element = !!env_hash['tags']
       env.tags = env_hash['tags'] unless env_hash['tags'].nil?
 
       env.location = buildLocation(env_hash)
@@ -54,6 +55,7 @@ module Eeml
       datastream = DataStream.new
         raise MissingAttribute.new('id', "data") if datastream_hash['id'].nil?
         datastream.identifier = datastream_hash['id']
+        datastream.has_tag_element = !!datastream_hash['tags']
         datastream.tags = datastream_hash['tags'] unless datastream_hash['tags'].nil?
         
         #values_arr = datastream_hash["history"]

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -142,6 +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
 
       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,6 +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
 
       datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
@@ -148,6 +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
 
       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_empty_tags.json

@@ -0,0 +1,44 @@
+{"datastreams":[
+  {
+	  "current_value":"0",
+	  "at":"2009-02-11T10:56:56Z",
+	  "min_value":"-9999.0",
+	  "max_value":"1022.0",
+	  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
+	  "id":"0",
+	  "tags":[]
+},
+  {
+  "current_value":"33",
+  "at":"2009-02-11T10:56:55Z",
+  "min_value":"0.0","max_value":"1023.0",
+  "id":"1",
+  "tags":[]},
+  {"current_value":"42.1",
+  "at":"2009-02-11T10:55:10Z",
+  "min_value":"23.4","max_value":"1021.0",
+  "id":"2",
+  "tags":[]}
+],
+"description":"description here",
+"updated":"2010-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":"1.0.0",
+"owner":"http:\/\/www.pachube.com\/users\/joe",
+"publisher":"http:\/\/www.pachube.com",
+"tags":[]}

data/test/data/environment_no_tags.json

@@ -0,0 +1,40 @@
+{"datastreams":[
+  {
+	  "current_value":"0",
+	  "at":"2009-02-11T10:56:56Z",
+	  "min_value":"-9999.0",
+	  "max_value":"1022.0",
+	  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
+	  "id":"0"
+},
+  {
+  "current_value":"33",
+  "at":"2009-02-11T10:56:55Z",
+  "min_value":"0.0","max_value":"1023.0",
+  "id":"1"},
+  {"current_value":"42.1",
+  "at":"2009-02-11T10:55:10Z",
+  "min_value":"23.4","max_value":"1021.0",
+  "id":"2"}
+],
+"description":"description here",
+"updated":"2010-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":"1.0.0",
+"owner":"http:\/\/www.pachube.com\/users\/joe",
+"publisher":"http:\/\/www.pachube.com"}

data/test/test_environment.rb

@@ -213,6 +213,7 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal 'House', env.tags[1]
 
     assert_equal 1, env.datastreams.size
+    assert_equal true, env.has_tag_element
   end
 
   test "creates multiple environments from list xml" do
@@ -492,6 +493,27 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal 2, env.tags.size
     assert_equal env.tags[0], 'tagE0'
     assert_equal env.tags[1], 'tagE1'
+    assert_equal true, env.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
+
+    assert_equal false, env.has_tag_element
+    assert_equal env.datastreams[0].has_tag_element, false
+    assert_equal env.datastreams[1].has_tag_element, false
+    assert_equal env.datastreams[2].has_tag_element, false
+  end
+
+  test "sets has_tag_element to true if there are empty tag elements" do
+    env = create_env_from_json_file('test/data/environment_empty_tags.json')
+    assert_equal 3, env.datastreams.size
+
+    assert_equal true, env.has_tag_element
+    assert_equal env.datastreams[0].has_tag_element, true
+    assert_equal env.datastreams[1].has_tag_element, true
+    assert_equal env.datastreams[2].has_tag_element, true
   end
 
   test "parses a v6 input file ok" do
@@ -509,6 +531,7 @@ class TestEnvironment < Test::Unit::TestCase
     #env attrs
     assert_equal('1247', env.identifier)
     assert_equal('2009-02-11T10:56:56Z', env.updated.utc.iso8601)
+    assert_equal false, env.has_tag_element
   end
 
   test "location parses ok from json when parsing a v6 file" do
@@ -553,6 +576,7 @@ class TestEnvironment < Test::Unit::TestCase
       assert_equal e_unit_symbol, ds.unit_symbol
       assert_equal e_unit_type, ds.unit_type
       assert_equal e_unit_value, ds.unit_value
+      assert_equal false, env.has_tag_element
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: false
   segments: 
   - 0
   - 0
-  - 38
-  version: 0.0.38
+  - 39
+  version: 0.0.39
 platform: ruby
 authors: 
 - Neill Bogie
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +00:00
+date: 2011-05-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,7 +119,9 @@ files:
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
 - test/data/eeml_datastream_051.xml
+- test/data/environment_empty_tags.json
 - test/data/environment_minimal_051.xml
+- test/data/environment_no_tags.json
 - test/data/environment_tags.json
 - test/data/environment_tags.xml
 - test/data/list.xml
@@ -168,10 +170,10 @@ signing_key:
 specification_version: 3
 summary: Simple little library for programmatically manipulating EEML documents.
 test_files: 
-- test/test_libxml_eeml_parser_v005.rb
+- 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_environment.rb
-- test/libxml_test_helper.rb
-- test/test_helper.rb