acfs 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c18e797eac0b3abed6b8e813fe02868e26b75ae6a83067502adcc4b4b4176cf
-  data.tar.gz: a3825baa81a2d24a925a820968580bd2006c3e64500de45feec106b17090e325
+  metadata.gz: 151804a96a34d4c2703b0c94482ae3abdee035bc086110b5a4867e1deb84be30
+  data.tar.gz: 7c3324df0c3e5e253d8994ee0e2d99fab7c1ea42fba891723027eb51479319db
 SHA512:
-  metadata.gz: ce0d4f99f72aaad7ff0242026c5fe0efef7442f7dd44f7b44b1bb7e9947115cc8049d24c1977b418140155f66091d070f8c3a983164047f105d4b5a4995a9e2e
-  data.tar.gz: 58054596b40e2453e1790b3c74c56450b5a0d020bf7ad5d10fe61da68d1e791872e79fa0fa2990d713cf05e9da7055fb700437df5e2063530170ad26d9d210f3
+  metadata.gz: 9b7e893131d386a13c898cedac5e880bf9d6e2a31481b9c7af1dd41926f65385c3c667a9556ec8b349b72648a03be4c9ce8ff3f393bfe94f4c9d2b2b33bb6d5e
+  data.tar.gz: 910c4e6830b622c404eb9c614b4497eb69e20192f22315fc9d6ab89460fa7602396077ddfe5f000789dd609d4f69a6e126afa4a56bccba2bf8bbc2b06272e685

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.1
+
+* Fix issues with resources errors if response payload differs from the expected `field => [messages]`, such as `field => message` or `[messages]`.
+
 ## 1.2.0
 
 * Add Rails 5.2 compatibility

data/lib/acfs/errors.rb

@@ -68,8 +68,15 @@ module Acfs
     def initialize(opts = {})
       @errors   = opts.delete :errors
       @resource = opts.delete :resource
-      opts[:message] ||= @errors.map {|k, v| "#{k}: #{v.join ', '}" }.join ', ' if @errors.is_a? Hash
-      opts[:message] ||= @errors.join ', ' if @errors.is_a? Array
+
+      if @errors.is_a?(Hash)
+        opts[:message] ||= @errors.each_pair.map do |k, v|
+          @errors.is_a?(Array) ? "#{k}: #{v.join(', ')}" : "#{k}: #{v}"
+        end.join ', '
+      elsif @errors.is_a?(Array)
+        opts[:message] ||= @errors.join ', '
+      end
+
       super
     end
   end

data/lib/acfs/resource/validation.rb

@@ -12,10 +12,17 @@ class Acfs::Resource
     end
 
     def remote_errors=(errors)
-      (errors || []).each do |field, errs|
-        errs.each do |err|
-          self.errors.add field.to_sym, err
-          remote_errors.add field.to_sym, err
+      if errors.respond_to?(:each_pair)
+        errors.each_pair do |field, errs|
+          Array(errs).each do |err|
+            self.errors.add field.to_sym, err
+            remote_errors.add field.to_sym, err
+          end
+        end
+      else
+        Array(errors).each do |err|
+          self.errors.add :base, err
+          remote_errors.add :base, err
         end
       end
     end

data/lib/acfs/version.rb

@@ -2,7 +2,7 @@ module Acfs
   module VERSION
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/acfs/resource/validation_spec.rb

@@ -66,14 +66,31 @@ describe Acfs::Resource::Validation do
       after  { Acfs::Stub.disable }
 
       before do
-        Acfs::Stub.resource MyUser, :create, with: {}, return: {errors: {name: ['can\'t be blank']}}, raise: 422
+        Acfs::Stub.resource MyUser, :create,
+          with: {}, return: {errors: errors}, raise: 422
       end
 
       let(:params)   { {} }
       let(:resource) { MyUser.create params }
-      subject { resource }
+      subject { resource.errors.to_hash }
+
+      context 'with `field => [messages]` payload' do
+        let(:errors) { {name: ['cannot be blank']} }
+
+        it { is_expected.to eq(name: ['cannot be blank']) }
+      end
+
+      context 'with `field => message` payload' do
+        let(:errors) { {name: 'cannot be blank'} }
 
-      its(:errors) { expect(subject.errors.to_hash).to eq(name: ['can\'t be blank']) }
+        it { is_expected.to eq(name: ['cannot be blank']) }
+      end
+
+      context 'with `[messages]` payload' do
+        let(:errors) { ['cannot be blank'] }
+
+        it { is_expected.to eq(base: ['cannot be blank']) }
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.