cosm-rb 0.2.05 → 0.2.07

data/.rbenv-version

@@ -1 +1 @@
-ruby-1.8.7-p370
+ruby-1.9.3-p194

data/.travis.yml

@@ -3,10 +3,4 @@ rvm:
  - 1.8.7
  - 1.9.2
  - 1.9.3
- - jruby-18mode
- - jruby-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
 env: COVERAGE=on

data/cosm-rb.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency("multi_xml", ">=0.5.2")
   s.add_dependency("yajl-ruby", ">=1.1.0")
   s.add_dependency("nokogiri", ">=1.5.6")
-  s.add_dependency("httparty", ">=0.8.3")
+  s.add_dependency("httparty", ">=0.10.0")
 
   if RUBY_VERSION.to_f < 1.9
     s.add_dependency("fastercsv", ">=1.5.x")
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
         s.add_development_dependency("ruby-debug")
         s.add_development_dependency("rcov", ">=0.9.9")
       else
+        s.add_development_dependency("debugger")
         s.add_development_dependency("simplecov", ">=0.7.1")
       end
     end

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

@@ -28,6 +28,8 @@ module Cosm
 
           hash = Hash.new
 
+          raise InvalidCSVError, "Submitted CSV is empty." if rows.empty?
+
           if version == :v2
             hash["datastreams"] = extract_datastreams(rows)
           elsif version == :v1

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.2.05'
+  VERSION = '0.2.07'
 end

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

@@ -49,6 +49,18 @@ describe "default feed csv parser" do
       }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
     end
 
+    it "should raise an error if passed empty content as v2" do
+      expect {
+        Cosm::Feed.new("", :v2)
+      }.to raise_error(Cosm::Parsers::CSV::InvalidCSVError)
+    end
+
+    it "should raise an error if passed empty content as v1" do
+      expect {
+        Cosm::Feed.new("", :v1)
+      }.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,213 +1,191 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cosm-rb
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.07
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.05
 platform: ruby
-authors: 
+authors:
 - Paul Bellamy
 - Levent Ali
 - Sam Mulube
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-11 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 3
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.6
-  version_requirements: *id001
-  name: multi_json
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
   name: multi_xml
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 5
-        - 6
-        version: 1.5.6
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
-        version: 0.8.3
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 974768130
-        segments: 
-        - 1
-        - 5
-        - x
-        version: 1.5.x
-  version_requirements: *id006
-  name: fastercsv
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 5
-        - 9
-        version: 1.5.9
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
   name: ox
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
-  name: ruby-debug
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.9
+  type: :runtime
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  version_requirements: *id009
-  name: rcov
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.9
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  version_requirements: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
-  version_requirements: *id011
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-description: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+description: A library for communicating with the Cosm REST API, parsing and rendering
+  Cosm feed formats
+email:
 - paul.a.bellamy@gmail.com
 - lebreeze@gmail.com
 - sam@pachube.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 - MIT-LICENSE
-files: 
+files:
 - .gitignore
 - .rbenv-version
 - .rspec
@@ -330,40 +308,37 @@ 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: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1496334543805275150
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1496334543805275150
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
+summary: A library for communicating with the Cosm REST API, parsing and rendering
+  Cosm feed formats
 test_files: []
-