lhs 6.8.1 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a903adf673e0a9c79c2e060986a78bbfd50ff519
-  data.tar.gz: 2be897ab11167c15ab24413e0a3121d3152ddf51
+  metadata.gz: f5393d4f50916acb89d04bb7aa7e5576c44d3663
+  data.tar.gz: ff323966be871eda309fef270baf401bb66c8b59
 SHA512:
-  metadata.gz: 6155cbf30df50413a5339643d4bfda0126ea7e7c87ae20a21fa7dfc7cd9793448b971c139625d0ec508baa15bee59f318acf8d1c467b64d32479482fa333eddd
-  data.tar.gz: bc9c6bebdab8cbf5c915474e3837b7b6c649b25fc46e5eec1706a515a457e1b4ff28147b814ac1073a59d47f5e475f451d4543588d99f5c0fd87e05dcff683cf
+  metadata.gz: 80e80735fb752b92f5f4e3f3545148283a396a322e24f583ce3e1504d106b40b9b89c8b4dfccdac4c6ef3045df6e700a41342827005d3e6659009bb96467e12f
+  data.tar.gz: ff0c3bec571ca7772222b66cee22d652be6927a1c62083959487cb94be1a989024b8296919fd1ef859b96c82625c2a6175f85e97f37bfe3d46c084ea5c7a5f8b

data/lib/lhs/errors.rb

@@ -8,7 +8,8 @@ class LHS::Errors
     @messages = messages_from_response(response)
     @message = message_from_response(response)
     @raw = response.body if response
-  rescue JSON::ParserError # rubocop:disable Lint/HandleExceptions
+  rescue JSON::ParserError
+    add_error(messages, 'body', 'parse error')
   end
 
   def include?(attribute)
@@ -65,25 +66,41 @@ class LHS::Errors
   private
 
   def add_error(messages, key, value)
+    key = key.to_sym
     messages[key] ||= []
     messages[key].push(value)
   end
 
   def parse_messages(json)
     messages = {}
-    if json['fields']
-      json['fields'].each do |field|
-        field['details'].each do |detail|
-          add_error(messages, field['name'].to_sym, detail['code'])
-        end
+    fields_to_errors(json, messages) if json['fields']
+    field_errors_to_errors(json, messages) if json['field_errors']
+    fallback_errors(json, messages) if messages.empty?
+    messages
+  end
+
+  def fallback_errors(json, messages)
+    if json.present?
+      json.each do |key, value|
+        add_error(messages, key, value)
       end
+    else
+      add_error(messages, 'unknown', 'error')
     end
-    if json['field_errors']
-      json['field_errors'].each do |field_error|
-        add_error(messages, field_error['path'].join('.').to_sym, field_error['code'])
+  end
+
+  def field_errors_to_errors(json, messages)
+    json['field_errors'].each do |field_error|
+      add_error(messages, field_error['path'].join('.').to_sym, field_error['code'])
+    end
+  end
+
+  def fields_to_errors(json, messages)
+    json['fields'].each do |field|
+      field['details'].each do |detail|
+        add_error(messages, field['name'].to_sym, detail['code'])
       end
     end
-    messages
   end
 
   def messages_from_response(response = nil)

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "6.8.1"
+  VERSION = "6.8.2"
 end

data/spec/item/errors_spec.rb

@@ -39,6 +39,13 @@ describe LHS::Item do
     }
   end
 
+  let(:not_defined_error_format) do
+    {
+      'error' => 'missing_token',
+      'error_description' => 'Bearer token is missing'
+    }
+  end
+
   before(:each) do
     LHC.config.placeholder(:datastore, datastore)
     class Record < LHS::Record
@@ -56,6 +63,7 @@ describe LHS::Item do
       result = record.save
       expect(result).to eq false
       expect(record.errors).to be
+      expect(record.errors.any?).to eq true
       expect(record.name).to eq 'Steve'
       expect(record.errors.include?(:ratings)).to eq true
       expect(record.errors.include?(:recommended)).to eq true
@@ -71,6 +79,7 @@ describe LHS::Item do
       result = record.save
       expect(result).to eq false
       expect(record.errors).to be
+      expect(record.errors.any?).to eq true
       expect(record.errors.include?(:gender)).to eq true
       expect(record.errors.include?(:"contract.entry_id")).to eq true
       expect(record.errors[:gender]).to eq ['UNSUPPORTED_PROPERTY_VALUE', 'INCOMPLETE_PROPERTY_VALUE']
@@ -85,10 +94,39 @@ describe LHS::Item do
       record = Record.build
       record.save
       expect(record.errors.raw).to be
+      expect(record.errors.any?).to eq true
       json = JSON.parse(record.errors.raw)
       expect(json['status']).to be
       expect(json['message']).to be
       expect(json['field_errors']).to be
     end
   end
+
+  context 'request fails with unformated error message' do
+    it 'still tells us that there is an error' do
+      stub_request(:post, "#{datastore}/feedbacks")
+        .to_return(status: 400, body: not_defined_error_format.to_json)
+      record = Record.build
+      record.name = 'Steve'
+      result = record.save
+      expect(result).to eq false
+      expect(record.errors).to be
+      expect(record.errors.any?).to eq true
+      expect(record.errors['error']).to eq ['missing_token']
+      expect(record.errors['error_description']).to eq ['Bearer token is missing']
+    end
+  end
+
+  context 'empty error response body' do
+    it 'still tells us that there is an error' do
+      stub_request(:post, "#{datastore}/feedbacks").to_return(status: 400)
+      record = Record.build
+      record.name = 'Steve'
+      result = record.save
+      expect(result).to eq false
+      expect(record.errors).to be
+      expect(record.errors.any?).to eq true
+      expect(record.errors['body']).to eq ['parse error']
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.8.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc