odata 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bcb409923afacd4cbe61f5529778a48095d8bfa
-  data.tar.gz: 1e9717542f01cebe59d94f7cc96eaecc41105a5f
+  metadata.gz: 8c8d4272413289a30d35a4b09f817f3d7686c3dc
+  data.tar.gz: 0d07830dbda9b044c740ec0cd3d879cbe7844276
 SHA512:
-  metadata.gz: 6bdf2a6ff80565a48c9c013d4bfacdd6d2051f7917c4cf2bbd708aa553fb2e2179e0d8943f53691e230c8fcb0e030bc6d6426a93ff4851e2e292060ee401cb98
-  data.tar.gz: 89ffb30a578f9dc4e66c3181f4f30598a0fca8499e101420cd80c1f5722c6eb0b57698a2e030ff00b8ad51257f562aa05c9af3d16cc5a82a3fd05fbb24006025
+  metadata.gz: 7e3308fd2fdc7ad523dc2b6f64015cee6467d8d00cc26dbf759b23c0aa68b28c918b87846944cb084a2b4bc09368051a1c2e1d24093027b3d0972068b2a97ca4
+  data.tar.gz: 7177e7a0995e6323cf2e0a929b8a3e9547552f8c8cf01c1e6d94eb5b4b718a3c98598b8dd1bae34518d4ecca2e60904862aa1a6eaccf118e4b63482b198794ba

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.6.7
+
+* Changed how commit failures are handled to use logging instead of raising an
+  error.
+* Added errors array to OData::Entity.
+
 ## 0.6.6
 
 * Updated OData::EntitySet#setup_entity_post_request to properly format primary

data/lib/odata/entity.rb

@@ -13,6 +13,8 @@ module OData
     attr_reader :service_name
     # Links to other OData entitites
     attr_reader :links
+    # List of errors on entity
+    attr_reader :errors
 
     # Initializes a bare Entity
     # @param options [Hash]
@@ -21,6 +23,7 @@ module OData
       @namespace = options[:namespace]
       @service_name = options[:service_name]
       @links = options[:links] || {}
+      @errors = []
     end
 
     # Returns name of Entity from Service specified type.
@@ -124,6 +127,10 @@ module OData
       self[primary_key].nil?
     end
 
+    def any_errors?
+      !errors.empty?
+    end
+
     private
 
     def instantiate_property(property_name, value)

data/lib/odata/entity_set.rb

@@ -105,9 +105,15 @@ module OData
       url_chunk, options = setup_entity_post_request(entity)
       result = execute_entity_post_request(options, url_chunk)
       if entity.is_new?
-        doc = ::Nokogiri::XML(result).remove_namespaces!
-        entity[entity.primary_key] = doc.xpath("//content/properties/#{entity.primary_key}").first.content
+        doc = ::Nokogiri::XML(result.body).remove_namespaces!
+        primary_key_node = doc.xpath("//content/properties/#{entity.primary_key}").first
+        entity[entity.primary_key] = primary_key_node.content unless primary_key_node.nil?
       end
+
+      unless result.code.to_s =~ /^2[0-9][0-9]$/
+        entity.errors << ['could not commit entity']
+      end
+
       entity
     end
 
@@ -143,9 +149,22 @@ module OData
     def execute_entity_post_request(options, url_chunk)
       result = service.execute(url_chunk, options)
       unless result.code.to_s =~ /^2[0-9][0-9]$/
-        raise StandardError, 'Something went wrong committing your entity'
+        service.logger.debug <<-EOS
+          [ODATA: #{service_name}]
+          An error was encountered committing your entity:
+
+            POSTed URL:
+            #{url_chunk}
+
+            POSTed Entity:
+            #{options[:body]}
+
+            Result Body:
+            #{result.body}
+        EOS
+        service.logger.info "[ODATA: #{service_name}] Unable to commit data to #{url_chunk}"
       end
-      result.body
+      result
     end
 
     def setup_entity_post_request(entity)

data/lib/odata/service.rb

@@ -218,6 +218,14 @@ module OData
       properties_to_return
     end
 
+    def logger
+      @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+    end
+
+    def logger=(custom_logger)
+      @logger = custom_logger
+    end
+
     private
 
     def default_options

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

data/spec/odata/entity_set_spec.rb

@@ -95,7 +95,11 @@ describe OData::EntitySet, vcr: {cassette_name: 'entity_set_specs'} do
     } }
 
     describe 'with an existing entity', vcr: {cassette_name: 'entity_set_specs/existing_entry'} do
-      it { expect {subject << existing_entity}.to_not raise_error }
+      before(:each) do
+        subject << existing_entity
+      end
+
+      it { expect(existing_entity.any_errors?).to eq(false) }
     end
 
     describe 'with a new entity', vcr: {cassette_name: 'entity_set_specs/new_entry'} do
@@ -108,7 +112,11 @@ describe OData::EntitySet, vcr: {cassette_name: 'entity_set_specs'} do
     end
 
     describe 'with a bad entity', vcr: {cassette_name: 'entity_set_specs/bad_entry'} do
-      it { expect {subject << bad_entity}.to raise_error(StandardError, 'Something went wrong committing your entity') }
+      before(:each) do
+        subject << bad_entity
+      end
+
+      it { expect(bad_entity.any_errors?).to eq(true) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler