acfs 0.21.0 → 0.21.1.b189

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 75cc01a8bf62c8e26a564ee7b93f074c51438590
-  data.tar.gz: bb9d4214f3c9a9165940496f45f85388536f3fea
-SHA512:
-  metadata.gz: 7d03ef94cdd7abef842964fd42a3d14844c874a56b91cbfaf2d43f2ea9c61b08f41a67ed8417049b793456884982c52de2be84b0762342bc9df87eb9d2eb3e4b
-  data.tar.gz: 0cb04255453ab76bcd659ffaa9102e79d3c2bf7b313975c8f27bb587c1586ad885167881eaf89dacfaa876f2a24a4a113a6f717e8d7b2cdbb39021e58f082fad
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjA2MzI1MjgyNDI5ZjhiOWZhYmRiNTljMzAxNjEzN2JmOTEyMWYxMQ==
+  data.tar.gz: !binary |-
+    ZTMzM2FjZjI4YmM5ZTE0ZWU0NTIyYTVkZjE3NjcxMjU0Y2NiMTY3Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Zjk0MzRmZWFlY2E4MzkwYWNiYTUwOWJjYjJkZGYyNDA2NjgyOTllZDljOWYy
+    NjQxMzVmOGNlNmVlYmQ4ZmU0N2QxNjlmODQ1Zjg4YmZmMjA4NjQ5ZjBkNjAz
+    YzhlYjBmM2NkMDYyZjU1ZTM1ZDEyOGNjNzIwZjJiZWYxMWEzNmM=
+  data.tar.gz: !binary |-
+    Nzg1NjM1ZjFlZjliMDVjNjMxOGM5NDIzN2U4Mjc1YjQ1ZWE5NjNjMTdhYTQ5
+    OGM5Zjc5YWQ1ZTRhNzk0Yzk1MTVkNGY5MjJkMzg2ZTdiYjZjNDY0YjQ2M2Zj
+    YmQ3MjkyMmMyNDA5MzJhMDA1YzQ0NTc2ZjgwNjM0MDg4NWQ3N2E=

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

@@ -2,7 +2,7 @@ module Acfs
   module VERSION
     MAJOR = 0
     MINOR = 21
-    PATCH = 0
+    PATCH = 1
     STAGE = nil
 
     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,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1.b189
 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
   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: