eeml 0.0.29 → 0.0.32

data/lib/eeml/constants.rb

@@ -21,7 +21,7 @@ module Eeml
     EEML["0.5.0"] =
       {
         :href => 'http://www.eeml.org/xsd/005',
-        :version => '5',
+        :versions => ['5', '0.5.0'],
         :schema_location => 'http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd'
       }
 
@@ -29,18 +29,18 @@ module Eeml
     EEML["0.5.1"] = 
       {
         :href => 'http://www.eeml.org/xsd/0.5.1',
-        :version => '0.5.1',
+        :versions => '0.5.1',
         :schema_location => 'http://www.eeml.org/xsd/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.xsd'
       }
 
     JSON_API["0.6-alpha"] =
       {
-        :version => '0.6-alpha'
+        :versions => ['0.6', '0.6-alpha']
       }
 
     JSON_API["1.0.0"] =
       {
-        :version => "1.0.0"
+        :versions => ['1.0.0']
       }
 
 

data/lib/eeml/csv_parser_v1.rb

@@ -7,9 +7,8 @@ module Eeml
 
       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.add_datastreams(csv.first.collect { |datastream_value| DataStream.new(:value => datastream_value) })
+
       environment
     end
   end

data/lib/eeml/csv_parser_v2.rb

@@ -9,11 +9,13 @@ module Eeml
 
       csv = strip_content(csv)
 
-      csv.each do |datastream|
+      datastreams = csv.collect 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)
+        DataStream.new(:value => datastream.last, :identifier => datastream.first)
       end
+      environment.add_datastreams(datastreams)
+
       environment
     end
   end

data/lib/eeml/environment.rb

@@ -1,5 +1,6 @@
 module Eeml
   include Eeml::Constants
+  include Eeml::Exceptions
 
   # One of the component classes of Environment. Represents the location of the environment. Environments can only have a single location object.
   class Location
@@ -124,6 +125,13 @@ module Eeml
     def add_datastream(datastream)
       #TODO: consider checking for unique identifier
       datastreams << datastream
+      if dups = datastreams.map(&:identifier).compact.uniq!
+        raise Eeml::Exceptions::DuplicateDataStreams, "Duplicate Datastream IDs: #{dups.join(', ')}"
+      end
+    end
+
+    def add_datastreams(array)
+      array.each { |d| add_datastream d }
     end
 
     def remove_last_datastream

data/lib/eeml/environment_builder.rb

@@ -32,18 +32,20 @@ module Eeml
 
     def self.build_from_json(json_str)
       json = JSON.parse(json_str)
-      if json["version"].to_i == Constants::EEML['0.5.0'][:version].to_i
+      if Constants::EEML['0.5.0'][:versions].include? json["version"].to_s
         parser = JsonEnvironmentParserV005.new
-      elsif json["version"] == Constants::JSON_API['1.0.0'][:version]
+      elsif Constants::EEML['0.5.1'][:versions].include? json["version"].to_s
+        parser = JsonEnvironmentParserV005.new
+      elsif Constants::JSON_API['1.0.0'][:versions].include? json["version"].to_s
         parser = JsonEnvironmentParserV100.new
-      elsif json["version"].to_f == Constants::JSON_API['0.6-alpha'][:version].to_f
+      elsif Constants::JSON_API['0.6-alpha'][:versions].include? json["version"].to_s
         parser = JsonEnvironmentParserV006.new
       else
-        raise # raise something so we jump to the rescue block below
+        raise Eeml::Exceptions::BadVersion# raise something so we jump to the rescue block below
       end
       return parser.make_environment_from_hash(json)
-    rescue
-      raise JSON::ParserError, "Invalid version specification. Permitted versions are #{Constants::EEML['0.5.0'][:version]}, #{Constants::JSON_API["0.6-alpha"][:version]} and #{Constants::JSON_API["1.0.0"][:version]}"
+    rescue Eeml::Exceptions::BadVersion, TypeError
+      raise JSON::ParserError, "Invalid version specification. Permitted versions are #{Constants::EEML['0.5.0'][:versions].first}, #{Constants::JSON_API["0.6-alpha"][:versions].first} and #{Constants::JSON_API["1.0.0"][:versions].first}"
     end
 
     def self.build_from_csv(csv_str, version = :v1)

data/lib/eeml/exceptions.rb

@@ -23,9 +23,9 @@ module Eeml
     class DataHasMultipleUnits < BadEeml; end
     class DataHasMultipleValues < BadEeml; end
     class NoDataStreams < BadEeml; end
+    class DuplicateDataStreams < BadEeml; end
     class MissingNamespace < BadEeml; end
 
-
     #A structured exception which holds info about what was missing and from where.
     #Note: Some reasons we don't just hold everything in an unstructured exception message:
     #1. some bits might be useful for dev but not for the public, 
@@ -57,7 +57,9 @@ module Eeml
       def to_s
         "Missing attribute '#@attribute_name' from node '#@node_name'"
       end
-    end 
+    end
+    
+    class BadVersion < StandardError; end
   end
 end
 

data/lib/eeml/json_environment_parser_v005.rb

@@ -18,7 +18,7 @@ module Eeml
 
       env.location = buildLocation(env_hash)
 
-      env.datastreams = buildDatastreams(env_hash)
+      env.add_datastreams(buildDatastreams(env_hash))
   
       return env
     end

data/lib/eeml/json_environment_parser_v006.rb

@@ -18,7 +18,7 @@ module Eeml
 
       env.location = buildLocation(env_hash)
 
-      env.datastreams = buildDatastreams(env_hash)
+      env.add_datastreams(buildDatastreams(env_hash))
   
       return env
     end

data/lib/eeml/json_environment_parser_v100.rb

@@ -20,7 +20,7 @@ module Eeml
 
       env.location = buildLocation(env_hash)
 
-      env.datastreams = buildDatastreams(env_hash)
+      env.add_datastreams(buildDatastreams(env_hash))
   
       return env
     end

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -87,7 +87,7 @@ module Eeml
 
       datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
-      env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
+      env.add_datastreams(extractDataStreams(datastream_nodes)) unless datastream_nodes.empty?
 
       return env
     end

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -91,7 +91,7 @@ module Eeml
 
       datastream_nodes = env_node.find('x:data', "x:#{@@eeml_version[:href]}")
       # raise NoDataStreams.new, "no datastreams found"  if datastream_nodes.empty?
-      env.datastreams = extractDataStreams(datastream_nodes) unless datastream_nodes.empty?
+      env.add_datastreams(extractDataStreams(datastream_nodes)) unless datastream_nodes.empty?
 
       return env
     end

data/lib/eeml.rb

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

data/test/test_environment.rb

@@ -679,6 +679,45 @@ CSV
     assert_equal "CSV version could not be detected", exception.message
   end
 
+  # --- Other Unit Tests -------------------------------------------------------
+  # ---                  -------------------------------------------------------
+  # --- Stuff that gets used in lots of places ---------------------------------
+
+  test "environment#add_datastreams should add a group of datastreams" do
+    e = Environment.new
+    values = %w(e1 e2 e3)
+    e.add_datastreams values.collect {|v| DataStream.new(:value => v)}
+    assert_equal values.size, e.datastreams.size
+  end
+
+  test "environment#add_datastreams should raise an exception if passed duplicate datastreams" do
+    e = Environment.new
+    stream_ids = %w(ds1 ds2 ds1 ds3)
+    assert_raise Exceptions::DuplicateDataStreams, "Duplicate Datastream ID: ds1" do
+      e.add_datastreams stream_ids.collect {|id| DataStream.new(:identifier => id)}
+    end
+  end
+
+  test "environment#add_datastreams should raise an exception if datastream ids conflict with existing stream ids" do
+    e = Environment.new
+    stream_ids = %w(ds1 ds2 ds3)
+    e.add_datastreams stream_ids.collect {|id| DataStream.new(:identifier => id)}
+
+    assert_raise Exceptions::DuplicateDataStreams, "Duplicate Datastream ID: ds2" do
+      e.add_datastreams [DataStream.new(:identifier => "ds2")]
+    end
+  end
+
+  test "environment#add_datastream should raise an exception if datastream ids conflict with existing stream ids" do
+    e = Environment.new
+    stream_ids = %w(ds1 ds2 ds3)
+    e.add_datastreams stream_ids.collect {|id| DataStream.new(:identifier => id)}
+
+    assert_raise Exceptions::DuplicateDataStreams, "Duplicate Datastream ID: ds3" do
+      e.add_datastream DataStream.new(:identifier => "ds3")
+    end
+  end
+
   # --- convenience stuff - don't put tests under here ------------------------------
 
   def create_env_from_xml_string(string)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 95
   prerelease: false
   segments: 
   - 0
   - 0
-  - 29
-  version: 0.0.29
+  - 32
+  version: 0.0.32
 platform: ruby
 authors: 
 - Neill Bogie
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +00:00
+date: 2011-02-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency