eeml 0.0.21 → 0.0.22

data/.gitignore

@@ -1,5 +1,7 @@
 pkg
+coverage/
 doc
 eeml.gemspec
 client_config.yml
+coverage/
 .*.swp

data/CHANGELOG

@@ -1,3 +1,14 @@
+commit 57a5f081eed2a218960c3bcc465edd3d586ebd2e
+Author: Levent Ali <lebreeze@gmail.com>
+Date:   Thu Sep 16 16:47:55 2010 +0100
+
+    Version 0.0.22
+    
+      Eeml::Environment.new_from_csv implemented
+      Added CSV parsers for v1 and v2
+      Exception raising in CSV parsers
+      Ripped out output rendering (to_json, to_eeml)
+
 commit 4c88cb1fe13661dbba20fca4877491c54a265a2a
 Author: Paul Bellamy <paul@connectedenvironments.com>
 Date:   Fri Aug 20 19:12:34 2010 +0100

data/Manifest

@@ -7,16 +7,14 @@ example.rb
 lib/blank.rb
 lib/eeml.rb
 lib/eeml/constants.rb
-lib/eeml/csv_parser.rb
+lib/eeml/csv_parser_v1.rb
+lib/eeml/csv_parser_v2.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
 schemas/eeml/005.xsd
 test/data/complete_namespaced.xml
 test/data/difficult_tag.xml

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.version = Eeml::VERSION
     gem.add_dependency("libxml-ruby", ">=1.1.3")
     gem.add_dependency("json", ">=1.4.3")
+    gem.add_dependency("lightcsv", ">=0.2.2")
     gem.files.exclude("test/data/real_xmls/*")
   end
 rescue LoadError

data/lib/eeml/csv_parser_v1.rb

@@ -0,0 +1,17 @@
+module Eeml
+  class CsvParserV1
+
+    def self.make_environment_from_csv(csv_content)
+      csv = LightCsv.parse(csv_content)
+      environment = Environment.new
+
+      raise(CsvEncodingError, "Currently Pachube can only accept csv for your most recent set of values. You have submitted #{csv.size} rows of data.") unless csv.size == 1
+
+      csv.first.each do |datastream_value|
+        environment.datastreams << DataStream.new(:value => datastream_value)
+      end
+      environment
+    end
+
+  end
+end

data/lib/eeml/csv_parser_v2.rb

@@ -0,0 +1,19 @@
+class CsvEncodingError < StandardError ; end
+
+module Eeml
+  class CsvParserV2
+
+    def self.make_environment_from_csv(csv_content)
+      csv = LightCsv.parse(csv_content)
+      environment = Environment.new
+
+      csv.each do |datastream|
+        raise(CsvEncodingError, "CSV is invalid. Double check you are properly encoding line breaks.") if datastream.length == 3 && datastream[1].include?('\n')
+        raise(CsvEncodingError, "CSV is invalid. Incorrect number of fields.") if datastream.length != 2
+        environment.datastreams << DataStream.new(:value => datastream.last, :identifier => datastream.first)
+      end
+      environment
+    end
+
+  end
+end

data/lib/eeml/environment.rb

@@ -130,17 +130,22 @@ module Eeml
 
     # Create multiple Environment objects from an EEML string containing multiple `environment` stanzas.
     def self.new_list_from_eeml(xml_str)
-      return EnvironmentBuilder.build_list_from_xml(xml_str)
+      EnvironmentBuilder.build_list_from_xml(xml_str)
     end
 
     # Create a new Environment object from an EEML string.
     def self.new_from_eeml(xml_str)
-      return EnvironmentBuilder.build_from_xml(xml_str)
+      EnvironmentBuilder.build_from_xml(xml_str)
     end
 
     # Create a new Environment object from a JSON string.
     def self.new_from_json(json_str)
-      return EnvironmentBuilder.build_from_json(json_str)
+      EnvironmentBuilder.build_from_json(json_str)
+    end
+
+    # Create a new Environment object from a CSV string
+    def self.new_from_csv(csv_str, version)
+      EnvironmentBuilder.build_from_csv(csv_str, version)
     end
   
     def update_datastreams_from_csv_values!(csv_values)
@@ -166,16 +171,6 @@ module Eeml
       end
     end
 
-    def to_eeml(version = Constants::EEML['0.5.0'][:version])
-      outputter = OutputRegistry.get_xml_output_for(version)
-      outputter.to_eeml(self)
-    end
-
-    def to_json
-      outputter = OutputRegistry.get_json_output_for
-      outputter.to_json(self)
-    end
-
     def private
       if @private
         return true

data/lib/eeml/environment_builder.rb

@@ -1,3 +1,5 @@
+require 'eeml/csv_parser_v1'
+require 'eeml/csv_parser_v2'
 require 'eeml/libxml_eeml_parser_v005'
 require 'eeml/libxml_eeml_parser_v051'
 require 'eeml/json_environment_parser_v005'
@@ -41,6 +43,15 @@ module Eeml
       end
       return parser.make_environment_from_hash(json)
     end
+
+    def self.build_from_csv(csv_str, version = :v1)
+      if version == :v2
+        parser = CsvParserV2
+      else
+        parser = CsvParserV1
+      end
+      parser.make_environment_from_csv(csv_str)
+    end
   end
 end
 

data/lib/eeml/json_environment_parser_v100.rb

@@ -49,7 +49,7 @@ module Eeml
       return if datastreams_hash.nil?
       datastreams = []
       datastreams_hash.each do |datastream_hash|  
-	datastream = DataStream.new
+      datastream = DataStream.new
         raise MissingAttribute.new('id', "data") if datastream_hash['id'].nil?
         datastream.identifier = datastream_hash['id']
         datastream.tags = datastream_hash['tags'] unless datastream_hash['tags'].nil?

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -68,7 +68,7 @@ module Eeml
     def extract_environment_from_node(env_node, env_to_populate)
       env = env_to_populate
       env.identifier = env_node['id']
-      env.updated = Time.gm(*ParseDate.parsedate(env_node['updated'])).utc if !env_node['updated'].nil?
+      env.updated = Time.parse(env_node['updated']) if !env_node['updated'].nil?
       
       env.creator = env_node['creator']
 
@@ -163,6 +163,7 @@ module Eeml
       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?
 
       data.add_value(value)
 

data/lib/eeml.rb

@@ -5,17 +5,17 @@ $:.unshift(File.dirname(__FILE__))
 require 'blank'
 require 'libxml'
 require 'json'
+require 'lightcsv'
 require 'eeml/constants'
 require 'eeml/exceptions'
 require 'eeml/environment'
 require 'eeml/environment_builder'
-require 'eeml/output_registry'
 require 'time'
 
 module Eeml
 
   # library version number
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 
   # TODO: put in some configuration file, not here
   LOCAL_EEML_SCHEMA_LOCATION = 'schemas/eeml/005.xsd'

data/test/data/eeml_datastream_051.xml

@@ -1,11 +1,39 @@
 <?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>
+  <environment updated="2010-09-23T09:54:57.873029Z" creator="http://www.pachube.com">
+    <title>title here</title>
+    <feed>http://appdev.loc:3000/api/feeds/.xml</feed>
+    <status>live</status>
+    <description>description here</description>
+    <icon>http://example.com/some/icon.gif</icon>
+    <website>http://example.com/studio/</website>
+    <email>someone@example.com</email>
+    <private>false</private>
+    <location domain="physical" exposure="outdoor" disposition="mobile">
+      <name>Up on the roof (somewhere)</name>
+      <lat>50.1</lat>
+      <lon>48.7</lon>
+      <ele>1.34</ele>
+    </location>
     <data id="0">
-      <tag>sometag</tag>
-      <current_value>65</current_value>
-      <max_value>100.0</max_value>
-      <min_value>4.0</min_value>
+      <tag>tagD0</tag>
+      <current_value at="2010-09-23T09:54:57.873029Z">0</current_value>
+      <max_value>1022.0</max_value>
+      <min_value>-9999.0</min_value>
+      <unit type="basicSI" symbol="C">Celsius</unit>
+    </data>
+    <data id="1">
+      <current_value at="2010-09-23T09:54:57.873029Z">33</current_value>
+      <max_value>1023.0</max_value>
+      <min_value>0.0</min_value>
+    </data>
+    <data id="2">
+      <tag>tagD2a</tag>
+      <tag>tagD2b</tag>
+      <tag>tagD2c</tag>
+      <current_value at="2010-09-23T09:54:57.873029Z">42.1</current_value>
+      <max_value>1021.0</max_value>
+      <min_value>23.4</min_value>
     </data>
   </environment>
 </eeml>

data/test/test_csv_parser_v1.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+require 'lib/eeml/csv_parser_v2.rb'
+class TestCsvParserV1 < Test::Unit::TestCase
+
+  test "should raise exception if too many rows" do
+    csv = "20,305\n30,1305"
+    exception = assert_raises CsvEncodingError do
+      CsvParserV1.make_environment_from_csv(csv)
+    end
+    assert_equal "Currently Pachube can only accept csv for your most recent set of values. You have submitted 2 rows of data.", exception.message
+  end
+
+  test "should parse and return Environment object with datastreams" do
+    csv = "20,10n5,fsa,432,6"
+    environment = CsvParserV1.make_environment_from_csv(csv)
+    assert_equal 5, environment.datastreams.length
+    csv.split(',').each_with_index do |value, index|
+      assert_nil environment.datastreams[index].identifier
+      assert_equal value, environment.datastreams[index].value
+    end
+  end
+end

data/test/test_csv_parser_v2.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+require 'lib/eeml/csv_parser_v2.rb'
+class TestCsvParserV2 < Test::Unit::TestCase
+
+  test "should raise exception if line breaks have dodgy characters" do
+    csv = "20,305\\n30,1305"
+    exception = assert_raises CsvEncodingError do
+      CsvParserV2.make_environment_from_csv(csv)
+    end
+    assert_equal "CSV is invalid. Double check you are properly encoding line breaks.", exception.message
+  end
+
+  test "should raise exception if too many fields" do
+    csv = "20,54,305\n30,1305"
+    exception = assert_raises CsvEncodingError do
+      CsvParserV2.make_environment_from_csv(csv)
+    end
+    assert_equal "CSV is invalid. Incorrect number of fields.", exception.message
+  end
+
+  test "should parse and return Environment object with datastreams" do
+    csv = "20,10\n5,6"
+    environment = CsvParserV2.make_environment_from_csv(csv)
+    assert_equal 2, environment.datastreams.length
+    assert_equal "20", environment.datastreams.first.identifier
+    assert_equal "10", environment.datastreams.first.value
+
+    assert_equal "5", environment.datastreams.last.identifier
+    assert_equal "6", environment.datastreams.last.value
+  end
+end

data/test/test_environment.rb

@@ -587,101 +587,8 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal values, env.values_quick
   end
 
-  # ---                   -----------------------------------------------------
-  # --- eeml output stuff -----------------------------------------------------
-  # ---                   -----------------------------------------------------
-
-  test "should output to xml ok" do
-    env = create_env_from_xml_file_one
-    xml_output = env.to_eeml
-    assert_not_nil xml_output
-    #File.open('out.xml', 'w') {|f| f.write xml_output }
-
-    expected_xml = File.read('test/data/doc_1.xml')
-    assert_equal expected_xml, xml_output
-  end
-
-  test "should output to eeml 0.5.1 ok" do
-    env = create_env_from_xml_file('eeml_datastream_051.xml')
-    xml_output = env.to_eeml('0.5.1')
-    assert_not_nil xml_output
-
-    expected_xml = File.read('test/data/eeml_datastream_051.xml')
-    assert_equal expected_xml, xml_output
-
-  end
-
-  implement "output - check that 'feed' url is correctly assembled" do
-  end
-
-  test "to_eeml of empty env should work" do
-    env = Environment.new
-    output_xml = env.to_eeml
-    #TODO: Review this 'expected' xml document for when env's empty.  I've cheated so far.  
-    #      Perhaps we don't allow serialization at all when basics are absent.
-    expected_xml = File.read('test/data/out_empty.xml')
-    assert_equal expected_xml, output_xml
-  end
-
-  # ---                   -----------------------------------------------------
-  # --- json output stuff -----------------------------------------------------
-  # ---                   -----------------------------------------------------
-  #DEV NOTE: use jsondiff tool to visual-diff expected and actual json http://tlrobinson.net/projects/js/jsondiff/
-
-  #TODO: decide what trailing whitespace should be output after json, and eeml, and correct tests
-  test "basic output in public json format" do
-    input_xml = File.read('test/data/doc_2.xml')
-    env = create_env_from_xml_string(input_xml)
-    output_json = env.to_json
-    expected_json = File.read('test/data/doc_2_expected.json').rstrip
-    expected_hash = JSON.parse(expected_json)
-    output_hash = JSON.parse(output_json)
-    assert_json_hashes_equal(expected_hash, output_hash)
-  end
-
-  test "basic output in public json format - no location" do
-    input_xml = File.read('test/data/doc_2.xml')
-    input_xml = remove_first_node_called('location', input_xml)
-    env = create_env_from_xml_string(input_xml)
-    output_json = env.to_json
-    output_hash = JSON.parse(output_json)
-
-    expected_json = File.read('test/data/doc_2_expected.json')
-    expected_hash = JSON.parse(expected_json)
-    assert_not_nil expected_hash.delete("location")
-    assert_json_hashes_equal(expected_hash, output_hash)
-  end
-
-  test "basic output in public json format - location but no latitude" do
-    input_xml = File.read('test/data/doc_2.xml')
-    input_xml = remove_first_node_called('lat', input_xml)
-    env = create_env_from_xml_string(input_xml)
-    actual_json = env.to_json
-    actual_hash = JSON.parse(actual_json)
-
-    assert_nil env.location.latitude
-    expected_json = File.read('test/data/doc_2_expected.json')
-    expected_hash = JSON.parse(expected_json)
-    expected_hash["location"].delete("lat")
-    #File.open('tmp_expected.json', 'w') {|f| f.write expected_hash.to_json }
-    #File.open('tmp_actual.json', 'w') {|f| f.write actual_hash.to_json }
-
-    assert_json_hashes_equal(expected_hash, actual_hash)
-  end
-
-  test "basic output in public json format - minimal env" do
-    env = Environment.new
-    assert_nil env.identifier
-    output_json = env.to_json
-    assert_not_nil output_json
-  end
-
   # --- convenience stuff - don't put tests under here ------------------------------
 
-
-
-
-
   def create_env_from_xml_string(string)
     environment = Environment.new_from_eeml(string)
     assert_not_nil environment

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: false
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Neill Bogie
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +01:00
+date: 2010-09-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +28,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 1
@@ -45,7 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 4
@@ -53,6 +50,21 @@ dependencies:
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: lightcsv
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :runtime
+  version_requirements: *id003
 description: Simple little library for programmatically manipulating EEML documents, in particular this library is designed to work with the Pachube web service.
 email: sam.mulube@gmail.com
 executables: []
@@ -73,19 +85,16 @@ files:
 - lib/blank.rb
 - lib/eeml.rb
 - lib/eeml/constants.rb
-- lib/eeml/csv_parser.rb
+- lib/eeml/csv_parser_v1.rb
+- lib/eeml/csv_parser_v2.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_environment_parser_v100.rb
-- lib/eeml/json_output.rb
-- lib/eeml/libxml_eeml_output_v005.rb
-- lib/eeml/libxml_eeml_output_v051.rb
 - lib/eeml/libxml_eeml_parser_v005.rb
 - lib/eeml/libxml_eeml_parser_v051.rb
-- lib/eeml/output_registry.rb
 - schemas/eeml/0.5.1.xsd
 - schemas/eeml/005.xsd
 - test/data/.gitignore
@@ -111,6 +120,8 @@ files:
 - test/data/no_namespace.xml
 - test/data/out_empty.xml
 - test/libxml_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
@@ -129,7 +140,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -138,7 +148,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -151,7 +160,9 @@ specification_version: 3
 summary: Simple little library for programmatically manipulating EEML documents.
 test_files: 
 - test/test_helper.rb
-- test/test_libxml_test_helper.rb
 - test/test_libxml_eeml_parser_v005.rb
+- test/test_libxml_test_helper.rb
 - test/test_environment.rb
+- test/test_csv_parser_v2.rb
 - test/libxml_test_helper.rb
+- test/test_csv_parser_v1.rb

data/lib/eeml/csv_parser.rb

@@ -1,15 +0,0 @@
-module Eeml
-  class CsvParser
-
-    #update the datastreams for the given environment, using the content in the given csv string.
-    def update_datastreams_from_csv(csv_content, environment)
-      # split values at commas
-      datastream_values = csv_content.split(/,/)
-
-      # now strip any whitespace
-      datastream_values.map! { |d| d.strip }
-
-    end
-
-  end
-end

data/lib/eeml/json_output.rb

@@ -1,87 +0,0 @@
-module Eeml
-
-  class JsonOutput # :nodoc:
-
-    def to_json(environment, options = { :full => true })
-      hash = to_public_json_data(environment, options)
-      hash.to_json
-    end
-
-    def to_public_json_data(environment, options = { :full => true })
-      environment_hash = { :id => Integer(environment.identifier), #we WANT this to fail early when we start using non-numeric identifiers
-                           :title => environment.title, 
-                           :feed => environment.feed_url, 
-                           :status => environment.status,
-                           :description => environment.description,
-                           :website => environment.website,
-                           :email => environment.email,
-                           :icon => environment.icon,
-                           :version => EEML['0.5.0'][:version],
-                           :tags => environment.tags }
-
-      environment_hash[:updated] = environment.updated.utc.iso8601 unless environment.updated.nil?  #TODO: was retrieved_at
-
-      environment_hash.delete_if { |key, value| value.blank? }
-
-      unless environment.location.nil?
-
-        # add location data
-        location_hash = { :domain => environment.location.domain,
-                          :exposure => environment.location.exposure,
-                          :disposition => environment.location.disposition,
-                          :name => environment.location.name,
-                          :ele => environment.location.elevation #currently, ele is output as a string
-                        }
-        location_hash[:lat] = Float(environment.location.latitude) if environment.location.latitude
-        location_hash[:lon] = Float(environment.location.longitude) if environment.location.longitude
-
-        location_hash.delete_if { |key, value| value.blank? }
-
-        environment_hash[:location] = location_hash unless location_hash.empty?
-      end
-
-      # if :full option given, add our datastream data into the returned json
-      if options[:full] == true
-        datastream_array = []
-
-        # add datastream data
-        environment.datastreams.each do |datastream|
-          datastream_array << datastream_to_json(datastream)
-        end
-
-        environment_hash[:datastreams] = datastream_array unless datastream_array.empty?
-      end
-
-      return environment_hash
-    end
-    
-    protected
-    def datastream_to_json(datastream)
-      datastream_hash = { :id => datastream.identifier }
-
-      datastream_hash[:tags] = datastream.tags unless datastream.tags.empty?
-
-      value_hash = { :min_value => datastream.min_value.to_s,
-                     :max_value => datastream.max_value.to_s,
-                     :current_value => datastream.value.to_s }
-
-      value_hash.delete_if { |key, value| value.blank? }
-
-      datastream_hash[:value] = value_hash unless value_hash.empty?
-
-      unit_hash = { :type => datastream.unit_type.to_s,
-                    :symbol => datastream.unit_symbol.to_s,
-                    :label => datastream.unit_value.to_s }
-
-      unit_hash.delete_if { |key, value| value.blank? }
-
-      datastream_hash[:unit] = unit_hash unless unit_hash.empty?
-
-      return datastream_hash
-    end
-
-
-
-  end
-end
-

data/lib/eeml/libxml_eeml_output_v005.rb

@@ -1,119 +0,0 @@
-module Eeml
-  class LibXMLEemlOutputV005 # :nodoc:
-    include LibXML
-    
-    # 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, Constants::EEML['0.5.0'][:href])
-      XML::Namespace.new(eeml, 'xsi', Constants::XSI_NAMESPACE)
-      eeml['version'] = Constants::EEML['0.5.0'][:version]
-      eeml['xsi:schemaLocation'] = Constants::EEML['0.5.0'][:schema_location]
-      eeml << xml_node_for_environment(environment)
-
-      return doc.to_s(:encoding => XML::Encoding::UTF_8)
-    end
-
-    def xml_node_for_environment(environment)
-      environment_node = XML::Node.new('environment')
-
-      #TODO: write all these strings out safely for xml
-      
-      environment_node['updated'] = environment.updated.utc.iso8601 unless environment.updated.nil?      
-      environment_node['id'] = environment.identifier.to_s unless environment.identifier.blank?
-      environment_node['creator'] = environment.creator.to_s unless environment.creator.blank?
-      
-      unless environment.title.blank?
-        environment_node << title_node = XML::Node.new('title')
-        title_node << environment.title
-      end
-
-      unless environment.feed_url.blank?
-        environment_node << feed_node = XML::Node.new('feed')
-        feed_node << environment.feed_url
-      end
-      
-      unless environment.status.blank?
-        environment_node << status_node = XML::Node.new('status')
-        status_node << environment.status
-      end
-
-      unless environment.description.blank?
-        environment_node << description_node = XML::Node.new('description')
-        description_node << environment.description
-      end
-
-      unless environment.icon.blank?
-        environment_node << icon_node = XML::Node.new('icon')
-        icon_node << environment.icon
-      end
-
-      unless environment.website.blank?
-        environment_node << website_node = XML::Node.new('website')
-        website_node << environment.website
-      end
-
-      unless environment.email.blank?
-        environment_node << email_node = XML::Node.new('email')
-        email_node << environment.email
-      end
-
-      unless environment.location.nil?
-        environment_node << location_node = XML::Node.new('location')
-        location_node['domain'] = environment.location.domain
-        location_node['exposure'] = environment.location.exposure unless environment.location.exposure.blank?
-        location_node['disposition'] = environment.location.disposition unless environment.location.disposition.blank?
-        
-        unless environment.location.name.blank?
-          location_node << location_name_node = XML::Node.new('name')
-          location_name_node << environment.location.name
-        end
-
-        location_node << lat_node = XML::Node.new('lat')
-        lat_node << environment.location.latitude
-
-        location_node << lng_node = XML::Node.new('lon')
-        lng_node << environment.location.longitude
-
-        unless environment.location.elevation.blank?
-          location_node << elevation_node = XML::Node.new('ele')
-          elevation_node << environment.location.elevation
-        end
-      end
-
-      environment.datastreams.each do |datastream|
-        environment_node << datastream_to_xml_node(datastream)
-      end
-
-      return environment_node
-    end
-
-    def datastream_to_xml_node(datastream)
-      datastream_node = XML::Node.new('data')
-      datastream_node['id'] = datastream.identifier.to_s
-
-      datastream.tags.each do |tag|
-        tag_node = XML::Node.new('tag')
-        tag_node << tag
-        datastream_node << tag_node
-      end    
-
-      datastream_node << value_node = XML::Node.new('value')
-
-      value_node['minValue'] = datastream.min_value.to_s unless datastream.min_value.to_s.empty?
-      value_node['maxValue'] = datastream.max_value.to_s unless datastream.max_value.to_s.empty?
-
-      value_node << datastream.value.to_s
-      
-      unless datastream.unit_value.to_s.empty? && datastream.unit_type.to_s.empty? && datastream.unit_symbol.to_s.empty?
-        datastream_node << unit_node = XML::Node.new('unit')
-        unit_node['type'] = datastream.unit_type.to_s unless datastream.unit_type.to_s.empty?
-        unit_node['symbol'] = datastream.unit_symbol.to_s unless datastream.unit_symbol.to_s.empty?
-        unit_node << datastream.unit_value.to_s unless datastream.unit_value.to_s.empty?
-      end
-
-      return datastream_node
-    end
-  end
-end

data/lib/eeml/libxml_eeml_output_v051.rb

