cosm-rb 0.2.01 → 0.2.02

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

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

data/lib/cosm-rb/version.rb

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

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

@@ -123,5 +123,26 @@ XML
       Cosm::Datastream.new("This is not xml", :v2, :xml)
     }.to raise_error(Cosm::Parsers::XML::InvalidXMLError)
   end
+
+  it "should handle being passed xml containing datapoints with no timestamp" do
+    xml = <<-XML
+<eeml xmlns="http://www.eeml.org/xsd/0.5.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="0.5.1" xsi:schemaLocation="http://www.eeml.org/xsd/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.xsd"> 
+  <environment>
+    <data>
+      <datapoints>
+        <value at="2010-05-20T11:01:43Z">294</value>
+        <value>295</value>
+        <value at="2010-05-20T11:01:45Z">296</value>
+        <value at="2010-05-20T11:01:46Z">297</value>
+      </datapoints>
+    </data>
+  </environment>
+</eeml>
+XML
+
+    expect {
+      Cosm::Datastream.new(xml)
+    }.to_not raise_error
+  end
 end
 

metadata

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