acfs 0.21.0.b185 → 0.21.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c2d64318701de68d4bebf2c0454ae17222f41e
-  data.tar.gz: 7b058dbf9ce187553aa1a41420b3792b96f4b8f3
+  metadata.gz: da189dd54ceae27622ddb4e7d3e153fa565bdcba
+  data.tar.gz: c4edca0b269946131682fda7683b2c52776d91b3
 SHA512:
-  metadata.gz: d2b103a60ada7149b1f58c79ffaad1f2419116040742217933819840b940b7f17ffa7a03294835b87ad346a33509c996b33872efd845b59fece94ce72bf265e8
-  data.tar.gz: 425866d67a2dd571cfd1e5dcb9519616720bf7059ec58004dd4ab61f06f94cf508385448dd9f1674937701e95ffb40ec05f4763803eae403ae5170f1611c39d8
+  metadata.gz: dc1c986f071bbda315229aafe2eaededa834a16bc2bbae62e9a2224340f9afad943fe36ba6784a372533eeea6748d3ffc1a706406bc95b86fb82ea8de1c6cee3
+  data.tar.gz: a562624d60d854eba64f406c8488de84287935a3bc80c20d1aa03416070cd01dec6fe744922e8da0418d48c882b96e407bccafdc195c30f0fca8fc48daf96c0f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.21.1
+
+* Fix wrong validation context
+
 ## 0.21.0
 
 * Add update_attributes

data/lib/acfs/errors.rb

@@ -16,7 +16,7 @@ module Acfs
 
     def initialize(opts = {})
       @response = opts[:response]
-      message = 'Received erroneous response'
+      message = opts[:message] || 'Received erroneous response'
       if response
         message << ": #{response.code}"
         if response.data
@@ -64,6 +64,8 @@ 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
       super
     end
   end

data/lib/acfs/model/service.rb

@@ -33,8 +33,8 @@ module Acfs::Model
       #   @param [ Object ] options Option delegated to service class initializer.
       #
       def service(klass = nil, options = {})
-        return @service unless klass
-        @service = klass.new options
+        return (@service = klass.new options) if klass
+        @service || superclass.service
       end
     end
   end

data/lib/acfs/model/validation.rb

@@ -5,7 +5,7 @@ module Acfs::Model
   module Validation
 
     def save!(*_)
-      raise ::Acfs::InvalidResource.new resource: self, errors: errors.to_a unless valid? :save
+      raise ::Acfs::InvalidResource.new resource: self, errors: errors.to_a unless valid? (new? ? :create : :save)
 
       super
     end

data/lib/acfs/version.rb

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

data/spec/acfs/model/validation_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Acfs::Model::Validation do
-  let(:params) { {} }
+  let(:params) { {name: 'john smith', age: 24} }
   let(:model) { MyUserWithValidations.new params }
 
   describe '#valid?' do
     context 'with valid attributes' do
-      let(:params) { {name: 'john smith', age: 24} }
       subject { model }
 
       it { should be_valid }
@@ -44,11 +43,33 @@ describe Acfs::Model::Validation do
   end
 
   describe '#save!' do
+    subject { -> { model.save! } }
+    before { model.stub(:operation) }
+
     context 'with invalid attributes' do
       let(:params) { {name: 'john'} }
-      subject { -> { model.save! } }
 
       it { expect { subject.call }.to raise_error Acfs::InvalidResource }
     end
+
+    context 'on new resource' do
+      it 'should validate with `create` context' do
+        expect(model).to receive(:valid?).with(:create).and_call_original
+        subject.call
+      end
+    end
+
+    context 'on changed resource' do
+      let(:model) { super().tap { |m| m.id = 1 } }
+
+      it 'should validate with `save` context' do
+        expect(model).to receive(:valid?).with(:save).and_call_original
+        subject.call
+      end
+    end
+  end
+
+  describe 'validates with context' do
+
   end
 end

data/spec/support/service.rb

@@ -46,3 +46,10 @@ class Comment < Acfs::Resource
   attribute :id, :integer
   attribute :text, :string
 end
+
+# DRAFT: Singular resource
+#class Singular < Acfs::Resource
+#  service UserService, singular: true
+#
+#  attribute :name, :string
+#end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.21.0.b185
+  version: 0.21.0.rc1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -252,3 +252,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/response.rb
 - spec/support/service.rb
+has_rdoc: