cosm-rb 0.2.00 → 0.2.01

data/lib/cosm-rb/datastream.rb

@@ -59,7 +59,7 @@ module Cosm
       return pass
     end
 
-    def initialize(input = {}, format = nil)
+    def initialize(input = {}, csv_version = nil, format = nil)
       raise InvalidFormatError, "Unknown format specified, currently we can only parse JSON, XML or CSV." unless [nil,:json,:xml,:csv].include?(format)
       if input.is_a? Hash
         self.attributes = input
@@ -68,7 +68,7 @@ module Cosm
       elsif format == :xml || (format.nil? && input.strip[0...1].to_s == "<")
         self.attributes = from_xml(input)
       else
-        self.attributes = from_csv(input)
+        self.attributes = from_csv(input, csv_version)
       end
     end
 

data/lib/cosm-rb/parsers/csv/datastream_defaults.rb

@@ -10,15 +10,39 @@ module Cosm
             # we are running under 1.8.x or 1.9.x
             raise InvalidCSVError, e.message
           end
-          raise InvalidCSVError, "CSV is invalid. Can only construct a Cosm::Datastream object from a single row of data" if rows.size > 1
-          row = rows.first
-          raise InvalidCSVError, "CSV is invalid. Too many fields; must only be a single value, or a timestamp and a value" if row.size > 2
-          if row.size == 2
-            return { "updated" => row[0].to_s.strip, "current_value" => row[1].to_s.strip }
-          else
+
+          version = FeedDefaults.detect_version(rows, csv_version)
+
+          raise InvalidCSVError, "CSV is invalid. Submitted data appears to be empty" if rows.nil?
+
+          if version == :v1
+            raise InvalidCSVError, "CSV is invalid. Can only construct a Cosm::Datastream object from a single row of data" if rows.size > 1
+            row = rows.first
+            raise InvalidCSVError, "CSV is invalid. Too many fields; must only be a single value" if row.size > 1
             return { "current_value" => row[0].to_s.strip }
+          else
+            row_sizes = rows.collect { |row| row.size }.uniq
+            raise InvalidCSVError, "CSV is invalid. Too many fields; must only be a single value, or a timestamp and a value" if row_sizes.max > 2
+
+            if rows.size == 1
+              # capture single lines (normal case)
+              row = rows.first
+
+              if row.size == 2
+                return { "updated" => row[0].to_s.strip, "current_value" => row[1].to_s.strip }
+              else
+                return { "current_value" => row[0].to_s.strip }
+              end
+            else
+              # capture multiple lines
+              raise InvalidCSVError, "CSV is invalid. If multiple values are included, then a timestamp and value must be submitted for every row" if row_sizes.min < 2
+
+              return { "datapoints" => rows.collect { |row| { "at" => row[0].to_s.strip, "value" => row[1].to_s.strip } } }
+            end
           end
+
         end
+
       end
     end
   end

data/lib/cosm-rb/parsers/csv/feed_defaults.rb

@@ -5,6 +5,16 @@ module Cosm
       class InvalidCSVError < Cosm::ParserError ; end
 
       module FeedDefaults
+
+        class << self
+          def detect_version(rows, version = nil)
+            return version if version
+            return :v2 if rows.size >= 2
+            return :v1 if rows.size == 1 && rows.first.size != 2
+            raise UnknownVersionError, "CSV Version could not be detected"
+          end
+        end
+
         def from_csv(csv, csv_version = nil)
           begin
             rows = Cosm::CSV.parse(csv.strip)
@@ -13,17 +23,13 @@ module Cosm
             # we are running under 1.8.x or 1.9.x
             raise InvalidCSVError, e.message
           end
-          version = detect_version(rows, csv_version)
+
+          version = FeedDefaults.detect_version(rows, csv_version)
+
           hash = Hash.new
+
           if version == :v2
-            raise InvalidCSVError, "CSV is invalid. Incorrect number of fields" if rows.sort { |a,b| a.length <=> b.length }.reverse.first.length > 3
-            hash["datastreams"] = rows.collect {|row|
-              timestamp = {}
-              if row.size == 3
-                timestamp["updated"] = row[1].strip
-              end
-              { "id" => row.first.to_s.strip, "current_value" => row.last.to_s.strip }.merge(timestamp)
-            }
+            hash["datastreams"] = extract_datastreams(rows)
           elsif version == :v1
             raise InvalidCSVError, "CSV is invalid. Currently we can only accept CSV for your most recent set of values. You have submitted #{rows.size} rows of data." if rows.size > 1
             hash["datastreams"] = []
@@ -37,11 +43,49 @@ module Cosm
 
         private
 
-        def detect_version(rows, version = nil)
-          return version if version
-          return :v2 if rows.size >= 2
-          return :v1 if rows.size == 1 && rows.first.size != 2
-          raise UnknownVersionError, "CSV Version could not be detected"
+        def extract_datastreams(rows)
+          row_sizes = rows.collect { |row| row.size }.uniq
+          row_ids = rows.collect { |row| row.first.to_s.strip }.uniq
+
+          raise InvalidCSVError, "CSV is invalid. Incorrect number of fields" if row_sizes.max > 3
+
+          datastream_buckets = {}
+
+          # iterate through each row bucketing by datastream id
+          rows.each do |row|
+            # this splits each row into the id first element, and an array containing the rest of the row
+            id, *rest = *row
+
+            # make empty array if it doesn't exist
+            datastream_buckets[id.to_s.strip] ||= []
+            # add this row to the correct bucketed array
+            datastream_buckets[id.to_s.strip] << rest
+          end
+
+          datastreams = []
+
+          row_ids.each do |datastream_id|
+            datastream_data = datastream_buckets[datastream_id]
+
+            if datastream_data.size == 1
+              # single value for this datastream - current normal
+              data = datastream_data[0]
+              if data.size == 2
+                datastreams << { "id" => datastream_id, "updated" => data[0].to_s.strip, "current_value" => data[1].to_s.strip }
+              else
+                datastreams << { "id" => datastream_id, "current_value" => data[0].to_s.strip }
+              end
+            else
+              # multiple values for this datastream
+              raise InvalidCSVError, "CSV is invalid. If multiple values given they must include a timestamp for all values" if datastream_data.collect { |d| d.size }.min < 2
+
+              datapoints = datastream_data.collect { |datapoint_data| { "at" => datapoint_data[0].to_s.strip, "value" => datapoint_data[1].to_s.strip } }
+
+              datastreams << { "id" => datastream_id, "datapoints" => datapoints }
+            end
+          end
+
+          return datastreams
         end
       end
     end

data/lib/cosm-rb/parsers/xml/datapoint_defaults.rb

@@ -11,8 +11,10 @@ module Cosm
             raise InvalidXMLError, "Missing 'environment' node from base node" if parsed['eeml'].nil? || !parsed['eeml'].key?('environment')
             return {} if parsed['eeml']['environment'].nil?
             datastream = parsed['eeml']['environment']['data']
+            raise InvalidXMLError, "Multiple 'data' nodes are not permitted for Datapoint level XML" if datastream.is_a?(Array)
             datapoint = datastream['datapoints']
-            _extract_datapoint(datapoint)
+            raise InvalidXMLError, "Multiple 'value' nodes are not permitted for Datapoint level XML" if datapoint.is_a?(Array)
+            _extract_datapoints(datapoint).first
           rescue MultiXml::ParseError => e
             raise InvalidXMLError, e.message
           end

data/lib/cosm-rb/parsers/xml/datastream_defaults.rb

@@ -23,6 +23,7 @@ module Cosm
 
         # As produced by http://cosm.com/api/v2/FEED_ID/datastreams/DATASTREAM_ID.xml
         def transform_v2(xml)
+          validate_xml(xml)
           datastream = convert_to_hash(xml['data'])
           _extract_datastream(datastream).merge({
             :feed_id => strip(xml,'id'),
@@ -32,6 +33,7 @@ module Cosm
 
         # As produced by http://cosm.com/api/v1/FEED_ID/datastreams/DATASTREAM_ID.xml
         def transform_v1(xml)
+          validate_xml(xml)
           datastream = convert_to_hash(xml['data'])
           _extract_datastream_v1(datastream).merge({
             :feed_id => strip(xml,'id'),
@@ -40,6 +42,10 @@ module Cosm
           })
         end
 
+        def validate_xml(xml)
+          raise InvalidXMLError, "Multiple 'data' nodes are not permitted for Datastream level XML" if xml['data'].is_a?(Array)
+          raise InvalidXMLError, "Missing 'data' node from source document" if xml['data'].nil?
+        end
       end
     end
   end

data/lib/cosm-rb/parsers/xml/helpers.rb

@@ -86,10 +86,9 @@ module Cosm
         end
 
         def _extract_datapoint(xml)
-          value = convert_to_hash(xml['value'])
           {
-            :at => strip(value,'at'),
-            :value => strip(value,'__content__')
+            :at => strip(xml,'at'),
+            :value => strip(xml,'__content__')
           }
         end
 

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.2.00'
+  VERSION = '0.2.01'
 end

data/spec/cosm-rb/datastream_spec.rb

@@ -120,43 +120,43 @@ describe Cosm::Datastream do
 
     it "should raise known exception if passed json but told xml" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:json), :xml)
+        Cosm::Datastream.new(datastream_as_(:json), :v2, :xml)
       }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
     end
 
     it "should raise known exception if passed csv but told xml" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:csv), :xml)
+        Cosm::Datastream.new(datastream_as_(:csv), :v2, :xml)
       }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
     end
 
     it "should raise known exception if passed xml but told json" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:xml), :json)
+        Cosm::Datastream.new(datastream_as_(:xml), :v2, :json)
       }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
     end
 
     it "should raise known exception if passed csv but told json" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:csv), :json)
+        Cosm::Datastream.new(datastream_as_(:csv), :v2, :json)
       }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
     end
 
     it "should raise known exception if passed json but told csv" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:json), :csv)
+        Cosm::Datastream.new(datastream_as_(:json), :v2, :csv)
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
     end
 
     it "should raise known exception if passed xml but told csv" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:xml), :csv)
+        Cosm::Datastream.new(datastream_as_(:xml), :v2, :csv)
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
     end
 
     it "should raise known exception if told some format we don't accept" do
       expect {
-        Cosm::Datastream.new(datastream_as_(:xml), :html)
+        Cosm::Datastream.new(datastream_as_(:xml), :v2, :html)
       }.to raise_error(Cosm::InvalidFormatError)
     end
 

data/spec/cosm-rb/parsers/csv/datastream_defaults_spec.rb

@@ -4,13 +4,13 @@ describe "default datastream csv parser" do
   describe "csv" do
     it "should convert Pachube CSV into attributes hash" do
       csv = datastream_as_(:csv)
-      datastream = Cosm::Datastream.new(csv)
+      datastream = Cosm::Datastream.new(csv, :v2)
       datastream.should fully_represent_datastream(:csv, csv)
     end
 
     it "should capture timestamp if present" do
       csv = datastream_as_(:csv, :version => "timestamped")
-      datastream = Cosm::Datastream.new(csv)
+      datastream = Cosm::Datastream.new(csv, :v2, :csv)
       datastream.updated.should == "2011-02-16T16:21:01.834174Z"
       datastream.current_value.should == "14"
     end
@@ -29,11 +29,82 @@ describe "default datastream csv parser" do
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
     end
 
+    it "should raise error if passed more than a single value as v1" do
+      csv = "192,2"
+      expect {
+        Cosm::Datastream.new(csv, :v1)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
     it "should raise exception if passed garbage csv" do
       expect {
         Cosm::Datastream.new("badly, \"quoted", :csv)
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
     end
+
+    it "should not raise exception if passed data with nil value" do
+      expect {
+        datastream = Cosm::Datastream.new("2012-08-12T00:00:00Z,", :v2)
+        datastream.current_value.should be_empty
+      }.to_not raise_error
+    end
+
+    it "should parse multiline csv" do
+      csv = <<-CSV
+2012-02-08T00:00:00Z,123
+2012-02-08T00:00:10Z,124
+2012-02-08T00:00:20Z,125
+2012-02-08T00:00:30Z,126
+CSV
+      datastream = Cosm::Datastream.new(csv, :v2)
+      datastream.updated.should be_nil
+      datastream.current_value.should be_nil
+      datastream.datapoints.size.should == 4
+      datastream.datapoints.collect { |d| [d.at, d.value].join(",") }.join("\n").should == csv.strip
+    end
+
+    it "should not parse multiline csv passed to the v1 api" do
+      csv = <<-CSV
+2012-02-08T00:00:00Z,123
+2012-02-08T00:00:10Z,124
+2012-02-08T00:00:20Z,125
+2012-02-08T00:00:30Z,126
+CSV
+      expect {
+        datastream = Cosm::Datastream.new(csv, :v1)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
+    it "should not accept multiline csv with just single values" do
+      csv = <<-CSV
+123
+124
+125
+126
+CSV
+
+      expect {
+        datastream = Cosm::Datastream.new(csv, :v2)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
+    it "should strip whitespace from multiline values" do
+      csv = <<-CSV
+2012-02-08T00:00:00Z , 123
+2012-02-08T00:00:10Z , 124
+2012-02-08T00:00:20Z , 125
+2012-02-08T00:00:30Z , 126
+CSV
+
+      datastream = Cosm::Datastream.new(csv, :v2)
+      datastream.updated.should be_nil
+      datastream.current_value.should be_nil
+      datastream.datapoints.size.should == 4
+      datastream.datapoints.sort { |a, b| a.at <=> b.at }.collect { |d| [d.at, d.value] }.should == [["2012-02-08T00:00:00Z","123"],
+                                                                                                     ["2012-02-08T00:00:10Z","124"],
+                                                                                                     ["2012-02-08T00:00:20Z","125"],
+                                                                                                     ["2012-02-08T00:00:30Z","126"]]
+    end
   end
 end
 

data/spec/cosm-rb/parsers/csv/feed_defaults_spec.rb

@@ -61,6 +61,26 @@ CSV
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError, /3 rows/)
     end
 
+    context "nil attribute csv" do
+      before(:each) do
+        @csv = "0,,"
+      end
+
+      it "should not raise exception if csv has nil values as v1" do
+        expect {
+          feed = Cosm::Feed.new(@csv, :v1)
+          feed.datastreams.size.should == 3
+        }.to_not raise_error
+      end
+
+      it "should not raise exception if csv has nil attributes as v2" do
+        expect {
+          feed = Cosm::Feed.new(@csv, :v2)
+          feed.datastreams.size.should == 1
+        }.to_not raise_error
+      end
+    end
+
     context "unwanted whitespace" do
       it "should strip whitespace from v2" do
         dodgy_csv = <<-CSV
@@ -84,6 +104,107 @@ CSV
         feed.should fully_represent_feed(:csv_v1, good_csv)
       end
     end
+
+    context "multivalue csv" do
+      def check_multiline_csv(csv)
+        feed = Cosm::Feed.new(csv)
+
+        feed.datastreams.size.should == 2
+        feed.datastreams.each do |datastream|
+          datastream.updated.should be_nil
+          datastream.current_value.should be_nil
+          datastream.datapoints.size.should == 3
+          datastream.datapoints.sort { |a,b| a.at <=> b.at }.collect { |d| [d.at, d.value] }.should == [["2012-08-12T00:00:00Z", "1"],
+                                                                                               ["2012-08-12T00:00:05Z", "2"],
+                                                                                               ["2012-08-12T00:00:10Z", "3"]]
+        end
+      end
+
+      it "should capture multivalue csv with timestamps" do
+        csv = <<-CSV
+stream0,2012-08-12T00:00:00Z,1
+stream1,2012-08-12T00:00:00Z,1
+stream0,2012-08-12T00:00:05Z,2
+stream1,2012-08-12T00:00:05Z,2
+stream0,2012-08-12T00:00:10Z,3
+stream1,2012-08-12T00:00:10Z,3
+CSV
+
+        check_multiline_csv(csv)
+      end
+
+      it "should capture multivalue csv with timestamps no matter the grouping" do
+        csv = <<-CSV
+stream0,2012-08-12T00:00:00Z,1
+stream0,2012-08-12T00:00:05Z,2
+stream0,2012-08-12T00:00:10Z,3
+stream1,2012-08-12T00:00:00Z,1
+stream1,2012-08-12T00:00:05Z,2
+stream1,2012-08-12T00:00:10Z,3
+CSV
+
+        check_multiline_csv(csv)
+      end
+
+      it "should strip whitespace from multiline csv" do
+        csv = <<-CSV
+stream0, 2012-08-12T00:00:00Z, 1
+stream0, 2012-08-12T00:00:05Z, 2
+stream0, 2012-08-12T00:00:10Z, 3
+stream1, 2012-08-12T00:00:00Z, 1
+stream1, 2012-08-12T00:00:05Z, 2
+stream1, 2012-08-12T00:00:10Z, 3
+CSV
+
+        check_multiline_csv(csv)
+      end
+
+      it "should reject multivalue csv without timestamps" do
+        csv = <<-CSV
+stream0,1
+stream1,1
+stream0,2
+stream1,2
+stream0,3
+stream1,3
+CSV
+        expect {
+          Cosm::Feed.new(csv)
+        }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+      end
+
+      it "should reject multivalue csv if we tell it its v1" do
+        csv = <<-CSV
+stream0,2012-08-12T00:00:00Z,1
+stream1,2012-08-12T00:00:00Z,1
+CSV
+
+        expect {
+          Cosm::Feed.new(csv, :v1)
+        }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+      end
+
+      it "should permit an individual value within a larger update to not have a timestamp" do
+        csv = <<-CSV
+stream0,2012-08-12T00:00:00Z,1
+stream1,2012-08-12T00:00:00Z,1
+stream0,2012-08-12T00:00:05Z,2
+stream1,2012-08-12T00:00:05Z,2
+stream0,2012-08-12T00:00:10Z,3
+stream1,2012-08-12T00:00:10Z,3
+stream2,4
+CSV
+        feed = Cosm::Feed.new(csv)
+        feed.datastreams.size.should == 3
+        sorted_datastreams = feed.datastreams.sort { |a, b| a.id <=> b.id }
+        [0,1].each do |i|
+          sorted_datastreams[i].current_value.should be_nil
+          sorted_datastreams[i].updated.should be_nil
+          sorted_datastreams[i].datapoints.size.should == 3
+        end
+        sorted_datastreams[2].current_value.should == "4"
+      end
+    end
   end
 end
 

data/spec/cosm-rb/parsers/json/datastream_defaults_spec.rb

@@ -32,7 +32,7 @@ describe "default datastream json parser" do
 
   it "should raise known exception if passed garbage as JSON" do
     expect {
-      Cosm::Datastream.new("This is not json", :json)
+      Cosm::Datastream.new("This is not json", :v2, :json)
     }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
   end
 

data/spec/cosm-rb/parsers/xml/datastream_defaults_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe "default datastream xml parser" do
   context "0.5.1 (used by API v2)" do
     it "should convert into attributes hash" do
-      @xml = datastream_as_(:xml)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should convert into attributes hash when no version string but correct xmlns" do
@@ -13,30 +13,57 @@ describe "default datastream xml parser" do
     end
 
     it "should handle blank tags" do
-      @xml = datastream_as_(:xml, :except_node => :tag)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :except_node => :tag)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle blank units" do
-      @xml = datastream_as_(:xml, :except_node => :unit)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :except_node => :unit)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle missing unit attributes" do
-      @xml = datastream_as_(:xml, :except_node => :unit_attributes)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :except_node => :unit_attributes)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle missing timestamps" do
-      @xml = datastream_as_(:xml, :except_node => :timestamps)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :except_node => :timestamps)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
+    end
+
+    it "should capture all datapoints" do
+      xml = datastream_as_(:xml)
+      datastream = Cosm::Datastream.new(xml)
+      datastream.datapoints.size.should == 3
+    end
+
+    it "should raise exception if passed xml containing more than one datastream" do
+      xml = feed_as_(:xml)
+      expect {
+        Cosm::Datastream.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+    end
+
+    it "should raise exception if passed xml without any datastreams" do
+      xml = <<-XML
+<?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 id="504" creator="http://appdev.loc:3000/users/occaecati"> 
+  </environment> 
+</eeml>
+XML
+
+      expect {
+        Cosm::Datastream.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
     end
   end
 
   context "5 (used by API v1)" do
     it "should convert into attributes hash" do
-      @xml = datastream_as_(:xml, :version => "5")
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :version => "5")
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should convert into attributes hash even when no version attribute if correct xmlns" do
@@ -45,34 +72,55 @@ describe "default datastream xml parser" do
     end
 
     it "should handle blank tags" do
-      @xml = datastream_as_(:xml, :version => "5", :except_node => :tag)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :version => "5", :except_node => :tag)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle blank units" do
-      @xml = datastream_as_(:xml, :version => "5", :except_node => :unit)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :version => "5", :except_node => :unit)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle missing unit attributes" do
-      @xml = datastream_as_(:xml, :version => "5", :except_node => :unit_attributes)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :version => "5", :except_node => :unit_attributes)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle missing value attributes" do
-      @xml = datastream_as_(:xml, :version => "5", :except_node => :value_attributes)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :version => "5", :except_node => :value_attributes)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
     end
 
     it "should handle missing timestamps" do
-      @xml = datastream_as_(:xml, :version => "5", :except_node => :timestamps)
-      Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
+      xml = datastream_as_(:xml, :version => "5", :except_node => :timestamps)
+      Cosm::Datastream.new(xml).should fully_represent_datastream(:xml, xml)
+    end
+
+    it "should raise exception if passed xml containing more than one datastream" do
+      xml = feed_as_(:xml, :version => "5")
+      expect {
+        Cosm::Datastream.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+    end
+
+    it "should raise exception if passed xml without any datastreams" do
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml xmlns="http://www.eeml.org/xsd/005" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd"> 
+ <environment updated="2011-02-16T16:21:01.834174Z" id="504" creator="http://appdev.loc:3000/users/occaecati"> 
+  </environment> 
+</eeml>
+XML
+
+      expect {
+        Cosm::Datastream.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
     end
   end
 
   it "should raise exception if passed garbage as XML" do
     expect {
-      Cosm::Datastream.new("This is not xml", :xml)
+      Cosm::Datastream.new("This is not xml", :v2, :xml)
     }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
   end
 end

data/spec/cosm-rb/parsers/xml/feed_defaults_spec.rb

@@ -216,5 +216,39 @@ EOXML
       }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
     end
   end
+
+  context "feeds with datapoints" do
+    it "should grab all datapoints present in valid xml" do
+      xml = <<-XML
+<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>
+    <data id="0">
+      <datapoints>
+        <value at="2010-05-20T11:01:43Z">294</value>
+        <value at="2010-05-20T11:01:44Z">295</value>
+        <value at="2010-05-20T11:01:45Z">296</value>
+        <value at="2010-05-20T11:01:46Z">297</value>
+      </datapoints>
+    </data>
+    <data id="1">
+      <current_value at="2010-05-20T11:01:47Z">23</current_value> 
+      <datapoints>
+        <value at="2010-05-20T11:01:43Z">24</value>
+        <value at="2010-05-20T11:01:44Z">25</value>
+      </datapoints>
+    </data>
+  </environment>
+</eeml>
+XML
+      feed = Cosm::Feed.new(xml)
+      feed.datastreams.size.should == 2
+      feed.datastreams[0].current_value.should == nil
+      feed.datastreams[0].datapoints.size.should == 4
+      feed.datastreams[0].datapoints.collect { |d| d.value }.should == ["294", "295", "296", "297"]
+      feed.datastreams[1].current_value.should == "23"
+      feed.datastreams[1].datapoints.size.should == 2
+      feed.datastreams[1].datapoints.collect { |d| d.value }.should == ["24", "25"]
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ if !defined?(JRUBY_VERSION)
       SimpleCov.start do
         add_filter "/spec/"
         add_filter "/lib/cosm-rb.rb"
+        add_filter "/vendor/"
       end
     end
   end

data/spec/support/fully_represent_datastream_matcher.rb

@@ -77,10 +77,14 @@ RSpec::Matchers.define :fully_represent_datastream do |format, formatted_datastr
   def match_json_datastream(datastream, formatted_datastream)
     json = MultiJson.load(formatted_datastream)
     case json['version']
-    when '1.0.0'
+    when '0.6-alpha'
       raise "Not implemented"
     else
-      false
+      datastream.current_value.should == json["current_value"]
+      datastream.id.should == json["id"]
+      datastream.updated.should == json["at"]
+      datastream.min_value.should == json["min_value"]
+      datastream.max_value.should == json["max_value"]
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.00
+  - 1
+  version: 0.2.01
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -21,9 +21,7 @@ date: 2012-09-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +32,12 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_xml
+  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +48,12 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: multi_xml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,12 +64,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: yajl-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,12 +80,12 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: httparty
+  name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,12 +96,12 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
+  requirement: *id005
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: httparty
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,12 +112,12 @@ dependencies:
         - 5
         - x
         version: 1.5.x
+  requirement: *id006
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ox
+  name: fastercsv
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,12 +128,12 @@ dependencies:
         - 5
         - 9
         version: 1.5.9
+  requirement: *id007
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: ox
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,12 +142,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  name: ruby-debug
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,12 +158,12 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
+  requirement: *id009
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: rcov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -176,12 +174,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  requirement: *id010
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -192,8 +190,10 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  requirement: *id011
   type: :development
-  version_requirements: *id011
+  name: rspec
+  prerelease: false
 description: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
 email: 
 - paul.a.bellamy@gmail.com