cosm-rb 0.2.02 → 0.2.03

data/.rbenv-version

@@ -1 +1 @@
-ruby-1.8.7-p249
+ruby-1.8.7-p370

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

@@ -43,11 +43,12 @@ module Cosm
 
         private
 
+        # This is used by v2 only
         def extract_datastreams(rows)
           row_sizes = rows.collect { |row| row.size }.uniq
           row_ids = rows.collect { |row| row.first.to_s.strip }.uniq
 
-          raise InvalidCSVError, "CSV is invalid. Incorrect number of fields" if row_sizes.max > 3
+          raise InvalidCSVError, "CSV is invalid. Incorrect number of fields" if row_sizes.max > 3 || row_sizes.min <= 1
 
           datastream_buckets = {}
 

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.2.02'
+  VERSION = '0.2.03'
 end

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

@@ -37,6 +37,18 @@ describe "default feed csv parser" do
       feed.should fully_represent_feed(:csv_v1, csv)
     end
 
+    it "should accept explicit blank values for v2 csv" do
+      expect {
+        Cosm::Feed.new("stream_id,''", :v2)
+      }.to_not raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
+    it "should raise an error if passed some v2 csv that does not contain a value" do
+      expect {
+        Cosm::Feed.new("stream_id", :v2)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    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,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.02
+  - 3
+  version: 0.2.03
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 +00:00
+date: 2012-11-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 121
+        hash: -1810746622
         segments: 
         - 1
         - 5