@@ -1,124 +0,0 @@
-module Eeml
-  class LibXMLEemlOutputV051 # :nodoc:
-    include LibXML
-    
-    @@eeml_version = Constants::EEML['0.5.1']
-    # main method. creates an EEML 0.5.1 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, @@eeml_version[:href])
-      XML::Namespace.new(eeml, 'xsi', Constants::XSI_NAMESPACE)
-      eeml['version'] = @@eeml_version[:version]
-      eeml['xsi:schemaLocation'] = @@eeml_version[:schema_location]
-      eeml << xml_node_for_environment(environment)
-      return doc.to_s(:encoding => XML::Encoding::UTF_8)
-    end
-
-    def xml_node_for_environment(environment)
-      environment_node = XML::Node.new('environment')
-
-      #TODO: write all these strings out safely for xml
-      
-      environment_node['updated'] = environment.updated.utc.iso8601 unless environment.updated.nil?      
-      environment_node['id'] = environment.identifier.to_s unless environment.identifier.blank?
-      environment_node['creator'] = environment.creator.to_s unless environment.creator.blank?
-      
-      unless environment.title.blank?
-        environment_node << title_node = XML::Node.new('title')
-        title_node << environment.title
-      end
-
-      unless environment.feed_url.blank?
-        environment_node << feed_node = XML::Node.new('feed')
-        feed_node << environment.feed_url
-      end
-      
-      unless environment.status.blank?
-        environment_node << status_node = XML::Node.new('status')
-        status_node << environment.status
-      end
-
-      unless environment.description.blank?
-        environment_node << description_node = XML::Node.new('description')
-        description_node << environment.description
-      end
-
-      unless environment.icon.blank?
-        environment_node << icon_node = XML::Node.new('icon')
-        icon_node << environment.icon
-      end
-
-      unless environment.website.blank?
-        environment_node << website_node = XML::Node.new('website')
-        website_node << environment.website
-      end
-
-      unless environment.email.blank?
-        environment_node << email_node = XML::Node.new('email')
-        email_node << environment.email
-      end
-
-      environment.tags.each do |tag|
-        tag_node = XML::Node.new('tag')
-        tag_node << tag
-        datastream_node << tag_node
-      end
-
-      unless environment.location.nil?
-        environment_node << location_node = XML::Node.new('location')
-        location_node['domain'] = environment.location.domain
-        location_node['exposure'] = environment.location.exposure unless environment.location.exposure.blank?
-        location_node['disposition'] = environment.location.disposition unless environment.location.disposition.blank?
-        
-        unless environment.location.name.blank?
-          location_node << location_name_node = XML::Node.new('name')
-          location_name_node << environment.location.name
-        end
-
-        location_node << lat_node = XML::Node.new('lat')
-        lat_node << environment.location.latitude
-
-        location_node << lng_node = XML::Node.new('lon')
-        lng_node << environment.location.longitude
-
-        unless environment.location.elevation.blank?
-          location_node << elevation_node = XML::Node.new('ele')
-          elevation_node << environment.location.elevation
-        end
-      end
-
-      environment.datastreams.each do |datastream|
-        environment_node << datastream_to_xml_node(datastream)
-      end
-
-      return environment_node
-    end
-
-    def datastream_to_xml_node(datastream)
-      datastream_node = XML::Node.new('data')
-      datastream_node['id'] = datastream.identifier.to_s
-
-      datastream.tags.each do |tag|
-        tag_node = XML::Node.new('tag')
-        tag_node << tag
-        datastream_node << tag_node
-      end    
-
-      datastream_node << value_node = XML::Node.new('current_value')
-      datastream_node << max_value_node = XML::Node.new('max_value', datastream.max_value.to_s) unless datastream.max_value.to_s.empty?
-      datastream_node << min_value_node = XML::Node.new('min_value', datastream.min_value.to_s) unless datastream.min_value.to_s.empty?
-
-      value_node << datastream.value.to_s
-      
-      unless datastream.unit_value.to_s.empty? && datastream.unit_type.to_s.empty? && datastream.unit_symbol.to_s.empty?
-        datastream_node << unit_node = XML::Node.new('unit')
-        unit_node['type'] = datastream.unit_type.to_s unless datastream.unit_type.to_s.empty?
-        unit_node['symbol'] = datastream.unit_symbol.to_s unless datastream.unit_symbol.to_s.empty?
-        unit_node << datastream.unit_value.to_s unless datastream.unit_value.to_s.empty?
-      end
-
-      return datastream_node
-    end
-  end
-end

data/lib/eeml/output_registry.rb

@@ -1,18 +0,0 @@
-require 'eeml/libxml_eeml_output_v005'
-require 'eeml/libxml_eeml_output_v051'
-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 = Constants::EEML['0.5.0'][:version])
-      return LibXMLEemlOutputV051.new if version == Constants::EEML['0.5.1'][:version]
-      LibXMLEemlOutputV005.new
-    end
-
-    def self.get_json_output_for(version = Constants::EEML['0.5.0'][:version])
-      JsonOutput.new
-    end
-
-  end
-end