cosm-rb 0.1.01 → 0.2.00

data/cosm-rb.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("multi_json", ">=1.3.6")
+  s.add_dependency("multi_xml", ">=0.5.1")
   s.add_dependency("yajl-ruby", ">=1.1.0")
   s.add_dependency("nokogiri", ">=1.4.4")
   s.add_dependency("httparty", ">=0.8.3")
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
 
   begin
     if !defined?(JRUBY_VERSION)
+      s.add_dependency("ox", ">= 1.5.9")
       if RUBY_VERSION.to_f < 1.9
         s.add_development_dependency("ruby-debug")
         s.add_development_dependency("rcov", ">=0.9.9")

data/lib/cosm-rb.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'multi_json'
+require 'multi_xml'
 
 $:.unshift(File.dirname(File.expand_path(__FILE__)))
 
@@ -27,6 +28,12 @@ require 'cosm-rb/resource'
 
 require 'cosm-rb/client'
 
+if defined?(JRUBY_VERSION)
+  MultiXml.parser = :nokogiri
+else
+  MultiXml.parser = :ox
+end
+
 if RUBY_VERSION.to_f < 1.9
   require 'fastercsv'
   Cosm::CSV = FasterCSV

data/lib/cosm-rb/parsers/defaults.rb

@@ -4,6 +4,8 @@ require 'cosm-rb/parsers/json/datastream_defaults'
 require 'cosm-rb/parsers/json/datapoint_defaults'
 require 'cosm-rb/parsers/json/trigger_defaults'
 require 'cosm-rb/parsers/json/key_defaults'
+require 'cosm-rb/parsers/xml/errors'
+require 'cosm-rb/parsers/xml/helpers'
 require 'cosm-rb/parsers/xml/feed_defaults'
 require 'cosm-rb/parsers/xml/datastream_defaults'
 require 'cosm-rb/parsers/xml/datapoint_defaults'

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

@@ -2,24 +2,22 @@ module Cosm
   module Parsers
     module XML
       module DatapointDefaults
+
+        include Cosm::Parsers::XML::Helpers
+
         def from_xml(xml)
           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
+            parsed = MultiXml.parse(xml)
+            raise InvalidXMLError, "Missing 'environment' node from base node" if parsed['eeml'].nil? || !parsed['eeml'].key?('environment')
+            return {} if parsed['eeml']['environment'].nil?
+            datastream = parsed['eeml']['environment']['data']
+            datapoint = datastream['datapoints']
+            _extract_datapoint(datapoint)
+          rescue MultiXml::ParseError => e
             raise InvalidXMLError, e.message
           end
         end
+
       end
     end
   end

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

@@ -2,17 +2,19 @@ module Cosm
   module Parsers
     module XML
       module DatastreamDefaults
+        include Cosm::Parsers::XML::Helpers
+
         def from_xml(xml)
           begin
-            xml = Nokogiri::XML(xml) do |config|
-              config.strict.nonet
-            end
-            if xml.root.attributes["version"].value == "5" || xml.collect_namespaces["xmlns"] == "http://www.eeml.org/xsd/005"
-              transform_5(xml)
+            parsed = MultiXml.parse(xml)
+            raise InvalidXMLError, "Missing 'environment' node from base node" if parsed['eeml'].nil? || !parsed['eeml'].key?('environment')
+            return {} if parsed['eeml']['environment'].nil?
+            if parsed['eeml']['version'] == '5' || parsed['eeml']['xmlns'] == 'http://www.eeml.org/xsd/005'
+              transform_v1(parsed['eeml']['environment'])
             else
-              transform_0_5_1(xml)
+              transform_v2(parsed['eeml']['environment'])
             end
-          rescue Nokogiri::SyntaxError => e
+          rescue MultiXml::ParseError => e
             raise InvalidXMLError, e.message
           end
         end
@@ -20,63 +22,24 @@ module Cosm
         private
 
         # As produced by http://cosm.com/api/v2/FEED_ID/datastreams/DATASTREAM_ID.xml
-        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 { |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
-          hash["updated"] = current_value.attributes["at"].value
-          hash["min_value"] = data.at_xpath("xmlns:min_value").content
-          hash["max_value"] = data.at_xpath("xmlns:max_value").content
-          unit = data.at_xpath("xmlns:unit")
-          if unit
-            hash["unit_label"] = unit.content
-            hash["unit_symbol"] = unit.attributes["symbol"].value
-            hash["unit_type"] = unit.attributes["type"].value
-          end
-          hash["datapoints"] = data.xpath("xmlns:datapoints").collect do |datapoint|
-            value = datapoint.at_xpath("xmlns:value")
-            {
-              "value" => value.content,
-              "at" => value.attributes["at"].value
-            }
-          end
-          hash
+        def transform_v2(xml)
+          datastream = convert_to_hash(xml['data'])
+          _extract_datastream(datastream).merge({
+            :feed_id => strip(xml,'id'),
+            :feed_creator => strip(xml,'creator')
+          })
         end
 
         # As produced by http://cosm.com/api/v1/FEED_ID/datastreams/DATASTREAM_ID.xml
-        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 { |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
-          hash["min_value"] = current_value.attributes["minValue"].value
-          hash["max_value"] = current_value.attributes["maxValue"].value
-          unit = data.at_xpath("xmlns:unit")
-          if unit
-            hash["unit_label"] = unit.content
-            hash["unit_symbol"] = unit.attributes["symbol"].value
-            hash["unit_type"] = unit.attributes["type"].value
-          end
-          hash
+        def transform_v1(xml)
+          datastream = convert_to_hash(xml['data'])
+          _extract_datastream_v1(datastream).merge({
+            :feed_id => strip(xml,'id'),
+            :updated => strip(xml,'updated'),
+            :feed_creator => 'http://www.haque.co.uk'
+          })
         end
+
       end
     end
   end

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

@@ -0,0 +1,7 @@
+module Cosm
+  module Parsers
+    module XML
+      class InvalidXMLError < Cosm::ParserError; end
+    end
+  end
+end

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

@@ -1,155 +1,81 @@
 module Cosm
   module Parsers
     module XML
-      class InvalidXMLError < Cosm::ParserError; end
       module FeedDefaults
+        include Cosm::Parsers::XML::Helpers
+
         def from_xml(xml)
           begin
-            xml = Nokogiri::XML(xml) do |config|
-              config.strict.nonet
-            end
-            if xml.root.attributes["version"].value == "5" ||
-              xml.collect_namespaces["xmlns"] == "http://www.eeml.org/xsd/005"
-              transform_5(xml)
+            parsed = MultiXml.parse(xml)
+            raise InvalidXMLError, "Missing 'environment' node from base node" if parsed['eeml'].nil? || !parsed['eeml'].key?('environment')
+            return {} if parsed['eeml']['environment'].nil?
+            if parsed['eeml']['version'] == '5' || parsed['eeml']['xmlns'] == 'http://www.eeml.org/xsd/005'
+              transform_v1(parsed['eeml']['environment'])
             else
-              transform_0_5_1(xml)
+              transform_v2(parsed['eeml']['environment'])
             end
-          rescue Nokogiri::SyntaxError => e
+          rescue MultiXml::ParseError => e
             raise InvalidXMLError, e.message
           end
         end
 
+        private
+
         # As produced by http://cosm.com/api/v2/FEED_ID.xml
-        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"] = 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.delete_if { |v| v.to_s.strip == "" }.sort{ |a,b| a.downcase <=> b.downcase}).strip
-          end
-          location = environment.at_xpath("xmlns:location")
-          if location
-            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"] = 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" => 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.delete_if { |v| v.strip.to_s == "" }.sort { |a, b| a.downcase <=> b.downcase }).strip }
-            else
-              tags_hash = {}
-            end
-            {
-              "id" => datastream.attributes["id"].value,
-              "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" => strip(value.content),
-              }
-              end
-            }.merge(value_hash).merge(unit_hash).merge(tags_hash)
-          end
-          hash
+        def transform_v2(xml)
+          location = xml['location'] || {}
+          user = xml['user'] || {}
+          {
+            :title => strip(xml,'title'),
+            :updated => strip(xml,'updated'),
+            :creator => strip(xml,'creator'),
+            :created => strip(xml,'created'),
+            :feed => strip(xml,'feed'),
+            :auto_feed_url => strip(xml,'auto_feed_url'),
+            :status => strip(xml,'status'),
+            :description => strip(xml,'description'),
+            :icon => strip(xml,'icon'),
+            :website => strip(xml,'website'),
+            :email => strip(xml,'email'),
+            :private => strip(xml,'private'),
+            :location_lon => strip(location,'lon'),
+            :location_lat => strip(location,'lat'),
+            :location_ele => strip(location,'ele'),
+            :location_name => strip(location,'name'),
+            :location_domain => strip(location,'domain'),
+            :location_exposure => strip(location,'exposure'),
+            :location_disposition => strip(location,'disposition'),
+            :owner_login => strip(user,'login'),
+            :datastreams => _extract_datastreams(xml['data'])
+          }.merge(sanitised_tags(xml))
         end
 
         # As produced by http://cosm.com/api/v1/FEED_ID.xml
-        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"] = 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"] = 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
-          hash["datastreams"] = environment.xpath("xmlns:data").collect do |datastream|
-            current_value = datastream.at_xpath("xmlns:value")
-            unit = datastream.at_xpath("xmlns:unit")
-            if unit
-              unit_hash = {
-                "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.delete_if { |v| v.to_s.strip == "" }.sort { |a, b| a.downcase <=> b.downcase }).strip }
-            else
-              tags_hash = {}
-            end
-            {
-              "id" => datastream.attributes["id"].value,
-              "current_value" => strip(current_value.content),
-              "updated" => environment.attributes["updated"].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
+        def transform_v1(xml)
+          location = xml['location'] || {}
+          user = xml['user'] || {}
+          {
+            :title => strip(xml,'title'),
+            :updated => strip(xml,'updated'),
+            :creator => 'http://www.haque.co.uk',
+            :created => strip(xml,'created'),
+            :feed => strip(xml,'feed'),
+            :status => strip(xml,'status'),
+            :description => strip(xml,'description'),
+            :icon => strip(xml,'icon'),
+            :website => strip(xml,'website'),
+            :email => strip(xml,'email'),
+            :location_lon => strip(location,'lon'),
+            :location_lat => strip(location,'lat'),
+            :location_ele => strip(location,'ele'),
+            :location_name => strip(location,'name'),
+            :location_domain => strip(location,'domain'),
+            :location_exposure => strip(location,'exposure'),
+            :location_disposition => strip(location,'disposition'),
+            :datastreams => _extract_datastreams_v1(xml['data'])
+          }
         end
 
-        def strip(value)
-          return value.nil? ? nil : value.strip
-        end
-        private :strip
       end
     end
   end

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

@@ -0,0 +1,116 @@
+module Cosm
+  module Parsers
+    module XML
+      module Helpers
+
+        private
+
+        def strip(xml, value)
+          if xml.key?(value)
+            xml[value].nil? ? '' : xml[value].strip
+          else
+            nil
+          end
+        end
+
+        def convert_to_hash(val)
+          if val.class == String
+            {'__content__' => val}
+          else
+            val ? val.merge({'__content__' => val['__content__']}) : {}
+          end
+        end
+
+        def convert_to_array(val)
+          if val.is_a?(Hash)
+            val = [val]
+          else
+            val
+          end
+        end
+
+        def _extract_datastreams(xml)
+          return unless xml
+          xml = convert_to_array(xml)
+          xml.collect do |ds|
+            _extract_datastream(ds)
+          end
+        end
+
+
+        def _extract_datastream(xml)
+          current_value = convert_to_hash(xml['current_value'])
+          unit = convert_to_hash(xml['unit'])
+          {
+            :current_value => strip(current_value,'__content__'),
+            :updated => strip(current_value,'at'),
+            :id => strip(xml,'id'),
+            :unit_symbol => strip(unit,'symbol'),
+            :unit_type => strip(unit,'type'),
+            :unit_label => strip(unit,'__content__'),
+            :min_value => strip(xml,'min_value'),
+            :max_value => strip(xml,'max_value'),
+            :datapoints => _extract_datapoints(xml['datapoints'])
+          }.merge(sanitised_tags(xml))
+        end
+
+        def _extract_datastreams_v1(xml)
+          return unless xml
+          xml = convert_to_array(xml)
+          xml.collect do |ds|
+            _extract_datastream_v1(ds)
+          end
+        end
+
+        def _extract_datastream_v1(xml)
+          unit = convert_to_hash(xml['unit'])
+          value = convert_to_hash(xml['value'])
+          {
+            :current_value => strip(value,'__content__'),
+            :id => strip(xml,'id'),
+            :unit_symbol => strip(unit,'symbol'),
+            :unit_type => strip(unit,'type'),
+            :unit_label => strip(unit,'__content__'),
+            :min_value => strip(value,'minValue'),
+            :max_value => strip(value,'maxValue')
+          }.merge(sanitised_tags(xml))
+        end
+
+        def _extract_datapoints(xml)
+          return unless xml
+          value = xml['value']
+          value = convert_to_array(value)
+          value.collect do |dp|
+            _extract_datapoint(dp)
+          end
+        end
+
+        def _extract_datapoint(xml)
+          value = convert_to_hash(xml['value'])
+          {
+            :at => strip(value,'at'),
+            :value => strip(value,'__content__')
+          }
+        end
+
+        def _extract_tags(xml)
+          if xml.class != Array
+            xml = [xml]
+          end
+          if (tags = xml.collect { |t| "#{t}".strip }).any?
+            Cosm::CSV.generate_line(tags.delete_if { |v| v.to_s.strip == "" }.sort{ |a,b| a.downcase <=> b.downcase}).strip
+          end
+        end
+
+        # Keep blank tags but delete if value is nil
+        def sanitised_tags(xml)
+          if xml.key?('tag')
+            {:tags => _extract_tags(xml['tag'])}
+          else
+            {}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.1.01'
+  VERSION = '0.2.00'
 end

data/spec/support/fully_represent_feed_matcher.rb

@@ -132,7 +132,6 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
         end
         current_value = data.at_xpath("xmlns:value")
         ds.current_value.should == current_value.content
-        ds.updated.should == environment.attributes["updated"].value
         ds.min_value.should == current_value.attributes["minValue"].value
         ds.max_value.should == current_value.attributes["maxValue"].value
         unit = data.at_xpath("xmlns:unit")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.01
+  - 2
+  - 0
+  version: 0.2.00
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 +00:00
+date: 2012-09-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,9 +37,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: multi_xml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
+        version: 0.5.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,11 +67,11 @@ dependencies:
         - 0
         version: 1.1.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,11 +83,11 @@ dependencies:
         - 4
         version: 1.4.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,11 +99,11 @@ dependencies:
         - 3
         version: 0.8.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: fastercsv
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,11 +115,27 @@ dependencies:
         - x
         version: 1.5.x
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ox
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 5
+        - 9
+        version: 1.5.9
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +145,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +161,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -145,11 +177,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -161,7 +193,7 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id009
+  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
@@ -214,7 +246,9 @@ files:
 - lib/cosm-rb/parsers/json/trigger_defaults.rb
 - lib/cosm-rb/parsers/xml/datapoint_defaults.rb
 - lib/cosm-rb/parsers/xml/datastream_defaults.rb
+- lib/cosm-rb/parsers/xml/errors.rb
 - lib/cosm-rb/parsers/xml/feed_defaults.rb
+- lib/cosm-rb/parsers/xml/helpers.rb
 - lib/cosm-rb/parsers/xml/key_defaults.rb
 - lib/cosm-rb/parsers/xml/trigger_defaults.rb
 - lib/cosm-rb/permission.rb