eeml 0.0.4 → 0.0.5

data/Manifest

@@ -1,5 +1,4 @@
 example.rb
-eeml.gemspec
 LICENSE
 CHANGELOG
 README
@@ -12,6 +11,7 @@ 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

data/eeml.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eeml}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   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-02}
+  s.date = %q{2009-07-08}
   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", "eeml.gemspec", "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/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"]
+  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.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

@@ -18,10 +18,9 @@ module Eeml
     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, given_environment = nil)
+    def make_environments_from_xml(xml_str)
       doc = parse_xml(xml_str)
       raise MissingNamespace if doc.root.namespaces.namespace.blank?
-      env = Environment.new
       return extract_environments_from_doc(doc)
     end
 
@@ -54,15 +53,13 @@ module Eeml
 
     #multiple (zero or more)
     def extract_environments_from_doc(doc)
-      doc.root.namespaces.default_prefix = 'x'
-      env_nodes = doc.find('x:environment')
+      env_nodes = doc.find('x:environment', "x:#{EEML_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)
-      doc.root.namespaces.default_prefix = 'x'
-      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment')
+      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{EEML_HREF}")
       return extract_environment_from_node(env_node, env_to_populate)
     end
 
@@ -75,19 +72,19 @@ module Eeml
       
       env.creator = env_node['creator']
 
-      env.title       = optional_content(env_node, 'x:title', 'title')
-      env.feed_url    = optional_content(env_node, 'x:feed', 'feed')
-      env.description = optional_content(env_node, 'x:description', 'description')
-      env.website     = optional_content(env_node, 'x:website', 'website')
-      env.status      = optional_content(env_node, 'x:status', 'status')
-      env.email       = optional_content(env_node, 'x:email', 'email')
-      env.icon        = optional_content(env_node, 'x:icon', 'icon')
+      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{EEML_HREF}")
+      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{EEML_HREF}")
+      env.description = optional_content(env_node, 'x:description', 'description', "x:#{EEML_HREF}")
+      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{EEML_HREF}")
+      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{EEML_HREF}")
+      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{EEML_HREF}")
+      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{EEML_HREF}")
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
-      loc_node = env_node.find_first('x:location')
+      loc_node = env_node.find_first('x:location', "x:#{EEML_HREF}")
       env.location    = extractLocation(loc_node) if loc_node
 
-      datastream_nodes = env_node.find('x:data')
+      datastream_nodes = env_node.find('x:data', "x:#{EEML_HREF}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
       env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
 
@@ -105,10 +102,10 @@ module Eeml
       loc.domain = node['domain']
       loc.disposition = node['disposition']
       loc.exposure = node['exposure']
-      loc.name = optional_content(node, 'x:name', 'name')
-      loc.latitude = optional_content(node, 'x:lat', 'lat')
-      loc.longitude = optional_content(node, 'x:lon', 'lon')
-      loc.elevation = optional_content(node, 'x:ele', 'ele')
+      loc.name = optional_content(node, 'x:name', 'name', "x:#{EEML_HREF}")
+      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{EEML_HREF}")
+      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{EEML_HREF}")
+      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{EEML_HREF}")
       return loc
     end
 
@@ -142,11 +139,11 @@ module Eeml
       data = DataStream.new
       raise MissingAttribute.new(node.name, 'id') if node['id'].nil?
       data.identifier = node['id']
-      node.find('x:tag').each do |tag_node|
+      node.find('x:tag', "x:#{EEML_HREF}").each do |tag_node|
         data.tags << tag_node.content
       end
 
-      value_nodes = node.find('x:value')
+      value_nodes = node.find('x:value', "x:#{EEML_HREF}")
       raise exception_for_node(node, DataMissingValue, "Data node is missing value node.") if value_nodes.empty?
       raise exception_for_node(node, DataHasMultipleValues, "Data node has multiple 'value' nodes.") if value_nodes.size > 1
 
@@ -155,7 +152,7 @@ module Eeml
       data.max_value = value_node['maxValue']
       data.value = value_node.content
 
-      unit_nodes = node.find('x:unit')
+      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
 
       unit_node = unit_nodes.first
@@ -172,16 +169,16 @@ module Eeml
     #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)
-      node = base_node.find_first(xpath)
+    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, default = nil)
-      node = base_node.find_first(xpath)
+    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
 
@@ -192,8 +189,8 @@ module Eeml
       node.respond_to?(:name) ? node.name : 'root'
     end
 
-    def find_first_node_or_fail(base_node, xpath, description)
-      node = base_node.find_first(xpath)
+    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

data/lib/eeml.rb

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

data/test/data/complete_namespaced.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml:eeml xmlns:eeml="http://www.eeml.org/xsd/005"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd" version="5">
+    <eeml:environment updated="2007-05-04T18:13:51.0Z" creator="http://www.haque.co.uk" id="1">
+        <eeml:title>A Room Somewhere</eeml:title>
+        <eeml:feed>http://www.pachube.com/feeds/1.xml</eeml:feed>
+        <eeml:status>frozen</eeml:status>
+        <eeml:description>This is a room somewhere</eeml:description>
+        <eeml:icon>http://www.roomsomewhere/icon.png</eeml:icon>
+        <eeml:website>http://www.roomsomewhere/</eeml:website>
+        <eeml:location exposure="indoor" domain="physical" disposition="fixed">
+            <eeml:name>My Room</eeml:name>
+            <eeml:lat>32.4</eeml:lat>
+            <eeml:lon>22.7</eeml:lon>
+            <eeml:ele>0.2</eeml:ele>
+        </eeml:location>
+        <eeml:data id="0">
+            <eeml:tag>temperature</eeml:tag>
+            <eeml:tag>heat</eeml:tag>
+            <eeml:value maxValue="48.0" minValue="23.0">36.2</eeml:value>
+            <eeml:unit symbol="C" type="basicSI">Celsius</eeml:unit>
+        </eeml:data>
+        <eeml:data id="1">
+          <eeml:tag>nearest_avatar</eeml:tag>
+          <eeml:value>Bram Nogah</eeml:value>
+        </eeml:data>
+     </eeml:environment>
+</eeml:eeml>

data/test/test_environment.rb

@@ -163,6 +163,14 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal "36.2", datastream.value
   end
 
+  test "ok parsing fully namespaced eeml file" do
+    env = create_env_from_xml_file('complete_namespaced.xml')
+    assert_equal 2, env.datastreams.size
+
+    datastream = env.datastreams[0]
+    assert_equal "36.2", datastream.value
+  end
+
   test "fails if no default namespace provided" do
     assert_raise(MissingNamespace) {env = create_env_from_xml_file('no_namespace.xml')}
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Neill Bogie, Sam Mulube
@@ -30,7 +30,7 @@ cert_chain:
   yyRwZdVyDdsafg==
   -----END CERTIFICATE-----
 
-date: 2009-07-02 00:00:00 +01:00
+date: 2009-07-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,6 @@ extra_rdoc_files:
 - lib/blank.rb
 files: 
 - example.rb
-- eeml.gemspec
 - LICENSE
 - CHANGELOG
 - README
@@ -122,6 +121,7 @@ files:
 - 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
@@ -141,6 +141,7 @@ files:
 - schemas/eeml/005.xsd
 - Rakefile
 - Manifest
+- eeml.gemspec
 has_rdoc: true
 homepage: ""
 licenses: []