cosm-rb 0.0.5 → 0.0.8

data/lib/cosm-rb.rb

@@ -14,6 +14,7 @@ require 'cosm-rb/base'
 require 'cosm-rb/validations'
 require 'cosm-rb/object_extensions'
 require 'cosm-rb/nil_content'
+require 'cosm-rb/exceptions'
 require 'cosm-rb/string_extensions'
 require 'cosm-rb/array_extensions'
 require 'cosm-rb/hash_extensions'

data/lib/cosm-rb/datapoint.rb

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

data/lib/cosm-rb/datastream.rb

@@ -59,12 +59,13 @@ module Cosm
       return pass
     end
 
-    def initialize(input = {})
+    def initialize(input = {}, 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
-      elsif input.strip[0...1].to_s == "{"
+      elsif format == :json || (format.nil? && input.strip[0...1].to_s == "{")
         self.attributes = from_json(input)
-      elsif input.strip[0...1].to_s == "<"
+      elsif format == :xml || (format.nil? && input.strip[0...1].to_s == "<")
         self.attributes = from_xml(input)
       else
         self.attributes = from_csv(input)

data/lib/cosm-rb/exceptions.rb

@@ -0,0 +1,5 @@
+module Cosm
+  class Error < StandardError; end
+  class InvalidFormatError < Error; end
+  class ParserError < Error; end
+end

data/lib/cosm-rb/feed.rb

@@ -38,12 +38,13 @@ module Cosm
       return pass
     end
 
-    def initialize(input = {}, csv_version = 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
-      elsif input.strip[0...1].to_s == "{"
+      elsif format == :json || (format.nil? && input.strip[0...1].to_s == "{")
         self.attributes = from_json(input)
-      elsif input.strip[0...5].to_s == "<?xml" || input.strip[0...5].to_s == "<eeml"
+      elsif format == :xml || (format.nil? && input.strip[0...5].to_s == "<?xml" || input.strip[0...5].to_s == "<eeml")
         self.attributes = from_xml(input)
       else
         self.attributes = from_csv(input, csv_version)

data/lib/cosm-rb/key.rb

@@ -33,10 +33,11 @@ module Cosm
     end
 
     # Build an instance from either a Hash, a JSON string, or an XML document
-    def initialize(input = {})
+    def initialize(input = {}, format = nil)
+      raise InvalidFormatError, "Unknown format specified, currently we can only parse JSON or XML." unless [nil,:json,:xml].include?(format)
       if input.is_a?(Hash)
         self.attributes = input
-      elsif input.strip[0...1].to_s == "{"
+      elsif format == :json || (format.nil? && input.strip[0...1].to_s == "{")
         self.attributes = from_json(input)
       else
         self.attributes = from_xml(input)

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

@@ -3,14 +3,20 @@ module Cosm
     module CSV
       module DatastreamDefaults
         def from_csv(csv, csv_version = nil)
-          rows = Cosm::CSV.parse(csv.strip)
+          begin
+            rows = Cosm::CSV.parse(csv.strip)
+          rescue Exception => e
+            # this might be a FasterCSV or CSV exception depending on whether
+            # 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], "current_value" => row[1].to_s }
+            return { "updated" => row[0].to_s.strip, "current_value" => row[1].to_s.strip }
           else
-            return { "current_value" => row[0].to_s }
+            return { "current_value" => row[0].to_s.strip }
           end
         end
       end

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

@@ -1,12 +1,18 @@
 module Cosm
   module Parsers
     module CSV
-      class UnknownVersionError < StandardError ; end
-      class InvalidCSVError < StandardError ; end
+      class UnknownVersionError < Cosm::ParserError ; end
+      class InvalidCSVError < Cosm::ParserError ; end
 
       module FeedDefaults
         def from_csv(csv, csv_version = nil)
-          rows = Cosm::CSV.parse(csv.strip)
+          begin
+            rows = Cosm::CSV.parse(csv.strip)
+          rescue Exception => e
+            # this might be a FasterCSV or CSV exception depending on whether
+            # we are running under 1.8.x or 1.9.x
+            raise InvalidCSVError, e.message
+          end
           version = detect_version(rows, csv_version)
           hash = Hash.new
           if version == :v2
@@ -14,14 +20,15 @@ module Cosm
             hash["datastreams"] = rows.collect {|row|
               timestamp = {}
               if row.size == 3
-                timestamp["updated"] = row[1]
+                timestamp["updated"] = row[1].strip
               end
-              { "id" => row.first.to_s, "current_value" => row.last.to_s }.merge(timestamp)
+              { "id" => row.first.to_s.strip, "current_value" => row.last.to_s.strip }.merge(timestamp)
             }
           elsif version == :v1
+            raise InvalidCSVError, "CSV is invalid. Currently we can only accept CSV for your most recent set of values. You have submitted 2 rows of data." if rows.size > 1
             hash["datastreams"] = []
             rows.first.each_with_index do |current_value, stream_id|
-              hash["datastreams"] << { "id" => stream_id.to_s, "current_value" => current_value }
+              hash["datastreams"] << { "id" => stream_id.to_s.strip, "current_value" => current_value.to_s.strip }
             end
           end
           hash["csv_version"] = version

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

@@ -3,7 +3,11 @@ module Cosm
     module JSON
       module DatapointDefaults
         def from_json(json)
-          ::JSON.parse(json)
+          begin
+            ::JSON.parse(json)
+          rescue ::JSON::ParserError => e
+            raise InvalidJSONError, e.message
+          end
         end
       end
     end

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

@@ -3,12 +3,17 @@ module Cosm
     module JSON
       module DatastreamDefaults
         def from_json(json)
-          hash = ::JSON.parse(json)
+          begin
+            hash = ::JSON.parse(json)
+          rescue ::JSON::ParserError => e
+            raise InvalidJSONError, e.message
+          end
+          raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)
           case hash['version']
-          when '1.0.0'
-            transform_1_0_0(hash)
-          when '0.6-alpha', nil
+          when '0.6-alpha'
             transform_0_6_alpha(hash)
+          when '1.0.0', nil
+            transform_1_0_0(hash)
           end
         end
 
@@ -19,7 +24,7 @@ module Cosm
           hash["id"] = hash.delete("id")
           hash["updated"] = hash.delete("at")
           hash["current_value"] = hash.delete("current_value")
-          hash["tags"] = hash["tags"].join(',') if hash["tags"]
+          hash["tags"] = join_tags(hash["tags"])
           if unit = hash.delete('unit')
             hash['unit_type'] = unit['type']
             hash['unit_symbol'] = unit['symbol']
@@ -37,7 +42,7 @@ module Cosm
             hash["max_value"] = hash["values"].first.delete("max_value")
             hash["min_value"] = hash["values"].first.delete("min_value")
           end
-          hash["tags"] = hash["tags"].join(',') if hash["tags"]
+          hash["tags"] = join_tags(hash["tags"])
           if unit = hash.delete('unit')
             hash['unit_type'] = unit['type']
             hash['unit_symbol'] = unit['symbol']

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

@@ -1,17 +1,23 @@
 module Cosm
   module Parsers
     module JSON
+      class InvalidJSONError < Cosm::ParserError; end
       module FeedDefaults
 
         include Cosm::Helpers
 
         def from_json(json)
-          hash = ::JSON.parse(json)
+          begin
+            hash = ::JSON.parse(json)
+          rescue ::JSON::ParserError => e
+            raise InvalidJSONError, e.message
+          end
+          raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)
           case hash['version']
-          when '1.0.0'
-            transform_1_0_0(hash)
           when '0.6-alpha', '0.6'
             transform_0_6_alpha(hash)
+          else
+            transform_1_0_0(hash)
           end
         end
 

data/lib/cosm-rb/parsers/json/key_defaults.rb

@@ -3,7 +3,12 @@ module Cosm
     module JSON
       module KeyDefaults
         def from_json(json)
-          hash = ::JSON.parse(json)["key"]
+          begin
+            hash = ::JSON.parse(json)["key"]
+          rescue ::JSON::ParserError => e
+            raise InvalidJSONError, e.message
+          end
+          raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)
           hash["id"] = hash.delete("id")
           hash["key"] = hash.delete("api_key")
           hash

data/lib/cosm-rb/parsers/json/search_result_defaults.rb

@@ -5,7 +5,13 @@ module Cosm
         include FeedDefaults
 
         def from_json(json)
-          hash = ::JSON.parse(json)
+          begin
+            hash = ::JSON.parse(json)
+          rescue ::JSON::ParserError => e
+            raise InvalidJSONError, e.message
+          end
+          raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)
+
           hash['results'] = hash['results'].collect do |feed|
             transform_1_0_0(feed)
           end

data/lib/cosm-rb/parsers/json/trigger_defaults.rb

@@ -3,7 +3,11 @@ module Cosm
     module JSON
       module TriggerDefaults
         def from_json(json)
-          ::JSON.parse(json)
+          begin
+            ::JSON.parse(json)
+          rescue ::JSON::ParserError => e
+            raise InvalidJSONError, e.message
+          end
         end
       end
     end

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

@@ -3,16 +3,22 @@ module Cosm
     module XML
       module DatapointDefaults
         def from_xml(xml)
-          xml = Nokogiri.parse(xml)
-          hash = {}
-          environment = xml.at_xpath("//xmlns:environment")
-          raise InvalidXMLError, "Missing 'environment' node from base node" if environment.nil?
-          data = environment.at_xpath("xmlns:data")
-          datapoint = data.at_xpath("xmlns:datapoints")
-          value = datapoint.at_xpath("xmlns:value")
-          hash["value"] = value.content
-          hash["at"] = value.attributes["at"].value
-          hash
+          begin
+            xml = Nokogiri::XML(xml) do |config|
+              config.strict.nonet
+            end
+            hash = {}
+            environment = xml.at_xpath("//xmlns:environment")
+            raise InvalidXMLError, "Missing 'environment' node from base node" if environment.nil?
+            data = environment.at_xpath("xmlns:data")
+            datapoint = data.at_xpath("xmlns:datapoints")
+            value = datapoint.at_xpath("xmlns:value")
+            hash["value"] = value.content
+            hash["at"] = value.attributes["at"].value
+            hash
+          rescue Nokogiri::SyntaxError => e
+            raise InvalidXMLError, e.message
+          end
         end
       end
     end

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

@@ -3,12 +3,18 @@ module Cosm
     module XML
       module DatastreamDefaults
         def from_xml(xml)
-          xml = Nokogiri.parse(xml)
-          case xml.root.attributes["version"].value
-          when "0.5.1"
-            transform_0_5_1(xml)
-          else # "5"
-            transform_5(xml)
+          begin
+            xml = Nokogiri::XML(xml) do |config|
+              config.strict.nonet
+            end
+            case xml.root.attributes["version"].value
+            when "5"
+              transform_5(xml)
+            else
+              transform_0_5_1(xml)
+            end
+          rescue Nokogiri::SyntaxError => e
+            raise InvalidXMLError, e.message
           end
         end
 

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

@@ -1,15 +1,21 @@
 module Cosm
   module Parsers
     module XML
-      class InvalidXMLError < StandardError; end
+      class InvalidXMLError < Cosm::ParserError; end
       module FeedDefaults
         def from_xml(xml)
-          xml = Nokogiri.parse(xml)
-          case xml.root.attributes["version"].value
-          when "0.5.1"
-            transform_0_5_1(xml)
-          else
-            transform_5(xml)
+          begin
+            xml = Nokogiri::XML(xml) do |config|
+              config.strict.nonet
+            end
+            case xml.root.attributes["version"].value
+            when "5"
+              transform_5(xml)
+            else
+              transform_0_5_1(xml)
+            end
+          rescue Nokogiri::SyntaxError => e
+            raise InvalidXMLError, e.message
           end
         end
 
@@ -31,7 +37,7 @@ module Cosm
           hash["email"] = strip(environment.at_xpath("xmlns:email").content)
           hash["private"] = strip(environment.at_xpath("xmlns:private").content)
           if (tags = environment.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
-            hash["tags"] = Cosm::CSV.generate_line(tags.sort{|a,b| a.downcase <=> b.downcase}).strip
+            hash["tags"] = Cosm::CSV.generate_line(tags.delete_if { |v| v.to_s.strip == "" }.sort{ |a,b| a.downcase <=> b.downcase}).strip
           end
           location = environment.at_xpath("xmlns:location")
           if location
@@ -68,7 +74,7 @@ module Cosm
               unit_hash = {}
             end
             if (tags = datastream.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
-              tags_hash = { "tags" => Cosm::CSV.generate_line(tags.sort { |a, b| a.downcase <=> b.downcase }).strip }
+              tags_hash = { "tags" => Cosm::CSV.generate_line(tags.delete_if { |v| v.strip.to_s == "" }.sort { |a, b| a.downcase <=> b.downcase }).strip }
             else
               tags_hash = {}
             end
@@ -125,7 +131,7 @@ module Cosm
               unit_hash = {}
             end
             if (tags = datastream.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
-              tags_hash = { "tags" => Cosm::CSV.generate_line(tags.sort { |a, b| a.downcase <=> b.downcase }).strip }
+              tags_hash = { "tags" => Cosm::CSV.generate_line(tags.delete_if { |v| v.to_s.strip == "" }.sort { |a, b| a.downcase <=> b.downcase }).strip }
             else
               tags_hash = {}
             end
@@ -133,8 +139,8 @@ module Cosm
               "id" => datastream.attributes["id"].value,
               "current_value" => strip(current_value.content),
               "updated" => environment.attributes["updated"].value,
-              "min_value" => current_value.attributes["minValue"].value,
-              "max_value" => current_value.attributes["maxValue"].value,
+              "min_value" => (current_value.nil? ? "" : current_value.attributes["minValue"].value),
+              "max_value" => (current_value.nil? ? "" : current_value.attributes["maxValue"].value),
             }.merge(unit_hash).merge(tags_hash)
           end
           hash

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

@@ -3,35 +3,41 @@ module Cosm
     module XML
       module KeyDefaults
         def from_xml(xml)
-          xml = Nokogiri.parse(xml)
-          hash = {}
-          hash["id"] = xml.at_xpath("//id").content if xml.at_xpath("//id")
-          hash["expires_at"] = xml.at_xpath("//expires-at").content if xml.at_xpath("//expires-at")
-          hash["key"] = xml.at_xpath("//api-key").content if xml.at_xpath("//api-key")
-          hash["label"] = xml.at_xpath("//label").content if xml.at_xpath("//label")
-          hash["user"] = xml.at_xpath("//user").content if xml.at_xpath("//user")
-          hash["private_access"] = xml.at_xpath("//private-access").content if xml.at_xpath("//private-access")
+          begin
+            xml = Nokogiri::XML(xml) do |config|
+              config.strict.nonet
+            end
+            hash = {}
+            hash["id"] = xml.at_xpath("//id").content if xml.at_xpath("//id")
+            hash["expires_at"] = xml.at_xpath("//expires-at").content if xml.at_xpath("//expires-at")
+            hash["key"] = xml.at_xpath("//api-key").content if xml.at_xpath("//api-key")
+            hash["label"] = xml.at_xpath("//label").content if xml.at_xpath("//label")
+            hash["user"] = xml.at_xpath("//user").content if xml.at_xpath("//user")
+            hash["private_access"] = xml.at_xpath("//private-access").content if xml.at_xpath("//private-access")
 
-          hash["permissions"] = xml.xpath("//key/permissions/permission").collect { |permission|
-            access_methods = permission.xpath("access-methods/access-method").collect { |method|
-              method.content.to_s.downcase
-            }
-            resources = permission.xpath("resources/resource").collect { |resource|
-              { "feed_id" => resource.at_xpath("feed-id").content,
-                "datastream_id" => resource.at_xpath("datastream-id").content,
-                "datastream_trigger_id" => resource.at_xpath("datastream-trigger-id").content
+            hash["permissions"] = xml.xpath("//key/permissions/permission").collect { |permission|
+              access_methods = permission.xpath("access-methods/access-method").collect { |method|
+                method.content.to_s.downcase
+              }
+              resources = permission.xpath("resources/resource").collect { |resource|
+                { "feed_id" => resource.at_xpath("feed-id").content,
+                  "datastream_id" => resource.at_xpath("datastream-id").content,
+                  "datastream_trigger_id" => resource.at_xpath("datastream-trigger-id").content
+                }.delete_if_nil_value
+              }
+              {
+                "referer" => permission.at_xpath("referer").content,
+                "source_ip" => permission.at_xpath("source-ip").content,
+                "private_access" => permission.at_xpath("private-access").content,
+                "access_methods" => access_methods,
+                "resources" => resources
               }.delete_if_nil_value
             }
-            {
-              "referer" => permission.at_xpath("referer").content,
-              "source_ip" => permission.at_xpath("source-ip").content,
-              "private_access" => permission.at_xpath("private-access").content,
-              "access_methods" => access_methods,
-              "resources" => resources
-            }.delete_if_nil_value
-          }
 
-          hash
+            hash
+          rescue Nokogiri::SyntaxError => e
+            raise InvalidXMLError, e.message
+          end
         end
       end
     end

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

@@ -3,17 +3,23 @@ module Cosm
     module XML
       module TriggerDefaults
         def from_xml(xml)
-          xml = Nokogiri.parse(xml)
-          hash = {}
-          hash["id"] = xml.at_xpath("//id").content if xml.at_xpath("//id")
-          hash["url"] = xml.at_xpath("//url").content if xml.at_xpath("//url")
-          hash["trigger_type"] = xml.at_xpath("//trigger-type").content if xml.at_xpath("//trigger-type")
-          hash["threshold_value"] = xml.at_xpath("//threshold-value").content if xml.at_xpath("//threshold-value")
-          hash["notified_at"] = xml.at_xpath("//notified-at").content if xml.at_xpath("//notified-at")
-          hash["user"] = xml.at_xpath("//user").content if xml.at_xpath("//user")
-          hash["environment_id"] = xml.at_xpath("//environment-id").content if xml.at_xpath("//environment-id")
-          hash["stream_id"] = xml.at_xpath("//stream-id").content if xml.at_xpath("//stream-id")
-          hash
+          begin
+            xml = Nokogiri::XML(xml) do |config|
+              config.strict.nonet
+            end
+            hash = {}
+            hash["id"] = xml.at_xpath("//id").content if xml.at_xpath("//id")
+            hash["url"] = xml.at_xpath("//url").content if xml.at_xpath("//url")
+            hash["trigger_type"] = xml.at_xpath("//trigger-type").content if xml.at_xpath("//trigger-type")
+            hash["threshold_value"] = xml.at_xpath("//threshold-value").content if xml.at_xpath("//threshold-value")
+            hash["notified_at"] = xml.at_xpath("//notified-at").content if xml.at_xpath("//notified-at")
+            hash["user"] = xml.at_xpath("//user").content if xml.at_xpath("//user")
+            hash["environment_id"] = xml.at_xpath("//environment-id").content if xml.at_xpath("//environment-id")
+            hash["stream_id"] = xml.at_xpath("//stream-id").content if xml.at_xpath("//stream-id")
+            hash
+          rescue Nokogiri::SyntaxError => e
+            raise InvalidXMLError, e.message
+          end
         end
       end
     end

data/lib/cosm-rb/search_result.rb

@@ -12,7 +12,7 @@ module Cosm
     def initialize(input = {})
       if input.is_a?(Hash)
         self.attributes = input
-      elsif input.strip[0...1].to_s == "{"
+      else
         self.attributes = from_json(input)
       end
     end

data/lib/cosm-rb/trigger.rb

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

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.0.5'
+  VERSION = '0.0.8'
 end

data/spec/cosm-rb/datapoint_spec.rb

@@ -42,6 +42,24 @@ describe Cosm::Datapoint do
       datapoint = Cosm::Datapoint.new(datapoint_as_(:hash))
       datapoint.value.should == "2000"
     end
+
+    it "should raise known exception if passed json but told xml" do
+      expect {
+        Cosm::Datapoint.new(datapoint_as_(:json), :xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+    end
+
+    it "should raise known exception if passed xml but told json" do
+      expect {
+        Cosm::Datapoint.new(datapoint_as_(:xml), :json)
+      }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+    end
+
+    it "should raise known exception if given unknown format" do
+      expect {
+        Cosm::Datapoint.new(datapoint_as_(:json), :msgpack)
+      }.to raise_error(Cosm::InvalidFormatError)
+    end
   end
 
   describe "#attributes" do

data/spec/cosm-rb/datastream_spec.rb

@@ -117,6 +117,49 @@ describe Cosm::Datastream do
         end
       end
     end
+
+    it "should raise known exception if passed json but told xml" do
+      expect {
+        Cosm::Datastream.new(datastream_as_(:json), :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)
+      }.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)
+      }.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)
+      }.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)
+      }.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)
+      }.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)
+      }.to raise_error(Cosm::InvalidFormatError)
+    end
+
   end
 
   describe "#attributes" do

data/spec/cosm-rb/feed_spec.rb

@@ -92,6 +92,50 @@ describe Cosm::Feed do
         end
       end
     end
+
+    context "specifying format" do
+      it "should raise known exception if told xml but given csv" do
+        expect {
+          Cosm::Feed.new(feed_as_(:csv), :v2, :xml)
+        }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+      end
+
+      it "should raise known exception if told xml but given json" do
+        expect {
+          Cosm::Feed.new(feed_as_(:json), nil, :xml)
+        }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+      end
+
+      it "should raise known exception if told json but given xml" do
+        expect {
+          Cosm::Feed.new(feed_as_(:xml), nil, :json)
+        }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+      end
+
+      it "should raise known exception if told json but given csv" do
+        expect {
+          Cosm::Feed.new(feed_as_(:csv), nil, :json)
+        }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+      end
+
+      it "should raise known exception if told csv but given xml" do
+        expect {
+          Cosm::Feed.new(feed_as_(:xml), :v2, :csv)
+        }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+      end
+
+      it "should raise known exception if told csv but given json" do
+        expect {
+          Cosm::Feed.new(feed_as_(:json), :v2, :csv)
+        }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+      end
+
+      it "should raise known exception if told format is something unknown" do
+        expect {
+          Cosm::Feed.new(feed_as_(:json), :v2, :msgpack)
+        }.to raise_error(Cosm::InvalidFormatError)
+      end
+    end
   end
 
   describe "#attributes" do

data/spec/cosm-rb/key_spec.rb

@@ -71,6 +71,26 @@ describe Cosm::Key do
       key = Cosm::Key.new(key_as_(:hash))
       key.permissions.first.access_methods.should == ["get", "put", "post", "delete"]
     end
+
+    context "specifying format" do
+      it "should raise known exception if told xml but given json" do
+        expect {
+          Cosm::Key.new(key_as_(:json), :xml)
+        }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+      end
+
+      it "should raise known exception if told json but given xml" do
+        expect {
+          Cosm::Key.new(key_as_(:xml), :json)
+        }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+      end
+
+      it "should raise known exception if given unknown format" do
+        expect {
+          Cosm::Key.new(key_as_(:xml), :gif)
+        }.to raise_error(Cosm::InvalidFormatError)
+      end
+    end
   end
 
   describe "#attributes" do

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

@@ -9,11 +9,10 @@ describe "default datastream csv parser" do
     end
 
     it "should capture timestamp if present" do
-      timestamp = Time.now.iso8601(6)
-      csv = "#{timestamp},123"
+      csv = datastream_as_(:csv, :version => "timestamped")
       datastream = Cosm::Datastream.new(csv)
-      datastream.updated.should == timestamp
-      datastream.current_value.should == "123"
+      datastream.updated.should == "2011-02-16T16:21:01.834174Z"
+      datastream.current_value.should == "14"
     end
 
     it "should raise error if passed more than a single row" do
@@ -29,6 +28,12 @@ describe "default datastream csv parser" do
         Cosm::Datastream.new(csv)
       }.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
   end
 end
 

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

@@ -48,6 +48,41 @@ CSV
         Cosm::Feed.new(csv)
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
     end
+
+    it "should raise an error if passed more than one row when we state it's v1" do
+      csv =<<-CSV
+This,2
+Wrong,3
+CSV
+
+      expect {
+        Cosm::Feed.new(csv, :v1)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
+    context "unwanted whitespace" do
+      it "should strip whitespace from v2" do
+        dodgy_csv = <<-CSV
+      0, 00035  
+stream1, 0012
+      2, 2012-08-02T14:11:14Z ," red car "
+CSV
+        good_csv = <<-CSV
+0,00035
+stream1,0012
+2,2012-08-02T14:11:14Z,red car
+CSV
+        feed = Cosm::Feed.new(dodgy_csv)
+        feed.should fully_represent_feed(:csv_v2, good_csv)
+      end
+
+      it "should strip whitespace from v1" do
+        dodgy_csv = %Q{  00035  ,  0012," red car"}
+        good_csv = "00035,0012,red car"
+        feed = Cosm::Feed.new(dodgy_csv)
+        feed.should fully_represent_feed(:csv_v1, good_csv)
+      end
+    end
   end
 end
 

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

@@ -12,4 +12,10 @@ describe "default datapoint json parser" do
     attributes["at"].should == json["at"]
     attributes["value"].should == json["value"]
   end
+
+  it "should raise known exeception if passed garbage as json" do
+    expect {
+      Cosm::Datapoint.new("This is not\nJSON", :json)
+    }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+  end
 end

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

@@ -1,24 +1,39 @@
 require 'spec_helper'
 
 describe "default datastream json parser" do
+  include Cosm::Helpers
+
   before(:each) do
     @datastream = Cosm::Datastream.new(datastream_as_(:json))
   end
 
-  it "should default to v1 API if no version is sent" do
-    @json = datastream_as_(:json, :version => "0.6-alpha", :except => [:version])
-    attributes = {}
-    lambda {attributes = @datastream.from_json(@json)}.should_not raise_error
+  it "should default to v2 if no version is present" do
+    @json = datastream_as_(:json, :version => "1.0.0", :except => [:version])
+    attributes = @datastream.from_json(@json)
     json = JSON.parse(@json)
     attributes["id"].should == json["id"]
-    attributes["updated"].should == json["values"].first["recorded_at"]
-    attributes["current_value"].should == json["values"].first["value"]
-    attributes["max_value"].should == json["values"].first["max_value"]
-    attributes["min_value"].should == json["values"].first["min_value"]
-    attributes["tags"].should == json["tags"].join(',')
+    attributes["updated"].should == json["at"]
+    attributes["current_value"].should == json["current_value"]
+    attributes["max_value"].should == json["max_value"]
+    attributes["min_value"].should == json["min_value"]
+    attributes["tags"].should == join_tags(json["tags"])
     attributes["unit_type"].should == json["unit"]["type"]
     attributes["unit_label"].should == json["unit"]["label"]
     attributes["unit_symbol"].should == json["unit"]["symbol"]
+    at_least_one_datapoint = false
+    attributes["datapoints"].each do |point|
+      at_least_one_datapoint = true
+      dp = json["datapoints"].detect {|dp| dp["at"] == point["at"]}
+      point["value"].should == dp["value"]
+      point["at"].should == dp["at"]
+    end
+    at_least_one_datapoint.should be_true
+  end
+
+  it "should raise known exception if passed garbage as JSON" do
+    expect {
+      Cosm::Datastream.new("This is not json", :json)
+    }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
   end
 
   context "1.0.0 (used by API v2)" do
@@ -31,7 +46,7 @@ describe "default datastream json parser" do
       attributes["current_value"].should == json["current_value"]
       attributes["max_value"].should == json["max_value"]
       attributes["min_value"].should == json["min_value"]
-      attributes["tags"].should == json["tags"].join(',')
+      attributes["tags"].should == join_tags(json["tags"])
       attributes["unit_type"].should == json["unit"]["type"]
       attributes["unit_label"].should == json["unit"]["label"]
       attributes["unit_symbol"].should == json["unit"]["symbol"]
@@ -49,6 +64,14 @@ describe "default datastream json parser" do
       @json = datastream_as_(:json, :except => [:tags])
       lambda {@datastream.from_json(@json)}.should_not raise_error
     end
+
+    it "should capture timestamp" do
+      @json = datastream_as_(:json, :version => "1.0.0-minimal_timestamp")
+      attributes = @datastream.from_json(@json)
+      json = JSON.parse(@json)
+      attributes["updated"].should_not be_nil
+      attributes["updated"].should == json["at"]
+    end
   end
 
   context "0.6-alpha (used by API v1)" do

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

@@ -29,11 +29,16 @@ describe "default feed json parser" do
     end
 
     it "should capture empty fields if present" do
-      json = "{\"version\":\"1.0.0\",\"description\":\"\",\"feed\":\"\",\"location\":{\"name\":\"\"}}"
+      json = "{\"version\":\"1.0.0\",\"description\":\"\",\"feed\":\"\",\"location\":{\"name\":\"\"},\"tags\":[],\"datastreams\":[{\"unit\":{\"label\":\"\",\"symbol\":\"\"},\"tags\":[]}]}"
       feed = Cosm::Feed.new(json)
       feed.description.should == ""
       feed.feed.should == ""
       feed.location_name.should == ""
+      feed.tags.should == ""
+      feed.datastreams.size.should == 1
+      feed.datastreams[0].unit_label.should == ""
+      feed.datastreams[0].unit_symbol.should == ""
+      feed.datastreams[0].tags.should == ""
     end
   end
 end

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

@@ -5,4 +5,10 @@ describe "default key json parser" do
     @json = key_as_(:json)
     Cosm::Key.new(@json).should fully_represent_key(:json, @json)
   end
+
+  it "should raise known exception if passed garbage as json" do
+    expect {
+      Cosm::Key.new("this ain't json", :json)
+    }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+  end
 end

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

@@ -7,6 +7,12 @@ describe "default search result json parser" do
       search_result = Cosm::SearchResult.new(json)
       search_result.should fully_represent_search_result(:json, json)
     end
+
+    it "should raise known exception if passed garbage as json" do
+      expect {
+        Cosm::SearchResult.new("Guess what, not JSON!")
+      }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+    end
   end
 end
 

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

@@ -13,4 +13,10 @@ describe "default trigger json parser" do
       attributes[key].should == json[key]
     end
   end
+
+  it "should raise known exception if passed garbage as json" do
+    expect {
+      Cosm::Trigger.new("This is not JSON", :json)
+    }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+  end
 end

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

@@ -59,5 +59,11 @@ describe "default datastream xml parser" do
       Cosm::Datastream.new(@xml).should fully_represent_datastream(:xml, @xml)
     end
   end
+
+  it "should raise exception if passed garbage as XML" do
+    expect {
+      Cosm::Datastream.new("This is not xml", :xml)
+    }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+  end
 end
 

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

@@ -27,6 +27,25 @@ describe "default feed xml parser" do
       Cosm::Feed.new(@xml).should fully_represent_feed(:xml, @xml)
     end
 
+    it "should handle present but empty tags" do
+      xml = <<-EOXML
+<?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/005 http://www.eeml.org/xsd/005/005.xsd">
+  <environment>
+    <title>ohai</title>
+    <tag></tag>
+    <data id="123">
+      <tag></tag>
+    </data>
+  </environment>
+</eeml>
+EOXML
+
+      feed = Cosm::Feed.new(xml)
+      feed.tags.should == ""
+      feed.datastreams.first.tags.should == ""
+    end
+
     it "should gracefully handle 0.5.1 xml missing the base environment node" do
       xml = <<-EOXML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -58,7 +77,6 @@ EOXML
       feed.datastreams.size.should == 1
       feed.datastreams.first.tags.should == "freakin lasers,humidity,Temperature"
     end
-
   end
 
   context "5 (used by API v1)" do
@@ -92,8 +110,25 @@ EOXML
       feed = Cosm::Feed.new(@xml)
       Cosm::Feed.new(@xml).should fully_represent_feed(:xml, @xml)
     end
+    
+    it "should handle present but empty tags" do
+      xml = <<-EOXML
+<?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>
+    <title>ohai</title>
+    <data id="123">
+      <tag></tag>
+    </data>
+  </environment>
+</eeml>
+EOXML
+
+      feed = Cosm::Feed.new(xml)
+      feed.datastreams.first.tags.should == ""
+    end
 
-    it "should gracefully handle 0.5.1 xml missing the base environment node" do
+    it "should gracefully handle 5 xml missing the base environment node" do
       xml = <<-EOXML
 <?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"> 
@@ -131,5 +166,45 @@ EOXML
       datastream.unit_label.should == "celsius"
     end
   end
+
+  context "garbage input" do
+    it "should not propogate nokogiri error for invalid xml" do
+      xml = <<-EOXML
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+    <channel>
+        <title>Skype Statistics</title>
+        <description>Statistics From Skype</description>
+        <link>http://www.skype.com/</link>
+        <lastBuildDate>Thu, 02 Aug 2012 13:50:01 +0000</lastBuildDate>
+        <image>
+            <url>http://www.skype.com/i/logos/skype.png</url>
+            <title>Skype</title>
+            <link>http://www.skype.com/</link>
+            <description>Statistics From Skype</description>
+        </image>
+        <ttl>60</ttl>
+        <item>
+            <title>Total Skype Downloads</title>
+            <link>http://www.skype.com/</link>
+            <description>2992280145</description>
+            <pubDate>Thu, 02 Aug 2012 13:50:01 +0000</pubDate>
+            <guid>Total Skype Downloads Thu, 02 Aug 2012 13:50:01 +0000</guid>
+        </item>
+        <item>
+            <title>Users Online Now</title>
+            <link>http://www.skype.com/</link>
+            <description>39393244</description>
+            <pubDate>Thu, 02 Aug 2012 13:50:01 +0000</pubDate>
+            <guid>Users Online Now Thu, 02 Aug 2012 13:50:01 +0000</guid>
+        </item>
+    </channel>
+</rss>
+EOXML
+      expect {
+        Cosm::Feed.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+    end
+  end
 end
 

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

@@ -12,5 +12,11 @@ describe "default key xml parser" do
       Cosm::Key.new(@xml).should fully_represent_key(:xml, @xml)
     end
   end
+
+  it "should raise known exception if passed garbage as xml" do
+    expect {
+      Cosm::Key.new("This is not XML", :xml)
+    }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+  end
 end
 

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

@@ -12,5 +12,11 @@ describe "default trigger xml parser" do
       Cosm::Trigger.new(@xml).should fully_represent_trigger(:xml, @xml)
     end
   end
+
+  it "should raise known exception if passed garbage as xml" do
+    expect {
+      Cosm::Trigger.new("This is not XML", :xml)
+    }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+  end
 end
 

data/spec/cosm-rb/trigger_spec.rb

@@ -42,6 +42,46 @@ describe Cosm::Trigger do
       trigger = Cosm::Trigger.new(trigger_as_(:hash))
       trigger.url.should == "http://www.postbin.org/zc9sca"
     end
+
+    context "specifying format explicitly" do
+      it "should raise known exception if passed json but told xml" do
+        expect {
+          Cosm::Trigger.new(trigger_as_(:json), :xml)
+        }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+      end
+
+      it "should raise known exception if passed xml but told json" do
+        expect {
+          Cosm::Trigger.new(trigger_as_(:json), :xml)
+        }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+      end
+
+      it "should raise known exception if passed unknown format" do
+        expect {
+          Cosm::Trigger.new(trigger_as_(:json), :png)
+        }.to raise_error(Cosm::InvalidFormatError)
+      end
+    end
+
+    context "specifying format" do
+      it "should raise known exception if told xml but given json" do
+        expect {
+          Cosm::Trigger.new(trigger_as_(:json), :xml)
+        }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+      end
+
+      it "should raise known exception if told json but given xml" do
+        expect {
+          Cosm::Trigger.new(trigger_as_(:xml), :json)
+        }.to raise_error(Cosm::Parsers::JSON::InvalidJSONError)
+      end
+
+      it "should raise known exception if given unknown format" do
+        expect {
+          Cosm::Trigger.new(trigger_as_(:xml), :gif)
+        }.to raise_error(Cosm::InvalidFormatError)
+      end
+    end
   end
 
   describe "#attributes" do

data/spec/support/datastream_helper.rb

@@ -31,7 +31,7 @@ def datastream_as_(format, options = {})
   when 'xml'
     data = datastream_as_xml(options[:version] || "0.5.1", options[:except_node])
   when 'csv'
-    data = '14'
+    data = datastream_as_csv(options[:version] || "plain")
   end
  
   # Add extra options we passed
@@ -94,6 +94,21 @@ def datastream_as_json(version)
     },
       'version' => '1.0.0'
     }
+  when "1.0.0-minimal"
+    {
+      "current_value" => "294",
+      "max_value" => "697.0",
+      "min_value" => "0.0",
+      "id" => "1"
+    }
+  when "1.0.0-minimal_timestamp"
+    {
+      "current_value" => "294",
+      "max_value" => "697.0",
+      "min_value" => "0.0",
+      "id" => "1",
+      "at" => "2011-03-02T16:00:18.416500Z"
+    }
   when "0.6-alpha"
     {
       "tags" => ["humidity"],
@@ -298,3 +313,12 @@ XML
     raise "Datastream as XML #{version} not implemented"
   end
 end
+
+def datastream_as_csv(version)
+  case version
+  when "timestamped"
+    return "2011-02-16T16:21:01.834174Z,14"
+  else
+    return "14"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 Z
+date: 2012-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -179,6 +179,7 @@ files:
 - lib/cosm-rb/client.rb
 - lib/cosm-rb/datapoint.rb
 - lib/cosm-rb/datastream.rb
+- lib/cosm-rb/exceptions.rb
 - lib/cosm-rb/feed.rb
 - lib/cosm-rb/hash_extensions.rb
 - lib/cosm-rb/helpers.rb