acfs 0.22.1 → 0.22.2.b193

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a93b31b3407088da5bbe861a8ab92e4b0db54738
-  data.tar.gz: a40bd7d92df507d6ac02518a92fe04093ddd6ce0
-SHA512:
-  metadata.gz: 20283aaad9eef5da1777c2611c67063696d271f28df857fe04b8dca4f346c967e2cda0c82696c2f46d14804c25546a5fcf16daf63c60835bd665e73af5bd6af1
-  data.tar.gz: 8544d2423cdc9570f3d787493ed7679788955bcdb2c03397a36b54d11d1eef118b2e672cc441ba170796f32fc3f807e88c5311fa4b2a56b9c38b3b5fa4a57b66
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWI5YzUzYWUxMTk1ZTgyMjhhZDFiYmIzNTMwYTY4Zjg5ZThlYWM4ZQ==
+  data.tar.gz: !binary |-
+    NDBjYTFiZTg4ZGQ2YjQwNTZiNDE3NGE1ZTU4YmFhODc1ZWRhY2RkNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2E1ZWFmM2QzMTA0NWM5OWU2ZTgwYzlhNTY0MmIyNDA5MTc0ZTFhNTVmYzU2
+    ZjI3MDA5NmRkYmI3YzNkOWU0N2ZiMTc4OGUzYWEzZWRiNWRhZGI5OWExMGQx
+    YmY0ZjRkMjQ1YjQwZmZjNWY2MzVkZGFjNTEyZjdhMTAwNWY1M2Q=
+  data.tar.gz: !binary |-
+    ZjcwMzEyYzhlNWQzNDM4MjI1NjQwYTg3YTEyOWU4M2QxZmNlMjM5MGNlMDk1
+    ZWI0MWVhNDE3ZTNhYTcxZmU1ZGM4ODJiNzFiZjE2YjdmNTA0YzYyZWEwZjI3
+    YWQ5MTJiY2FhZDhiNzQyMTM5MjQ2M2ZiYzY1N2Q3NWJjYWU4OTU=

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.22.2
+
+* Preserve errors received from service on revalidation (2f1fc178)
+* Fix parameter ordering bug on stubs (1dc78dc8)
+
+## 0.22.1
+
+* Fix hash modification on iteration bug on ActiveModel::Errors due to string keys in error hash
+
 ## 0.22.0
 
 * Fill local resource errors hash also on 422 responses when saving resources

data/lib/acfs/model/persistence.rb

@@ -85,9 +85,7 @@ module Acfs
           update_with data
         end
       rescue InvalidResource => err
-        (err.errors || []).each do |field, errors|
-          self.errors.set field.to_sym, errors
-        end
+        self.remote_errors = err.errors
         raise err
       end
 

data/lib/acfs/model/validation.rb

@@ -4,6 +4,23 @@ module Acfs::Model
   #
   module Validation
 
+    def valid?(*args)
+      super
+      remote_errors.each { |f, e| errors.add f, e }
+      errors.empty?
+    end
+
+    def remote_errors
+      @remote_errors ||= ActiveModel::Errors.new self
+    end
+
+    def remote_errors=(errors)
+      (errors || []).each do |field, errors|
+        self.errors.set field.to_sym, errors
+        self.remote_errors.set field.to_sym, errors
+      end
+    end
+
     def save!(*_)
       raise ::Acfs::InvalidResource.new resource: self, errors: errors.to_a unless valid? (new? ? :create : :save)
 

data/lib/acfs/response.rb

@@ -23,6 +23,7 @@ module Acfs
       @status   = data[:status]  || 0
       @headers  = data[:headers] || {}
       @body     = data[:body]    || ''
+      @data     = data[:data]    || nil
     end
   end
 end

data/lib/acfs/stub.rb

@@ -35,10 +35,10 @@ module Acfs
     def call(op)
       calls << op
 
-      if (data = opts[:return])
-        op.callback.call data
-      elsif (err = opts[:raise])
+      if (err = opts[:raise])
         raise_error op, err, opts[:return]
+      elsif (data = opts[:return])
+        op.callback.call data
       else
         raise ArgumentError, 'Unsupported stub.'
       end
@@ -47,6 +47,7 @@ module Acfs
     private
     def raise_error(op, name, data)
       raise name if name.is_a? Class
+      data.stringify_keys! if data.respond_to? :stringify_keys!
 
       op.handle_failure ::Acfs::Response.new op.request, status: Rack::Utils.status_code(name), data: data
     end

data/lib/acfs/version.rb

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

data/spec/acfs/model/validation_spec.rb

@@ -17,6 +17,26 @@ describe Acfs::Model::Validation do
 
       it { should_not be_valid }
     end
+
+    context 'on resource with service side errors' do
+      before { Acfs::Stub.enable }
+      after  { Acfs::Stub.disable }
+
+      before do
+        Acfs::Stub.resource MyUser, :create, with: {}, return: {errors: {name: ['can\'t be blank']}}, raise: 422
+      end
+
+      let(:params)   { {} }
+      let(:resource) { MyUser.create params }
+      subject { resource }
+
+      it { should_not be_valid }
+
+      it 'should not override errors' do
+        subject.valid?
+        expect(subject.errors.to_hash).to eq({name: ['can\'t be blank']})
+      end
+    end
   end
 
   describe '#errors' do
@@ -40,6 +60,21 @@ describe Acfs::Model::Validation do
         expect(subject.to_hash).to eq age: ["can't be blank"], name: ['is invalid']
       end
     end
+
+    context 'server side errors' do
+      before { Acfs::Stub.enable }
+      after  { Acfs::Stub.disable }
+
+      before do
+        Acfs::Stub.resource MyUser, :create, with: {}, return: {errors: {name: ['can\'t be blank']}}, raise: 422
+      end
+
+      let(:params)   { {} }
+      let(:resource) { MyUser.create params }
+      subject { resource }
+
+      its(:errors) { expect(subject.errors.to_hash).to eq({name: ['can\'t be blank']}) }
+    end
   end
 
   describe '#save!' do

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2.b193
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -211,14 +211,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -252,4 +252,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/response.rb
 - spec/support/service.rb
-has_rdoc: