cyrax 0.5.1.beta4 → 0.5.1.beta5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZiMTcyNTZiNGQwMTlmOTVjZjc3YjkxZTU4YzRkN2NkMGEyMTA2Ng==
+    ZDVkZDFkMDI4MWM3YWUwNjUzMDcwNGYxOTQ4ZjAxNjIyNjIyMDkxNA==
   data.tar.gz: !binary |-
-    OGVkZmYzZmFjOTY4YjgyMjMwM2Y5MzhkNDkxZWVhYTA2MjVhM2ViNw==
+    MmY0YzA2YWNkMWYxN2NhMzZmOTA1OWRhYzY5ZWEzNGQ3NGMxZmRlYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWJjNzJlODk1Y2FlOWViN2E5ZGM5NmU3N2UzZTlhMjc0MzVhODc5NDZlZDA0
-    NDUwNmFjMWU1ODJlN2M1ZDg3OTQxZDY1Y2UzNTZjOWJlNmQzNTU2YmE5YWMx
-    MzIwYmEzMjRiZTcxZWFlODBjYTIyMTk5ZmRiOTY2MzA2ZWZjN2Q=
+    YTI3ZTkwOWFlYWNhYTdkMTMyMWRlNDlmNGE5N2RmNmE3NjNmYzc1NmZmYWVi
+    NThlNjU1NWFkOGZkYzZlYjEyOTE0YjkyZDVkNDFhYzlkNWRhZTU2ZDFhNzVl
+    NzU2MTI5ZjIxNjA3M2ViNTYxNzBjZGQyODQyZTY5MTA3NGI0MTA=
   data.tar.gz: !binary |-
-    YmQ4YjJjNzU2ODY3Yzg1ZjNkN2ViMDg4M2MyY2RhODkxMjkxMWM3N2RiMzA2
-    NDNiODQzMGU0MmU5NmMzYTJhOTcyMTFmMDhhMDUzMmNhNzc5YjcyNTgzZGI5
-    MTU2YzQxM2RlMWE0YTViNDYwZDdkMGI1OTBlNTBlN2UzODlmZGY=
+    ZThlOTFiNDQyZjM0YTVkYTc2MzIzYmI3ZjI1NzU4MDJmZGZiZmE1MGQyOWM5
+    Y2QxNDBhNjdkOTc5MzYxYzMwMjE3MzFkOGZkYTMzODQ0MTk3ZWM1OThkZDI5
+    ZWQyN2ZiZjJmYjBkMmEwZWJlMzNhMTk5MTEwN2MxYmRkNTQ5MWU=

data/lib/cyrax/extensions/has_response.rb

@@ -8,14 +8,6 @@ module Cyrax::Extensions
       not_allowed: 403
     }
 
-    def add_error(key, value = nil)
-      if value.blank?
-        raise "Use key-value syntax for adding errors"
-      end
-      @_errors ||= {}
-      @_errors[key.to_sym] = value
-    end
-
     def assign_resource(resource_name, resource, options = {})
       if options[:decorator]
         resource = Cyrax::Presenter.present(resource, options)
@@ -29,19 +21,31 @@ module Cyrax::Extensions
       @_assignments[resource_name]
     end
 
+    def add_error(key, value = nil)
+      if value.blank?
+        raise "Use key-value syntax for adding errors"
+      end
+      @_errors ||= {}
+      @_errors[key.to_sym] = value
+    end
+
     def add_error_unless(key, value, condition)
       add_error(key, value) unless condition
     end
 
-    def add_errors_from(model)
+    def sync_errors_with(model)
+      model = model.to_model if model.respond_to?(:to_model)
       if model && model.errors.messages.present?
+        (@_errors || {}).each do |key, value|
+          model.errors.add key, value unless model.errors.include?(key)
+        end
         model.errors.messages.each do |key, value|
           add_error key, value
         end
       end
     end
 
-    def add_errors_from?(model)
+    def sync_errors_with?(model)
       model = model.to_model if model.respond_to?(:to_model)
       model && model.respond_to?(:errors) &&
       model.errors.respond_to?(:messages)
@@ -78,8 +82,8 @@ module Cyrax::Extensions
       options[:as] ||= accessor
       name = options[:name] || response_name
       result = result.result.to_model if result.is_a?(Cyrax::Response)
-      if add_errors_from?(result)
-        add_errors_from(result)
+      if sync_errors_with?(result)
+        sync_errors_with(result)
       end
       if respond_to?(:decorable?) && decorable?
         options = {decorator: decorator_class}.merge(options)

data/lib/cyrax/extensions/has_service.rb

@@ -39,7 +39,7 @@ module Cyrax::Extensions
     # Used for :show action in controller
     # @return [Cyrax::Response] response
     def read(&block)
-      resource = find_resource(params[:id])
+      resource = find_resource(resource_params_id)
       block.call(resource) if block_given?
       respond_with resource
     end
@@ -51,7 +51,7 @@ module Cyrax::Extensions
     # Used for :update action in controller
     # @return [Cyrax::Response] response
     def update(custom_attributes = nil, &block)
-      resource = build_resource(params[:id], custom_attributes||resource_attributes)
+      resource = build_resource(resource_params_id, custom_attributes||resource_attributes)
       transaction do
         if save_resource(resource)
           set_message(:updated)
@@ -66,7 +66,7 @@ module Cyrax::Extensions
     # Used for :destroy action in controller
     # @return [Cyrax::Response] response
     def destroy(&block)
-      resource = find_resource(params[:id])
+      resource = find_resource(resource_params_id)
       transaction do
         delete_resource(resource)
         block.call(resource) if block_given?
@@ -128,5 +128,9 @@ module Cyrax::Extensions
         block.call
       end
     end
+
+    def resource_params_id
+      params[:id]
+    end
   end
 end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.5.1.beta4"
+  VERSION = "0.5.1.beta5"
 end

data/spec/cyrax/extensions/has_response_spec.rb

@@ -38,13 +38,13 @@ module Cyrax
       end
     end
 
-    describe '#add_errors_from' do
+    describe '#sync_errors_with' do
       let(:messages) { [[:foo, 'bar'], [:bar, 'bazz']]}
       let(:errors) { double(messages: messages)}
       let(:model) { double(errors: errors) }
 
       it 'should add errors from model error messages' do
-        subject.add_errors_from(model)
+        subject.sync_errors_with(model)
         subject.instance_variable_get(:@_errors).should eq({foo: 'bar', bar: 'bazz'})
       end
     end

data/spec/cyrax/resource_spec.rb

@@ -20,7 +20,7 @@ module Cyrax
         it{ should respond_to(:set_message) }
         it{ should respond_to(:add_error) }
         it{ should respond_to(:add_error_unless) }
-        it{ should respond_to(:add_errors_from) }
+        it{ should respond_to(:sync_errors_with) }
       end
     end
 
@@ -99,8 +99,8 @@ module Cyrax
       context 'when resource could not be saved' do
         before { resource.stub(:save).and_return(false) }
 
-        it 'sets error messages' do
-          subject.should_receive(:add_errors_from).with(resource)
+        it 'does not set message' do
+          subject.should_not_receive(:set_message).with(:created)
           subject.create(params)
         end
       end
@@ -127,9 +127,9 @@ module Cyrax
       context 'when resource could not be saved' do
         before { resource.stub(:save).and_return(false) }
 
-        it 'sets error messages' do
-          subject.should_receive(:add_errors_from).with(resource)
-          subject.update(params)
+        it 'does not set message' do
+          subject.should_not_receive(:set_message).with(:created)
+          subject.create(params)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.5.1.beta4
+  version: 0.5.1.beta5
 platform: ruby
 authors:
 - Droidlabs