eeml 0.0.10 → 0.0.11

data/eeml.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eeml}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   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-11-21}
+  s.date = %q{2009-11-29}
   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 = ["CHANGELOG", "LICENSE", "README", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/environment_builder.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_environment_parser_v006.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb"]

data/lib/eeml/environment_builder.rb

@@ -4,7 +4,6 @@ require 'eeml/json_environment_parser_v006'
 
 module Eeml
   class EnvironmentBuilder # :nodoc:
-    include Constants
 
     def self.build_from_xml(xml_str)
       parser = LibXMLEemlParserV005.new
@@ -18,12 +17,12 @@ module Eeml
 
     def self.build_from_json(json_str)
       json = JSON.parse(json_str)
-      if json["version"] == EEML5_VERSION
+      if json["version"] == Constants::EEML5_VERSION
         parser = JsonEnvironmentParserV005.new
-      elsif json["version"] == EEML6_VERSION
+      elsif json["version"] == Constants::EEML6_VERSION
         parser = JsonEnvironmentParserV006.new
       else
-        raise "Invalid version specification. Permitted versions are #{EEML5_VERSION} and #{EEML6_VERSION}"
+        raise "Invalid version specification. Permitted versions are #{Constants::EEML5_VERSION} and #{Constants::EEML6_VERSION}"
       end
       return parser.make_environment_from_hash(json)
     end

data/lib/eeml/libxml_eeml_output_v005.rb

@@ -1,16 +1,15 @@
 module Eeml
   class LibXMLEemlOutputV005 # :nodoc:
     include LibXML
-    include Constants
     
     # main method. creates an EEML 5 document for the given environment.
     def to_eeml(environment)
       doc = XML::Document.new
       eeml = doc.root = XML::Node.new('eeml')
-      XML::Namespace.new(eeml, nil, EEML5_HREF)
-      XML::Namespace.new(eeml, 'xsi', XSI_NAMESPACE)
-      eeml['version'] = EEML5_VERSION
-      eeml['xsi:schemaLocation'] = EEML5_SCHEMA_LOCATION
+      XML::Namespace.new(eeml, nil, Constants::EEML5_HREF)
+      XML::Namespace.new(eeml, 'xsi', Constants::XSI_NAMESPACE)
+      eeml['version'] = Constants::EEML5_VERSION
+      eeml['xsi:schemaLocation'] = Constants::EEML5_SCHEMA_LOCATION
       eeml << xml_node_for_environment(environment)
 
       return doc.to_s(:encoding => XML::Encoding::UTF_8)

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -4,7 +4,6 @@ module Eeml
   class LibXMLEemlParserV005 # :nodoc:
     include LibXML
     include Exceptions
-    include Constants
 
     #main method
     
@@ -54,13 +53,13 @@ module Eeml
 
     #multiple (zero or more)
     def extract_environments_from_doc(doc)
-      env_nodes = doc.find('x:environment', "x:#{EEML5_HREF}")
+      env_nodes = doc.find('x:environment', "x:#{Constants::EEML5_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)
-      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{EEML5_HREF}")
+      env_node = find_first_node_or_fail(doc, 'x:environment', 'environment', "x:#{Constants::EEML5_HREF}")
       return extract_environment_from_node(env_node, env_to_populate)
     end
 
@@ -72,19 +71,19 @@ module Eeml
       
       env.creator = env_node['creator']
 
-      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{EEML5_HREF}")
-      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{EEML5_HREF}")
-      env.description = optional_content(env_node, 'x:description', 'description', "x:#{EEML5_HREF}")
-      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{EEML5_HREF}")
-      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{EEML5_HREF}")
-      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{EEML5_HREF}")
-      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{EEML5_HREF}")
+      env.title       = optional_content(env_node, 'x:title', 'title', "x:#{Constants::EEML5_HREF}")
+      env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{Constants::EEML5_HREF}")
+      env.description = optional_content(env_node, 'x:description', 'description', "x:#{Constants::EEML5_HREF}")
+      env.website     = optional_content(env_node, 'x:website', 'website', "x:#{Constants::EEML5_HREF}")
+      env.status      = optional_content(env_node, 'x:status', 'status', "x:#{Constants::EEML5_HREF}")
+      env.email       = optional_content(env_node, 'x:email', 'email', "x:#{Constants::EEML5_HREF}")
+      env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{Constants::EEML5_HREF}")
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
-      loc_node = env_node.find_first('x:location', "x:#{EEML5_HREF}")
+      loc_node = env_node.find_first('x:location', "x:#{Constants::EEML5_HREF}")
       env.location    = extractLocation(loc_node) if loc_node
 
-      datastream_nodes = env_node.find('x:data', "x:#{EEML5_HREF}")
+      datastream_nodes = env_node.find('x:data', "x:#{Constants::EEML5_HREF}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
       env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
 
@@ -102,10 +101,10 @@ module Eeml
       loc.domain = node['domain']
       loc.disposition = node['disposition']
       loc.exposure = node['exposure']
-      loc.name = optional_content(node, 'x:name', 'name', "x:#{EEML5_HREF}")
-      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{EEML5_HREF}")
-      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{EEML5_HREF}")
-      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{EEML5_HREF}")
+      loc.name = optional_content(node, 'x:name', 'name', "x:#{Constants::EEML5_HREF}")
+      loc.latitude = optional_content(node, 'x:lat', 'lat', "x:#{Constants::EEML5_HREF}")
+      loc.longitude = optional_content(node, 'x:lon', 'lon', "x:#{Constants::EEML5_HREF}")
+      loc.elevation = optional_content(node, 'x:ele', 'ele', "x:#{Constants::EEML5_HREF}")
       return loc
     end
 
@@ -139,11 +138,11 @@ module Eeml
       data = DataStream.new
       raise MissingAttribute.new(node.name, 'id') if node['id'].nil?
       data.identifier = node['id']
-      node.find('x:tag', "x:#{EEML5_HREF}").each do |tag_node|
+      node.find('x:tag', "x:#{Constants::EEML5_HREF}").each do |tag_node|
         data.tags << tag_node.content.strip
       end
 
-      value_nodes = node.find('x:value', "x:#{EEML5_HREF}")
+      value_nodes = node.find('x:value', "x:#{Constants::EEML5_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
 
@@ -156,7 +155,7 @@ module Eeml
 
       data.add_value(value)
 
-      unit_nodes = node.find('x:unit', "x:#{EEML5_HREF}")
+      unit_nodes = node.find('x:unit', "x:#{Constants::EEML5_HREF}")
       raise exception_for_node(node, DataHasMultipleUnits, "Data node has multiple 'unit' nodes.") if unit_nodes.size > 1
 
       unit_node = unit_nodes.first

data/lib/eeml/output_registry.rb

@@ -4,11 +4,11 @@ require 'eeml/json_output'
 module Eeml
   class OutputRegistry # :nodoc:
     #look at the given xml, build and return a new v005 or 006 parser, accordingly
-    def self.get_xml_output_for(version = EEML5_VERSION)
+    def self.get_xml_output_for(version = Constants::EEML5_VERSION)
       LibXMLEemlOutputV005.new
     end
 
-    def self.get_json_output_for(version = EEML5_VERSION)
+    def self.get_json_output_for(version = Constants::EEML5_VERSION)
       JsonOutput.new
     end
 

data/lib/eeml.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Neill Bogie, Sam Mulube
@@ -30,7 +30,7 @@ cert_chain:
   yyRwZdVyDdsafg==
   -----END CERTIFICATE-----
 
-date: 2009-11-21 00:00:00 +00:00
+date: 2009-11-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency