cosm-rb 0.0.3 → 0.0.5

data/.travis.yml

@@ -1,8 +1,3 @@
-branches:
-  only:
-    - cosm-rb
-    - master
-    - version_0.3.xx_branch
 language: ruby
 rvm:
  - 1.8.7
@@ -14,3 +9,4 @@ matrix:
   allow_failures:
     - rvm: jruby-18mode
     - rvm: jruby-19mode
+env: COVERAGE=on

data/Rakefile

@@ -20,10 +20,12 @@ desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new do |t|
 end
 
-desc "Run all specs with rcov"
-RSpec::Core::RakeTask.new(:rcov => :clean) do |t|
-  t.rcov = true
-  t.rcov_opts = '--exclude .gem/*,spec/*,.bundle/*,config/*,.rvm/*'
+if RUBY_VERSION.to_f < 1.9
+  desc "Run all specs with rcov"
+  RSpec::Core::RakeTask.new(:rcov => :clean) do |t|
+    t.rcov = true
+    t.rcov_opts = '--exclude .gem/*,spec/*,.bundle/*,config/*,.rvm/*,lib/cosm-rb.rb'
+  end
 end
 
 namespace :spec do

data/cosm-rb.gemspec

@@ -25,10 +25,18 @@ Gem::Specification.new do |s|
   s.add_dependency("nokogiri", ">=1.4.4")
   s.add_dependency("httparty", ">=0.8.3")
 
+  if RUBY_VERSION.to_f < 1.9
+    s.add_dependency("fastercsv", ">=1.5.x")
+  end
+
   begin
-    if RUBY_VERSION < "1.9" && !defined?(JRUBY_VERSION)
-      s.add_development_dependency("ruby-debug")
-      s.add_development_dependency("rcov", ">=0.9.9")
+    if !defined?(JRUBY_VERSION)
+      if RUBY_VERSION.to_f < 1.9
+        s.add_development_dependency("ruby-debug")
+        s.add_development_dependency("rcov", ">=0.9.9")
+      else
+        s.add_development_dependency("simplecov")
+      end
     end
   rescue
     p "Could not detect ruby version"

data/lib/cosm-rb.rb

@@ -4,7 +4,6 @@ if defined?(JRUBY_VERSION)
 else
   require 'yajl/json_gem'
 end
-require 'csv'
 
 $:.unshift(File.dirname(File.expand_path(__FILE__)))
 
@@ -31,3 +30,12 @@ require 'cosm-rb/permission'
 require 'cosm-rb/resource'
 
 require 'cosm-rb/client'
+
+if RUBY_VERSION.to_f < 1.9
+  require 'fastercsv'
+  Cosm::CSV = FasterCSV
+else
+  require 'csv'
+  Cosm::CSV = CSV
+end
+

data/lib/cosm-rb/datastream.rb

@@ -13,16 +13,6 @@ module Cosm
     include Cosm::Parsers::CSV::DatastreamDefaults
 
     include Validations
-    # validate :before, :join_tags
-
-    # validates_presence_of :id
-    # validates_length_of :current_value, :maximum => 255
-    # validates_length_of :tags, :maximum => 255
-    # validates_inclusion_of :unit_type, :in => VALID_UNIT_TYPES,
-    #                                    :allow_nil => true,
-    #                                    :message => "is not a valid unit_type (pick one from #{VALID_UNIT_TYPES} or leave blank)"
-    # validates_format_of :id, :with => /\A[\w\-\+\.]+\Z/
-    #
 
     def valid?
       pass = true

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

@@ -2,8 +2,16 @@ module Cosm
   module Parsers
     module CSV
       module DatastreamDefaults
-        def from_csv(csv)
-          {"current_value" => ::CSV.parse(csv.strip).first.first.to_s}
+        def from_csv(csv, csv_version = nil)
+          rows = Cosm::CSV.parse(csv.strip)
+          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 }
+          else
+            return { "current_value" => row[0].to_s }
+          end
         end
       end
     end

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

@@ -2,20 +2,25 @@ module Cosm
   module Parsers
     module CSV
       class UnknownVersionError < StandardError ; end
+      class InvalidCSVError < StandardError ; end
+
       module FeedDefaults
         def from_csv(csv, csv_version = nil)
-          array = ::CSV.parse(csv.strip)
-          version = detect_version(array, csv_version)
+          rows = Cosm::CSV.parse(csv.strip)
+          version = detect_version(rows, csv_version)
           hash = Hash.new
           if version == :v2
-            hash["datastreams"] = array.collect {|row|
-              { "id" => row.first.to_s,
-                "current_value" => row.last.to_s
-              }
+            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]
+              end
+              { "id" => row.first.to_s, "current_value" => row.last.to_s }.merge(timestamp)
             }
           elsif version == :v1
             hash["datastreams"] = []
-            array.first.each_with_index do |current_value, stream_id|
+            rows.first.each_with_index do |current_value, stream_id|
               hash["datastreams"] << { "id" => stream_id.to_s, "current_value" => current_value }
             end
           end
@@ -25,10 +30,10 @@ module Cosm
 
         private
 
-        def detect_version(array, version = nil)
+        def detect_version(rows, version = nil)
           return version if version
-          return :v2 if array.size >= 2
-          return :v1 if array.size == 1 && array.first.size != 2
+          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

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

@@ -10,7 +10,7 @@ module Cosm
           case hash['version']
           when '1.0.0'
             transform_1_0_0(hash)
-          when '0.6-alpha'
+          when '0.6-alpha', '0.6'
             transform_0_6_alpha(hash)
           end
         end
@@ -59,30 +59,35 @@ module Cosm
         def transform_0_6_alpha(hash)
           hash["retrieved_at"] = hash["updated"]
           hash["state"] = hash["status"]
-          hash["datastreams"] = hash["datastreams"].collect do |datastream|
-            unit_hash = {}
-            if unit = datastream.delete('unit')
-              unit_hash['unit_type'] = unit['type']
-              unit_hash['unit_symbol'] = unit['symbol']
-              unit_hash['unit_label'] = unit['label']
+          if hash["datastreams"]
+            hash["datastreams"] = hash["datastreams"].collect do |datastream|
+              unit_hash = {}
+              if unit = datastream.delete('unit')
+                unit_hash['unit_type'] = unit['type']
+                unit_hash['unit_symbol'] = unit['symbol']
+                unit_hash['unit_label'] = unit['label']
+              end
+              value_hash = {}
+              if datastream["values"].size >= 1
+                value_hash["current_value"] = datastream["values"].first["value"]
+                value_hash["min_value"] = datastream["values"].first["min_value"]
+                value_hash["max_value"] = datastream["values"].first["max_value"]
+                value_hash["updated"] = datastream["values"].first["recorded_at"]
+              end
+              {
+                "id" => datastream["id"],
+                "tags" => join_tags(datastream["tags"]),
+              }.merge(value_hash).merge(unit_hash)
+            end
+            if location = hash.delete("location")
+              hash["location_disposition"] = location["disposition"]
+              hash["location_domain"] = location["domain"]
+              hash["location_ele"] = location["ele"]
+              hash["location_exposure"] = location["exposure"]
+              hash["location_lat"] = location["lat"]
+              hash["location_lon"] = location["lon"]
+              hash["location_name"] = location["name"]
             end
-            {
-              "id" => datastream["id"],
-              "current_value" => datastream["values"].first["value"],
-              "min_value" => datastream["values"].first["min_value"],
-              "max_value" => datastream["values"].first["max_value"],
-              "updated" => datastream["values"].first["recorded_at"],
-              "tags" => join_tags(datastream["tags"]),
-            }.merge(unit_hash)
-          end
-          if location = hash.delete("location")
-            hash["location_disposition"] = location["disposition"]
-            hash["location_domain"] = location["domain"]
-            hash["location_ele"] = location["ele"]
-            hash["location_exposure"] = location["exposure"]
-            hash["location_lat"] = location["lat"]
-            hash["location_lon"] = location["lon"]
-            hash["location_name"] = location["name"]
           end
           hash
         end

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

@@ -6,6 +6,7 @@ module Cosm
           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")

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

@@ -18,12 +18,13 @@ module Cosm
         def transform_0_5_1(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")
           hash["feed_id"] = environment.attributes["id"].value
           hash["feed_creator"] = environment.attributes["creator"].value
           hash["id"] = data.attributes["id"].value
-          if (tags = data.xpath("xmlns:tag").collect(&:content)).any?
-            hash["tags"] = tags.sort{|a,b| a.downcase <=> b.downcase}.join(',')
+          if (tags = data.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
+            hash["tags"] = Cosm::CSV.generate_line(tags.sort{|a,b| a.downcase <=> b.downcase}).strip
           end
           current_value = data.at_xpath("xmlns:current_value")
           hash["current_value"] = current_value.content
@@ -40,7 +41,7 @@ module Cosm
             value = datapoint.at_xpath("xmlns:value")
             {
               "value" => value.content,
-              "at" => value.attributes["at"].content
+              "at" => value.attributes["at"].value
             }
           end
           hash
@@ -50,13 +51,14 @@ module Cosm
         def transform_5(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")
           hash["feed_id"] = environment.attributes["id"].value
           hash["feed_creator"] = "http://www.haque.co.uk"
           hash["updated"] = environment.attributes["updated"].value
           hash["id"] = data.attributes["id"].value
-          if (tags = data.xpath("xmlns:tag").collect(&:content)).any?
-            hash["tags"] = tags.sort{|a,b| a.downcase <=> b.downcase}.join(',')
+          if (tags = data.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
+            hash["tags"] = Cosm::CSV.generate_line(tags.sort{ |a,b| a.downcase <=> b.downcase }).strip
           end
           current_value = data.at_xpath("xmlns:value")
           hash["current_value"] = current_value.content

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

@@ -1,13 +1,14 @@
 module Cosm
   module Parsers
     module XML
+      class InvalidXMLError < StandardError; 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 # "5"
+          else
             transform_5(xml)
           end
         end
@@ -16,60 +17,73 @@ module Cosm
         def transform_0_5_1(xml)
           hash = {}
           environment = xml.at_xpath("//xmlns:environment")
+          raise InvalidXMLError, "Missing 'environment' node from base node" if environment.nil?
           hash["updated"] = environment.attributes["updated"].value
           hash["created"] = environment.attributes["created"].value
           hash["creator"] = environment.attributes["creator"].value
-          hash["title"] = environment.at_xpath("xmlns:title").content
-          hash["feed"] = environment.at_xpath("xmlns:feed").content
-          hash["auto_feed_url"] = environment.at_xpath("xmlns:auto_feed_url").content
-          hash["status"] = environment.at_xpath("xmlns:status").content
-          hash["description"] = environment.at_xpath("xmlns:description").content
-          hash["icon"] = environment.at_xpath("xmlns:icon").content
-          hash["website"] = environment.at_xpath("xmlns:website").content
-          hash["email"] = environment.at_xpath("xmlns:email").content
-          hash["private"] = environment.at_xpath("xmlns:private").content
-          hash["tags"] = environment.xpath("xmlns:tag").collect(&:content).sort{|a,b| a.downcase <=> b.downcase}.join(',')
+          hash["title"] = strip(environment.at_xpath("xmlns:title").content)
+          hash["feed"] = strip(environment.at_xpath("xmlns:feed").content)
+          hash["auto_feed_url"] = strip(environment.at_xpath("xmlns:auto_feed_url").content)
+          hash["status"] = strip(environment.at_xpath("xmlns:status").content)
+          hash["description"] = strip(environment.at_xpath("xmlns:description").content)
+          hash["icon"] = strip(environment.at_xpath("xmlns:icon").content)
+          hash["website"] = strip(environment.at_xpath("xmlns:website").content)
+          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
+          end
           location = environment.at_xpath("xmlns:location")
           if location
-            hash["location_name"] = location.at_xpath("xmlns:name").content
-            hash["location_lat"] = location.at_xpath("xmlns:lat").content
-            hash["location_lon"] = location.at_xpath("xmlns:lon").content
-            hash["location_ele"] = location.at_xpath("xmlns:ele").content
+            hash["location_name"] = strip(location.at_xpath("xmlns:name").content)
+            hash["location_lat"] = strip(location.at_xpath("xmlns:lat").content)
+            hash["location_lon"] = strip(location.at_xpath("xmlns:lon").content)
+            hash["location_ele"] = strip(location.at_xpath("xmlns:ele").content)
             hash["location_domain"] = location.attributes["domain"].value
             hash["location_exposure"] = location.attributes["exposure"].value
             hash["location_disposition"] = location.attributes["disposition"].value
           end
           owner = environment.at_xpath("xmlns:user")
           if owner
-            hash["owner_login"] = owner.at_xpath("xmlns:login").content
+            hash["owner_login"] = strip(owner.at_xpath("xmlns:login").content)
           end
           hash["datastreams"] = environment.xpath("xmlns:data").collect do |datastream|
             current_value = datastream.at_xpath("xmlns:current_value")
+            if current_value
+              value_hash = {
+                "current_value" => strip(current_value.content),
+                "updated" => current_value.attributes["at"].value,
+              }
+            else
+              value_hash = {}
+            end
             unit = datastream.at_xpath("xmlns:unit")
             if unit
               unit_hash = {
-                "unit_label" => unit.content,
+                "unit_label" => strip(unit.content),
                 "unit_type" => unit.attributes["type"].value,
                 "unit_symbol" => unit.attributes["symbol"].value,
               }
             else
               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 }
+            else
+              tags_hash = {}
+            end
             {
               "id" => datastream.attributes["id"].value,
-              "tags" => datastream.xpath("xmlns:tag").collect(&:content).sort{|a,b| a.downcase <=> b.downcase}.join(','),
-              "current_value" => current_value.content,
-              "updated" => current_value.attributes["at"].value,
-              "min_value" => datastream.at_xpath("xmlns:min_value").content,
-              "max_value" => datastream.at_xpath("xmlns:max_value").content,
+              "min_value" => strip(datastream.at_xpath("xmlns:min_value").content),
+              "max_value" => strip(datastream.at_xpath("xmlns:max_value").content),
               "datapoints" => datastream.xpath("xmlns:datapoints").collect do |datapoint|
               value = datapoint.at_xpath("xmlns:value")
               {
                 "at" => value.attributes["at"].value,
-                "value" => value.content,
+                "value" => strip(value.content),
               }
               end
-            }.merge(unit_hash)
+            }.merge(value_hash).merge(unit_hash).merge(tags_hash)
           end
           hash
         end
@@ -78,21 +92,22 @@ module Cosm
         def transform_5(xml)
           hash = {}
           environment = xml.at_xpath("//xmlns:environment")
+          raise InvalidXMLError, "Missing 'environment' node from base node" if environment.nil?
           hash["updated"] = environment.attributes["updated"].value
           hash["creator"] = "http://www.haque.co.uk"
-          hash["title"] = environment.at_xpath("xmlns:title").content
-          hash["feed"] = environment.at_xpath("xmlns:feed").content
-          hash["status"] = environment.at_xpath("xmlns:status").content
-          hash["description"] = environment.at_xpath("xmlns:description").content
-          hash["icon"] = environment.at_xpath("xmlns:icon").content
-          hash["website"] = environment.at_xpath("xmlns:website").content
-          hash["email"] = environment.at_xpath("xmlns:email").content
+          hash["title"] = strip(environment.at_xpath("xmlns:title").content)
+          hash["feed"] = strip(environment.at_xpath("xmlns:feed").content)
+          hash["status"] = strip(environment.at_xpath("xmlns:status").content)
+          hash["description"] = strip(environment.at_xpath("xmlns:description").content)
+          hash["icon"] = strip(environment.at_xpath("xmlns:icon").content)
+          hash["website"] = strip(environment.at_xpath("xmlns:website").content)
+          hash["email"] = strip(environment.at_xpath("xmlns:email").content)
           location = environment.at_xpath("xmlns:location")
           if location
-            hash["location_name"] = location.at_xpath("xmlns:name").content
-            hash["location_lat"] = location.at_xpath("xmlns:lat").content
-            hash["location_lon"] = location.at_xpath("xmlns:lon").content
-            hash["location_ele"] = location.at_xpath("xmlns:ele").content
+            hash["location_name"] = strip(location.at_xpath("xmlns:name").content)
+            hash["location_lat"] = strip(location.at_xpath("xmlns:lat").content)
+            hash["location_lon"] = strip(location.at_xpath("xmlns:lon").content)
+            hash["location_ele"] = strip(location.at_xpath("xmlns:ele").content)
             hash["location_domain"] = location.attributes["domain"].value
             hash["location_exposure"] = location.attributes["exposure"].value
             hash["location_disposition"] = location.attributes["disposition"].value
@@ -102,24 +117,33 @@ module Cosm
             unit = datastream.at_xpath("xmlns:unit")
             if unit
               unit_hash = {
-                "unit_label" => unit.content,
+                "unit_label" => strip(unit.content),
                 "unit_type" => unit.attributes["type"].value,
                 "unit_symbol" => unit.attributes["symbol"].value,
               }
             else
               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 }
+            else
+              tags_hash = {}
+            end
             {
               "id" => datastream.attributes["id"].value,
-              "tags" => datastream.xpath("xmlns:tag").collect(&:content).sort{|a,b| a.downcase <=> b.downcase}.join(','),
-              "current_value" => current_value.content,
+              "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,
-            }.merge(unit_hash)
+            }.merge(unit_hash).merge(tags_hash)
           end
           hash
         end
+
+        def strip(value)
+          return value.nil? ? nil : value.strip
+        end
+        private :strip
       end
     end
   end

data/lib/cosm-rb/templates/csv/datapoint_defaults.rb

@@ -6,13 +6,13 @@ module Cosm
           options[:depth] = 4 if options[:full]
           case options[:depth].to_i
           when 4
-            ::CSV.generate_line([feed_id, datastream_id, at.iso8601(6), value]).strip
+            Cosm::CSV.generate_line([feed_id, datastream_id, at.iso8601(6), value]).strip
           when 3
-            ::CSV.generate_line([datastream_id, at.iso8601(6), value]).strip
+            Cosm::CSV.generate_line([datastream_id, at.iso8601(6), value]).strip
           when 2
-            ::CSV.generate_line([at.iso8601(6), value]).strip
+            Cosm::CSV.generate_line([at.iso8601(6), value]).strip
           else
-            ::CSV.generate_line([value]).strip
+            Cosm::CSV.generate_line([value]).strip
           end
         end
       end

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

@@ -30,11 +30,11 @@ module Cosm
             datapoints.collect {|datapoint| csv << [datapoint.at.iso8601(6), datapoint.value] }
             csv << [updated.iso8601(6), current_value] if csv.empty?
           end
-          csv.collect {|row| ::CSV.generate_line(row).strip }.join("\n")
+          csv.collect {|row| Cosm::CSV.generate_line(row).strip }.join("\n")
         end
 
         def csv_1
-          ::CSV.generate_line([current_value]).strip
+          Cosm::CSV.generate_line([current_value]).strip
         end
       end
     end

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

@@ -18,9 +18,9 @@ module Cosm
           if options[:full]
             datastreams.collect do |datastream|
               if datastream.datapoints.any?
-                datastream.datapoints.collect { |datapoint| csv << ::CSV.generate_line([id, datastream.id, datapoint.at.iso8601(6), datapoint.value]).strip }
+                datastream.datapoints.collect { |datapoint| csv << Cosm::CSV.generate_line([id, datastream.id, datapoint.at.iso8601(6), datapoint.value]).strip }
               else
-                csv << ::CSV.generate_line([id, datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
+                csv << Cosm::CSV.generate_line([id, datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
               end
  
 
@@ -28,9 +28,9 @@ module Cosm
           else
             datastreams.collect do |datastream|
               if datastream.datapoints.any?
-                datastream.datapoints.collect { |datapoint| csv << ::CSV.generate_line([datastream.id, datapoint.at.iso8601(6), datapoint.value]).strip }
+                datastream.datapoints.collect { |datapoint| csv << Cosm::CSV.generate_line([datastream.id, datapoint.at.iso8601(6), datapoint.value]).strip }
               else
-                csv << ::CSV.generate_line([datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
+                csv << Cosm::CSV.generate_line([datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
               end
             end
           end
@@ -38,7 +38,7 @@ module Cosm
         end
 
         def csv_1
-          ::CSV.generate_line(datastreams.collect {|ds| ds.current_value }).strip
+          Cosm::CSV.generate_line(datastreams.collect {|ds| ds.current_value }).strip
         end
       end
     end

data/lib/cosm-rb/version.rb

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

data/spec/cosm-rb/datastream_spec.rb

@@ -93,6 +93,7 @@ describe Cosm::Datastream do
         @datastream.errors[:unit_type].should == ["is not a valid unit_type (pick one from #{Cosm::Datastream::VALID_UNIT_TYPES.join(', ')} or leave blank)"]
       end
     end
+
   end
 
   describe "#initialize" do

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

@@ -7,6 +7,28 @@ describe "default datastream csv parser" do
       datastream = Cosm::Datastream.new(csv)
       datastream.should fully_represent_datastream(:csv, csv)
     end
+
+    it "should capture timestamp if present" do
+      timestamp = Time.now.iso8601(6)
+      csv = "#{timestamp},123"
+      datastream = Cosm::Datastream.new(csv)
+      datastream.updated.should == timestamp
+      datastream.current_value.should == "123"
+    end
+
+    it "should raise error if passed more than a single row" do
+      csv = "12\n13"
+      expect {
+        Cosm::Datastream.new(csv)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
+    it "should raise error passed more than three values in a row" do
+      csv = "#{Time.now.iso8601(6)},123,456"
+      expect {
+        Cosm::Datastream.new(csv)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
   end
 end
 

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

@@ -8,6 +8,12 @@ describe "default feed csv parser" do
       feed.should fully_represent_feed(:csv_v2, csv)
     end
 
+    it "should convert no timestamp v2 CSV into attributes hash" do
+      csv = feed_as_(:csv, :version => 'v2_notimestamp')
+      feed = Cosm::Feed.new(csv)
+      feed.should fully_represent_feed(:csv_v2, csv)
+    end
+
     it "should convert Pachube CSV v1 into attributes hash" do
       csv = feed_as_(:csv, :version => 'v1')
       feed = Cosm::Feed.new(csv)
@@ -30,6 +36,18 @@ describe "default feed csv parser" do
       feed = Cosm::Feed.new(csv, :v1)
       feed.should fully_represent_feed(:csv_v1, csv)
     end
+
+    it "should raise an error if passed some wild csv with more than max permitted three columns" do
+      csv =<<-CSV
+Date-Time, System HOA,Jockey Pump HOA,VFD Pump HOA,Lag Pump HOA,Lag Pump 2 HOA,Power Monitor,Water Level Relay,High Discharge Pressure,Reset Function,Jockey Running,VFD Run,Lag Pump Run,VFD Fault,Filter In Auto,Filter In Hand,Differential Press 1,Filter 1 Running,High Limit Switch,Low Limit Switch,Lag Pump Running,VFD Run Output Auto,VFD Pump On,Lag Pump,Lag Pump 1 On,System Auto Mode,Fault,Lag Pump 2 Run,Jockey On,Jockey Pump Run,Lag Pump 2,Filter Forward,Filter Reverse,Filter Solenoid,Pressure,Flow,Unknown?,VFD Input,VFD Output,
+2009;Apr;19;12;44;15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 
+2009;Apr;19;12;44;30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 
+2009;Apr;19;12;48;52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 
+CSV
+      expect {
+        Cosm::Feed.new(csv)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
   end
 end
 

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

@@ -13,6 +13,28 @@ describe "default feed json parser" do
       feed = Cosm::Feed.new(json)
       feed.should fully_represent_feed(:json, json)
     end
+
+    it "should convert Pachube JSON 0.6-alpha (used by API v1) into attributes hash" do
+      json = feed_as_(:json, :version => "0.6")
+      feed = Cosm::Feed.new(json)
+      feed.should fully_represent_feed(:json, json)
+    end
+
+    it "should handle json if no value present" do
+      json = "{\"version\":\"0.6-alpha\",\"datastreams\":[{\"unit\":{\"label\":\"Tmax\",\"symbol\":\"C\"},\"values\":{},\"id\":\"1\"}]}"
+      expect {
+        feed = Cosm::Feed.new(json)
+        feed.datastreams.size.should == 1
+      }.to_not raise_error
+    end
+
+    it "should capture empty fields if present" do
+      json = "{\"version\":\"1.0.0\",\"description\":\"\",\"feed\":\"\",\"location\":{\"name\":\"\"}}"
+      feed = Cosm::Feed.new(json)
+      feed.description.should == ""
+      feed.feed.should == ""
+      feed.location_name.should == ""
+    end
   end
 end
 

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

@@ -27,6 +27,38 @@ describe "default feed xml parser" do
       Cosm::Feed.new(@xml).should fully_represent_feed(:xml, @xml)
     end
 
+    it "should gracefully handle 0.5.1 xml missing the base environment node" 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">
+  <title>ohai</title>
+</eeml>
+EOXML
+      expect {
+        Cosm::Feed.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+    end
+
+    it "should handle datastream with no current_value" 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/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.xsd"> 
+ <environment updated="2011-02-16T16:21:01.834174Z" id="504" creator="http://test.host/users/fred"> 
+    <title>Cosm Office environment</title> 
+    <data id="0"> 
+      <tag>freakin lasers</tag> 
+      <tag>humidity</tag> 
+      <tag>Temperature</tag> 
+    </data>
+  </environment>
+</eeml>
+EOXML
+
+      feed = Cosm::Feed.new(xml)
+      feed.datastreams.size.should == 1
+      feed.datastreams.first.tags.should == "freakin lasers,humidity,Temperature"
+    end
+
   end
 
   context "5 (used by API v1)" do
@@ -57,9 +89,47 @@ describe "default feed xml parser" do
 
     it "should handle missing value attributes" do
       @xml = feed_as_(:xml, :version => "5", :except_node => :value_attributes)
+      feed = Cosm::Feed.new(@xml)
       Cosm::Feed.new(@xml).should fully_represent_feed(:xml, @xml)
     end
 
+    it "should gracefully handle 0.5.1 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"> 
+  <title>ohai</title>
+</eeml>
+EOXML
+      expect {
+        Cosm::Feed.new(xml)
+      }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
+    end
+
+    it "should gracefully handle our oddly whitespaced real example" do
+      xml = <<-EOXML
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml version="5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.eeml.org/xsd/005" xsi:schemaLocation="http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd">
+  <environment>
+    <data id="4773635294300160">
+      <tag>
+        10.F59894010800</tag>
+      <tag>
+        Living Room, S wall</tag>
+      <value>
+        24.1875</value>
+      <unit type="derivedSI">
+        celsius</unit>
+    </data>
+  </environment>
+</eeml>
+EOXML
+      feed = Cosm::Feed.new(xml)
+
+      datastream = feed.datastreams.first
+      datastream.tags.should == "10.F59894010800,\"Living Room, S wall\""
+      datastream.current_value.should == "24.1875"
+      datastream.unit_label.should == "celsius"
+    end
   end
 end
 

data/spec/cosm-rb/templates/csv/datapoint_defaults_spec.rb

@@ -29,13 +29,13 @@ describe "default datapoint json templates" do
   it "should escape stuff that could upset csv parsers" do
     @datapoint.value = "I \n , am not a csv"
     csv = @datapoint.generate_csv("2")
-    csv.should == CSV.generate_line([@datapoint.value]).strip
+    csv.should == Cosm::CSV.generate_line([@datapoint.value]).strip
   end
 
   it "should escape characters that could upset csv parsers via full" do
     @datapoint.value = "I \n , am not a csv"
     csv = @datapoint.generate_csv("2", :full => true)
-    csv.should == CSV.generate_line([@datapoint.feed_id, @datapoint.datastream_id, @datapoint.at.iso8601(6), @datapoint.value]).strip
+    csv.should == Cosm::CSV.generate_line([@datapoint.feed_id, @datapoint.datastream_id, @datapoint.at.iso8601(6), @datapoint.value]).strip
   end
 end
 

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

@@ -85,7 +85,7 @@ describe "default datastream json templates" do
       @datastream.current_value = "one,field"
       @datastream.datapoints = []
       csv = @datastream.generate_csv("2")
-      csv.should == CSV.generate_line([@datastream.updated.iso8601(6),@datastream.current_value]).strip
+      csv.should == Cosm::CSV.generate_line([@datastream.updated.iso8601(6),@datastream.current_value]).strip
     end
 
     it "should escape characters that could upset csv parsers with datapoints" do
@@ -94,14 +94,14 @@ describe "default datastream json templates" do
         dp.value = "1,field"
       end
       csv = @datastream.generate_csv("2")
-      csv.should == @datastream.datapoints.collect {|dp| CSV.generate_line([dp.at.iso8601(6),dp.value]).strip }.join("\n")
+      csv.should == @datastream.datapoints.collect {|dp| Cosm::CSV.generate_line([dp.at.iso8601(6),dp.value]).strip }.join("\n")
     end
 
     it "should escape characters that could upset csv parsers without datapoints via full" do
       @datastream.current_value = "one,field"
       @datastream.datapoints = []
       csv = @datastream.generate_csv("2", :full => true)
-      csv.should == CSV.generate_line([@datastream.feed_id,@datastream.id,@datastream.updated.iso8601(6),@datastream.current_value]).strip
+      csv.should == Cosm::CSV.generate_line([@datastream.feed_id,@datastream.id,@datastream.updated.iso8601(6),@datastream.current_value]).strip
     end
 
     it "should escape characters that could upset csv parsers with datapoints via full" do
@@ -110,7 +110,7 @@ describe "default datastream json templates" do
         dp.value = "1,field"
       end
       csv = @datastream.generate_csv("2", :full => true)
-      csv.should == @datastream.datapoints.collect {|dp| CSV.generate_line([@datastream.feed_id,@datastream.id,dp.at.iso8601(6),dp.value]).strip }.join("\n")
+      csv.should == @datastream.datapoints.collect {|dp| Cosm::CSV.generate_line([@datastream.feed_id,@datastream.id,dp.at.iso8601(6),dp.value]).strip }.join("\n")
     end
   end
 
@@ -124,7 +124,7 @@ describe "default datastream json templates" do
     it "should escape characters that could upset csv parsers" do
       @datastream.current_value = "I \n am full of c,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, evil"
       csv = @datastream.generate_csv("1")
-      csv.should == CSV.generate_line([@datastream.current_value]).strip
+      csv.should == Cosm::CSV.generate_line([@datastream.current_value]).strip
     end
   end
 end

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

@@ -22,7 +22,7 @@ describe "default feed json templates" do
       end
       csv = @feed.generate_csv("2")
       expected_csv = @feed.datastreams.collect do |datastream|
-        CSV.generate_line([datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
+        Cosm::CSV.generate_line([datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
       end.join("\n")
       csv.should == expected_csv
     end
@@ -33,7 +33,7 @@ describe "default feed json templates" do
       end
       csv = @feed.generate_csv("2", :full => true)
       expected_csv = @feed.datastreams.collect do |datastream|
-        CSV.generate_line([@feed.id, datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
+        Cosm::CSV.generate_line([@feed.id, datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
       end.join("\n")
       csv.should == expected_csv
     end
@@ -42,9 +42,9 @@ describe "default feed json templates" do
       csv = @feed.generate_csv("2")
       expected_csv = @feed.datastreams.collect do |datastream|
         if datastream.datapoints.any?
-          datastream.datapoints.collect {|dp| CSV.generate_line([datastream.id, dp.at.iso8601(6), dp.value]).strip }
+          datastream.datapoints.collect {|dp| Cosm::CSV.generate_line([datastream.id, dp.at.iso8601(6), dp.value]).strip }
         else
-          CSV.generate_line([datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
+          Cosm::CSV.generate_line([datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
         end
       end.join("\n")
       csv.should == expected_csv
@@ -54,9 +54,9 @@ describe "default feed json templates" do
       csv = @feed.generate_csv("2", :full => true)
       expected_csv = @feed.datastreams.collect do |datastream|
         if datastream.datapoints.any?
-          datastream.datapoints.collect {|dp| CSV.generate_line([@feed.id, datastream.id, dp.at.iso8601(6), dp.value]).strip }
+          datastream.datapoints.collect {|dp| Cosm::CSV.generate_line([@feed.id, datastream.id, dp.at.iso8601(6), dp.value]).strip }
         else
-          CSV.generate_line([@feed.id, datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
+          Cosm::CSV.generate_line([@feed.id, datastream.id, datastream.updated.iso8601(6), datastream.current_value]).strip
         end
       end.join("\n")
       csv.should == expected_csv
@@ -68,7 +68,7 @@ describe "default feed json templates" do
     it "should represent Pachube JSON" do
       csv = @feed.generate_csv("1")
       expected_csv = @feed.datastreams.collect do |datastream|
-        CSV.generate_line([datastream.current_value]).strip
+        Cosm::CSV.generate_line([datastream.current_value]).strip
       end.join(",")
       csv.should == expected_csv
     end

data/spec/spec_helper.rb

@@ -5,6 +5,20 @@ require 'rspec'
 
 require 'time'
 
+if !defined?(JRUBY_VERSION)
+  if RUBY_VERSION < "1.9"
+    require 'ruby-debug'
+  else
+    if ENV["COVERAGE"] == "on"
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter "/spec/"
+        add_filter "/lib/cosm-rb.rb"
+      end
+    end
+  end
+end
+
 Dir['./spec/support/**/*.rb'].map {|f| require f}
 
 $:.push File.expand_path("../lib", __FILE__)

data/spec/support/feed_helper.rb

@@ -159,6 +159,16 @@ def feed_as_csv(version)
 4,2011-06-13T12:30:04.714629Z,0
 5,2011-06-13T12:30:04.714629Z,0
 6,2011-06-13T12:30:04.714629Z,-30362
+}
+  when 'v2_notimestamp'
+    %Q{
+0,15
+1,905
+2,326
+3,0
+4,0
+5,0
+6,-30362
 }
   when 'unknown'
     '34,98'
@@ -265,7 +275,7 @@ def feed_as_json(version)
       }
       ]
     }
-  when "0.6-alpha"
+  when "0.6-alpha", "0.6"
     {
       "datastreams" => [{
       "tags" => ["humidity"],

data/spec/support/fully_represent_feed_matcher.rb

@@ -14,7 +14,7 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
   end
 
   failure_message_for_should do |feed|
-    "expected #{feed} to fully represent #{formatted_feed}"
+    "expected #{feed.attributes.inspect} to fully represent #{formatted_feed}"
   end
 
   description do
@@ -22,7 +22,7 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
   end
 
   def match_csv_v1_feed(feed, formatted_feed)
-    csv = CSV.parse(formatted_feed.strip)
+    csv = Cosm::CSV.parse(formatted_feed.strip)
     csv.length.should == 1
     csv = csv.first
     feed.datastreams.length.should == csv.length
@@ -33,11 +33,14 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
   end
 
   def match_csv_v2_feed(feed, formatted_feed)
-    csv = CSV.parse(formatted_feed.strip)
+    csv = Cosm::CSV.parse(formatted_feed.strip)
     feed.datastreams.length.should == csv.length
     feed.datastreams.each do |datastream|
       row = csv.detect {|d| d.first == datastream.id}
       datastream.current_value.should == row.last
+      if row.size == 3
+        datastream.updated.iso8601.should == row[1]
+      end
     end
   end
 
@@ -60,7 +63,9 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
       feed.website.should == environment.at_xpath("xmlns:website").content
       feed.email.should == environment.at_xpath("xmlns:email").content
       feed.private.should == environment.at_xpath("xmlns:private").content
-      feed.tags.should == environment.xpath("xmlns:tag").map(&:content).sort{|a,b| a.downcase<=>b.downcase}.join(',')
+      if feed.tags
+        feed.tags.should == environment.xpath("xmlns:tag").map(&:content).sort{|a,b| a.downcase<=>b.downcase}.join(',')
+      end
       owner = environment.at_xpath("xmlns:user")
       if owner
         feed.owner_login.should == owner.at_xpath("xmlns:login").content
@@ -78,7 +83,9 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
       feed.datastreams.each do |ds|
         data = environment.at_xpath("xmlns:data[@id=\"#{ds.id}\"]")
         ds.id.should == data.attributes["id"].value
-        ds.tags.should == data.xpath("xmlns:tag").map(&:content).sort{|a,b| a.downcase<=>b.downcase}.join(',')
+        if (tags = data.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
+          ds.tags.should == tags.sort{|a,b| a.downcase<=>b.downcase}.join(',')
+        end
         current_value = data.at_xpath("xmlns:current_value")
         ds.current_value.should == current_value.content
         ds.updated.should == current_value.attributes["at"].value
@@ -120,7 +127,9 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
       feed.datastreams.each do |ds|
         data = environment.at_xpath("xmlns:data[@id=\"#{ds.id}\"]")
         ds.id.should == data.attributes["id"].value
-        ds.tags.should == data.xpath("xmlns:tag").map(&:content).sort{|a,b| a.downcase<=>b.downcase}.join(',')
+        if (tags = data.xpath("xmlns:tag").collect { |t| t.content.strip }).any?
+          ds.tags.should == tags.sort{ |a,b| a.downcase <=> b.downcase }.join(',')
+        end
         current_value = data.at_xpath("xmlns:value")
         ds.current_value.should == current_value.content
         ds.updated.should == environment.attributes["updated"].value

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -17,12 +17,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 +01:00
-default_executable: 
+date: 2012-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +31,11 @@ dependencies:
         - 8
         - 1
         version: 0.8.1
+  type: :runtime
+  prerelease: false
   requirement: *id001
   name: yajl-ruby
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +47,11 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
+  type: :runtime
+  prerelease: false
   requirement: *id002
   name: nokogiri
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,12 +63,28 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
+  type: :runtime
+  prerelease: false
   requirement: *id003
   name: httparty
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 121
+        segments: 
+        - 1
+        - 5
+        - x
+        version: 1.5.x
+  type: :runtime
+  prerelease: false
+  requirement: *id004
+  name: fastercsv
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +93,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  type: :development
+  prerelease: false
+  requirement: *id005
   name: ruby-debug
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +109,12 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
-  requirement: *id005
+  type: :development
+  prerelease: false
+  requirement: *id006
   name: rcov
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,12 +125,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id006
+  type: :development
+  prerelease: false
+  requirement: *id007
   name: rake
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -128,7 +141,9 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id007
+  type: :development
+  prerelease: false
+  requirement: *id008
   name: rspec
 description: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
 email: 
@@ -265,7 +280,6 @@ files:
 - spec/support/key_helper.rb
 - spec/support/search_result_helper.rb
 - spec/support/trigger_helper.rb
-has_rdoc: true
 homepage: http://github.com/cosm/cosm-rb
 licenses: []
 
@@ -296,66 +310,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
-test_files: 
-- spec/cosm-rb/array_extensions_spec.rb
-- spec/cosm-rb/base/instance_methods_spec.rb
-- spec/cosm-rb/base_spec.rb
-- spec/cosm-rb/client_spec.rb
-- spec/cosm-rb/datapoint_spec.rb
-- spec/cosm-rb/datastream_spec.rb
-- spec/cosm-rb/feed_spec.rb
-- spec/cosm-rb/hash_extensions_spec.rb
-- spec/cosm-rb/helpers_spec.rb
-- spec/cosm-rb/key_spec.rb
-- spec/cosm-rb/parsers/csv/datastream_defaults_spec.rb
-- spec/cosm-rb/parsers/csv/feed_defaults_spec.rb
-- spec/cosm-rb/parsers/json/datapoint_defaults_spec.rb
-- spec/cosm-rb/parsers/json/datastream_defaults_spec.rb
-- spec/cosm-rb/parsers/json/feed_defaults_spec.rb
-- spec/cosm-rb/parsers/json/key_defaults_spec.rb
-- spec/cosm-rb/parsers/json/search_result_defaults_spec.rb
-- spec/cosm-rb/parsers/json/trigger_defaults_spec.rb
-- spec/cosm-rb/parsers/xml/datapoint_defaults_spec.rb
-- spec/cosm-rb/parsers/xml/datastream_defaults_spec.rb
-- spec/cosm-rb/parsers/xml/feed_defaults_spec.rb
-- spec/cosm-rb/parsers/xml/key_defaults_spec.rb
-- spec/cosm-rb/parsers/xml/trigger_defaults_spec.rb
-- spec/cosm-rb/search_result_spec.rb
-- spec/cosm-rb/string_extensions_spec.rb
-- spec/cosm-rb/template_spec.rb
-- spec/cosm-rb/templates/csv/datapoint_defaults_spec.rb
-- spec/cosm-rb/templates/csv/datastream_defaults_spec.rb
-- spec/cosm-rb/templates/csv/feed_defaults_spec.rb
-- spec/cosm-rb/templates/json/datapoint_defaults_spec.rb
-- spec/cosm-rb/templates/json/datastream_defaults_spec.rb
-- spec/cosm-rb/templates/json/feed_defaults_spec.rb
-- spec/cosm-rb/templates/json/key_defaults_spec.rb
-- spec/cosm-rb/templates/json/search_result_defaults_spec.rb
-- spec/cosm-rb/templates/json/trigger_defaults_spec.rb
-- spec/cosm-rb/templates/xml/datapoint_defaults_spec.rb
-- spec/cosm-rb/templates/xml/datastream_defaults_spec.rb
-- spec/cosm-rb/templates/xml/feed_defaults_spec.rb
-- spec/cosm-rb/templates/xml/search_result_defaults_spec.rb
-- spec/cosm-rb/trigger_spec.rb
-- spec/fixtures/models.rb
-- spec/spec_helper.rb
-- spec/support/contain_datapoint_eeml_matcher.rb
-- spec/support/contain_datastream_eeml_matcher.rb
-- spec/support/contain_feed_eeml_matcher.rb
-- spec/support/datapoint_helper.rb
-- spec/support/datastream_helper.rb
-- spec/support/describe_eeml_matcher.rb
-- spec/support/feed_helper.rb
-- spec/support/fully_represent_datapoint_matcher.rb
-- spec/support/fully_represent_datastream_matcher.rb
-- spec/support/fully_represent_feed_matcher.rb
-- spec/support/fully_represent_key_matcher.rb
-- spec/support/fully_represent_search_result_matcher.rb
-- spec/support/fully_represent_trigger_matcher.rb
-- spec/support/key_helper.rb
-- spec/support/search_result_helper.rb
-- spec/support/trigger_helper.rb
+test_files: []
+