cyrax 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk1OTdiMmRiYzdhNzMyNzY4MzAxYWUxZjllODEwNDE4NjI2ZGJjZQ==
+    NTlmMTE4OTYxZTNlOGJjZWE5ZmY0NjNjNjZlNDRkZDY0YmFkZDY0ZA==
   data.tar.gz: !binary |-
-    ZTE5ZWJiMDhlYzFkZWFjMzcxNDE5MTBiNzY4MDI1MzRkOGU5OTg4Nw==
+    ODY3YmYxMWQ5NDY4NjAyNzRjYTdjM2Q4ZmFmZGU3YWQzODg1ZmRlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmJkMjBkNDQ3ZTQyNWJiNGZmNTc2ZmU2YjhiZjJkYjRjNTk2ZTc2NDNkY2Q2
-    YmU2ODI5MjMwMjFjYmI1NzUwMTIzZjhlNDQyNWJmY2FmN2EwMWMwMGRiZjQ2
-    MjhiNGZlZGVhNDlkOWE4YzRiOGNjMDg0NzMyOGExODNjNGFjOWM=
+    YzE5OGIzYzkxNGMzYTEzNmJjY2IxMWRiOTNlNWJiODdkOGFmZTYzYzFhZmQx
+    YmZjNTVlOTk3MzBkOTE4NTJjNmZhNGE4NzRhZDhhNzdiMTNmNjcwNGU4ZGU4
+    OWE3NmE3NmYxMTc3ZmNiMDhiOWZmZWZlZTNiZTI1NjE4NTk4Yjk=
   data.tar.gz: !binary |-
-    MTUzNTE1MDZjNTJlMDQ0NGM4NDY4OGU5YzA5MWQyNzlmOTkzZDlmZWZjNjI2
-    OWIwNDM3YTM0ZDcwZmUzYWY4NzhlOTBhYjNhY2ZhZTljMDc1YmJiYmE5MGM5
-    NzcyMGFlMjkwY2QzNmFmOWM0ZTNhZDUzMTJkZDAxMzllYmMzNDI=
+    ZGQ1MDhkZmFhZDJiN2FjYTQ0OWM0MDRjYzUzMmI1ZmFiZjViMzRiNzUxMTA1
+    OTYwNDI4NGJkYWNjMDQzMTYyZGRjODUxY2I0ZWYzMjcwYTVkZDk0YjBiN2I3
+    ODI4ZmUxMzk2NTEzYzQ5Njc5ZGEzZDJlMzQwYmY1NmFmZDdlMTQ=

data/lib/cyrax/base.rb

@@ -17,7 +17,16 @@ class Cyrax::Base
   #     Products::UserResource.new(as: current_user, params: params)
   def initialize(options = {})
     @accessor = options[:as]
-    @params = options[:params]
+    @params = wrap_params(options[:params])
     @options = options
   end
+
+  def wrap_params(params)
+    if Cyrax.strong_parameters && defined?(ActionController) &&
+      !params.is_a?(ActionController::Parameters)
+      ActionController::Parameters.new(params)
+    else
+      params
+    end
+  end
 end

data/lib/cyrax/extensions/has_response.rb

@@ -1,10 +1,19 @@
 module Cyrax::Extensions
   module HasResponse
     extend ActiveSupport::Concern
+    STATUS_VALUES = {
+      created: 201,
+      no_content: 204,
+      bad_request: 400,
+      not_allowed: 403
+    }
 
-    def add_error(error)
-      @_errors ||= []
-      @_errors << error
+    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 = {})
@@ -15,23 +24,39 @@ module Cyrax::Extensions
       @_assignments[resource_name.to_sym] = resource
     end
 
-    def add_error_unless(error, condition)
-      add_error(error) unless condition
+    def add_error_unless(key, value, condition)
+      add_error(key, value) unless condition
     end
 
     def add_errors_from(model)
-      @_errors ||= []
       if model && model.errors.messages.present?
         model.errors.messages.each do |key, value|
-          add_error "#{key}: #{value}"
+          add_error key, value
         end
       end
     end
 
+    def add_errors_from?(model)
+      model = model.to_model if model.respond_to?(:to_model)
+      model && model.respond_to?(:errors) && 
+      model.errors.respond_to?(:messages)
+    end
+
+    def reset_errors
+      @_errors = {}
+    end
+
     def set_message(message)
       @_message = message
     end
 
+    def set_status(status)
+      if status.is_a?(Symbol)
+        status = STATUS_VALUES[status]
+      end
+      @_status = status
+    end
+
     def response_name
       self.class.name.demodulize.underscore
     end
@@ -43,6 +68,9 @@ 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)
+      end
       if respond_to?(:decorable?) && decorable?
         options = {decorator: decorator_class}.merge(options)
       end
@@ -54,6 +82,7 @@ module Cyrax::Extensions
       response.message = @_message
       response.errors = @_errors
       response.assignments = @_assignments
+      response.status = @_status
       response
     end
   end

data/lib/cyrax/extensions/has_service.rb

@@ -26,15 +26,9 @@ module Cyrax::Extensions
     def create(custom_attributes = nil, &block)
       resource = build_resource(nil, custom_attributes||resource_attributes)
       transaction do
-        invoke_callback(:before_create, resource)
-        invoke_callback(:before_save, resource)
         if save_resource(resource)
-          invoke_callback(:after_create, resource)
-          invoke_callback(:after_save, resource)
           set_message("#{resource_name.titleize} successfully created")
           block.call(resource) if block_given?
-        else
-          add_errors_from(resource)
         end
       end
       respond_with(resource)
@@ -59,15 +53,9 @@ module Cyrax::Extensions
     def update(custom_attributes = nil, &block)
       resource = build_resource(params[:id], custom_attributes||resource_attributes)
       transaction do
-        invoke_callback(:before_update, resource)
-        invoke_callback(:before_save, resource)
         if save_resource(resource)
-          invoke_callback(:after_update, resource)
-          invoke_callback(:after_save, resource)
           set_message("#{resource_name.titleize} successfully updated")
           block.call(resource) if block_given?
-        else
-          add_errors_from(resource)
         end
       end
       respond_with(resource)
@@ -80,9 +68,7 @@ module Cyrax::Extensions
     def destroy(&block)
       resource = find_resource(params[:id])
       transaction do
-        invoke_callback(:before_destroy, resource)
         delete_resource(resource)
-        invoke_callback(:after_destroy, resource)
         block.call(resource) if block_given?
       end
       respond_with(resource)

data/lib/cyrax/helpers/controller.rb

@@ -7,23 +7,21 @@ module Cyrax::ControllerHelper
         error: response.error
       }.merge(options || {})
 
-      set_resource_from(response)
-      
-      # set flashes
-      flash[:notice] = options[:notice] if options[:notice].present?
-      flash[:error] = options[:error] if options[:error].present?
+      # override status if needed
+      options[:status] = response.status if response.status
 
       # convert result to model if possible
       result = response.result
       result = result.to_model if result.respond_to?(:to_model)
 
+      # set flashes
+      flash[:notice] = options[:notice] if options[:notice].present?
+      flash[:error] = options[:error] if options[:error].present?
+      set_resource_from(response)
+
       super(result, options) do |format|
         format.json do
-          if result.respond_to?(:errors) && result.errors.present?
-            render json: { errors: result.errors }
-          else
-            render json: response.as_json
-          end
+          render json: response.as_json
         end
       end
     else

data/lib/cyrax/resource.rb

@@ -1,6 +1,5 @@
 class Cyrax::Resource < Cyrax::Base
   include Cyrax::Extensions::HasResource
-  include Cyrax::Extensions::HasCallbacks
   include Cyrax::Extensions::HasService
   include Cyrax::Extensions::HasDecorator
   include Cyrax::Extensions::HasSerializer

data/lib/cyrax/response.rb

@@ -1,5 +1,5 @@
 class Cyrax::Response
-  attr_accessor :message, :errors, :assignments, 
+  attr_accessor :message, :errors, :status, :assignments, 
     :result, :resource_name, :options
 
   def initialize(resource_name, result, options = {})
@@ -7,8 +7,9 @@ class Cyrax::Response
     @result = result
     @options = options
     @message = nil
-    @errors = []
+    @errors = {}
     @assignments = {}
+    @status = nil
   end
 
   def with_errors(errors)
@@ -33,16 +34,24 @@ class Cyrax::Response
     message if success?
   end
 
+  def error_messages
+    errors.map do |key, value|
+      "#{key}: #{value}"
+    end
+  end
+
   def error
-    message || errors.first if failure?
+    message || error_messages.first if failure?
   end
 
   def has_error?(error)
-    errors && errors.include?(error)
+    errors && errors.has_key?(error)
   end
 
   def as_json(*args)
-    if options[:serializer]
+    if failure?
+      {errors: @errors}
+    elsif options[:serializer]
       options[:serializer].new(result).serialize
     else
       result.as_json

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/cyrax.rb

@@ -1,7 +1,8 @@
+require 'active_support/core_ext/object'
+require 'active_support/core_ext/class'
 require "cyrax/version"
 require "cyrax/extensions/has_resource.rb"
 require "cyrax/extensions/has_response.rb"
-require "cyrax/extensions/has_callbacks.rb"
 require "cyrax/extensions/has_service.rb"
 require "cyrax/extensions/has_decorator.rb"
 require "cyrax/extensions/has_serializer.rb"
@@ -14,7 +15,6 @@ require "cyrax/resource.rb"
 require "cyrax/wrapper.rb"
 require "cyrax/presenter.rb"
 require "cyrax/response.rb"
-require "cyrax/callbacks.rb"
 require "cyrax/decorator.rb"
 require "cyrax/serializer.rb"
 
@@ -28,17 +28,4 @@ module Cyrax
   def self.strong_parameters=(value)
     @@strong_parameters = value
   end
-
-  def self.const_missing(const_name)
-    case const_name
-    when :BaseResource
-      warn "`Cyrax::BaseResource` has been deprecated. Use `Cyrax::Resource` instead."
-      Cyrax::Resource
-    when :DecoratedCollectionPresenter
-      warn "`Cyrax:DecoratedCollectionPresenter` has been deprecated. Use `Cyrax::Presenters::DecoratedCollection` instead."
-      Cyrax::Presenters::DecoratedCollection
-    else
-      super
-    end
-  end
 end

data/spec/cyrax/extensions/has_response_spec.rb

@@ -21,19 +21,19 @@ module Cyrax
 
     describe '#add_error' do
       it 'should add error' do
-        subject.add_error('foo')
-        subject.instance_variable_get(:@_errors).should include('foo')
+        subject.add_error(:foo, 'bar')
+        subject.instance_variable_get(:@_errors).has_key?(:foo).should be_true
       end
     end
 
     describe '#add_error_unless' do
       it 'should add error when condition false' do
-        subject.add_error_unless('foo', 1==0)
-        subject.instance_variable_get(:@_errors).should include('foo')
+        subject.add_error_unless(:foo, 'bar', 1==0)
+        subject.instance_variable_get(:@_errors).has_key?(:foo).should be_true
       end
 
       it 'should not add error when condition true' do
-        subject.add_error_unless('foo', 1==1)
+        subject.add_error_unless(:foo, 'bar', 1==1)
         subject.instance_variable_get(:@_errors).should be_nil
       end
     end
@@ -45,7 +45,7 @@ module Cyrax
 
       it 'should add errors from model error messages' do
         subject.add_errors_from(model)
-        subject.instance_variable_get(:@_errors).should eq(['foo: bar', 'bar: bazz'])
+        subject.instance_variable_get(:@_errors).should eq({foo: 'bar', bar: 'bazz'})
       end
     end
 
@@ -73,6 +73,7 @@ module Cyrax
         response.should_receive(:message=)
         response.should_receive(:errors=)
         response.should_receive(:assignments=)
+        response.should_receive(:status=)
         subject.respond_with('bar')
       end
     end

data/spec/cyrax/resource_spec.rb

@@ -21,7 +21,6 @@ module Cyrax
         it{ should respond_to(:add_error) }
         it{ should respond_to(:add_error_unless) }
         it{ should respond_to(:add_errors_from) }
-        it{ should respond_to(:invoke_callback) }
       end
     end
 
@@ -77,12 +76,6 @@ module Cyrax
         resource.should_receive(:destroy)
         subject.destroy
       end
-
-      it 'invokes callbacks' do
-        subject.should_receive(:invoke_callback).with(:before_destroy, resource)
-        subject.should_receive(:invoke_callback).with(:after_destroy, resource)
-        subject.destroy
-      end
     end
 
     describe '#create' do
@@ -97,14 +90,6 @@ module Cyrax
       context 'when resource successfully saved' do
         before { resource.stub(:save).and_return(true) }
 
-        it 'invokes callbacks' do
-          subject.should_receive(:invoke_callback).with(:before_save, resource)
-          subject.should_receive(:invoke_callback).with(:before_create, resource)
-          subject.should_receive(:invoke_callback).with(:after_save, resource)
-          subject.should_receive(:invoke_callback).with(:after_create, resource)
-          subject.create(params)
-        end
-
         it 'sets message' do
           subject.should_receive(:set_message).with('Foo successfully created')
           subject.create(params)
@@ -114,14 +99,6 @@ module Cyrax
       context 'when resource could not be saved' do
         before { resource.stub(:save).and_return(false) }
 
-        it 'invokes callbacks' do
-          subject.should_receive(:invoke_callback).with(:before_save, resource)
-          subject.should_receive(:invoke_callback).with(:before_create, resource)
-          subject.should_not_receive(:invoke_callback).with(:after_save, resource)
-          subject.should_not_receive(:invoke_callback).with(:after_create, resource)
-          subject.create(params)
-        end
-
         it 'sets error messages' do
           subject.should_receive(:add_errors_from).with(resource)
           subject.create(params)
@@ -141,14 +118,6 @@ module Cyrax
       context 'when resource successfully saved' do
         before { resource.stub(:save).and_return(true) }
 
-        it 'invokes callbacks' do
-          subject.should_receive(:invoke_callback).with(:before_save, resource)
-          subject.should_receive(:invoke_callback).with(:before_update, resource)
-          subject.should_receive(:invoke_callback).with(:after_save, resource)
-          subject.should_receive(:invoke_callback).with(:after_update, resource)
-          subject.update(params)
-        end
-
         it 'sets message' do
           subject.should_receive(:set_message).with('Foo successfully updated')
           subject.update(params)
@@ -158,14 +127,6 @@ module Cyrax
       context 'when resource could not be saved' do
         before { resource.stub(:save).and_return(false) }
 
-        it 'invokes callbacks' do
-          subject.should_receive(:invoke_callback).with(:before_save, resource)
-          subject.should_receive(:invoke_callback).with(:before_update, resource)
-          subject.should_not_receive(:invoke_callback).with(:after_save, resource)
-          subject.should_not_receive(:invoke_callback).with(:after_update, resource)
-          subject.update(params)
-        end
-
         it 'sets error messages' do
           subject.should_receive(:add_errors_from).with(resource)
           subject.update(params)

data/spec/cyrax/response_spec.rb

@@ -12,27 +12,27 @@ module Cyrax
     end
 
     describe '#with_errors' do
-      before { subject.with_errors(['some', 'errors']) }
+      before { subject.with_errors({foo: 'some', bar: 'errors'}) }
       it { should be_kind_of(Cyrax::Response) }
       its(:errors) { should be }
-      its(:errors) { should eq(['some', 'errors']) }
+      its(:errors) { should eq({foo: 'some', bar: 'errors'}) }
     end
 
     describe '#success?' do
       context 'when there are no errors' do
-        before { subject.with_errors([]) }
+        before { subject.with_errors({}) }
         its(:success?) { should be_true }
       end
 
       context 'when there are errors' do
-        before { subject.with_errors(['some', 'errors']) }
+        before { subject.with_errors({foo: 'some', bar: 'errors'}) }
         its(:success?) { should be_false }
       end
     end
 
     describe '#failure?' do
       context 'when there are no errors' do
-        before { subject.with_errors([]) }
+        before { subject.with_errors({}) }
         its(:failure?) { should be_false }
       end
 
@@ -51,7 +51,7 @@ module Cyrax
       end
 
       context 'when there are errors' do
-        before { subject.with_errors(['some', 'errors']) }
+        before { subject.with_errors({foo: 'some', bar: 'errors'}) }
         its(:notice) { should be_nil }
       end
     end
@@ -63,13 +63,13 @@ module Cyrax
       end
 
       context 'when there are errors' do
-        before { subject.with_errors(['some', 'message']) }
+        before { subject.with_errors({foo: 'some', bar: 'errors'}) }
         its(:error) { should be }
-        its(:error) { should eq('some') }
+        its(:error) { should eq('foo: some') }
       end
 
       context 'when message is present' do
-        before { subject.with_message('some message').with_errors(['some', 'message']) }
+        before { subject.with_message('some message').with_errors({foo: 'some', bar: 'errors'}) }
         its(:error) { should be }
         its(:error) { should eq('some message') }
       end
@@ -77,14 +77,14 @@ module Cyrax
 
     describe '#has_error?' do
       context 'when there are no errors' do
-        before { subject.with_errors([]) }
-        specify { subject.has_error?('foo').should be_false }
+        before { subject.with_errors({}) }
+        specify { subject.has_error?(:foo).should be_false }
       end
 
       context 'when there are errors' do
-        before { subject.with_errors(['some', 'message']) }
-        specify { subject.has_error?('some').should be_true }
-        specify { subject.has_error?('foo').should be_false }
+        before { subject.with_errors({foo: 'some', bar: 'errors'}) }
+        specify { subject.has_error?(:foo).should be_true }
+        specify { subject.has_error?(:foo1).should be_false }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Droidlabs
@@ -87,9 +87,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cyrax/base.rb
-- lib/cyrax/callbacks.rb
 - lib/cyrax/decorator.rb
-- lib/cyrax/extensions/has_callbacks.rb
 - lib/cyrax/extensions/has_decorator.rb
 - lib/cyrax/extensions/has_resource.rb
 - lib/cyrax/extensions/has_response.rb
@@ -110,9 +108,7 @@ files:
 - Rakefile
 - README.md
 - spec/cyrax/base_spec.rb
-- spec/cyrax/callbacks_spec.rb
 - spec/cyrax/decorator_spec.rb
-- spec/cyrax/extensions/has_callbacks_spec.rb
 - spec/cyrax/extensions/has_decorator_spec.rb
 - spec/cyrax/extensions/has_resource_spec.rb
 - spec/cyrax/extensions/has_response_spec.rb
@@ -147,9 +143,7 @@ specification_version: 4
 summary: Small library for adding service layer to Rails projects
 test_files:
 - spec/cyrax/base_spec.rb
-- spec/cyrax/callbacks_spec.rb
 - spec/cyrax/decorator_spec.rb
-- spec/cyrax/extensions/has_callbacks_spec.rb
 - spec/cyrax/extensions/has_decorator_spec.rb
 - spec/cyrax/extensions/has_resource_spec.rb
 - spec/cyrax/extensions/has_response_spec.rb

data/lib/cyrax/callbacks.rb

@@ -1,17 +0,0 @@
-class Cyrax::Callbacks
-  attr_accessor :resource
-
-  def initialize(resource)
-    @resource = resource
-  end
-
-  def before_save;    end
-  def before_create;  end
-  def before_update;  end
-  def before_destroy; end
-
-  def after_save;    end
-  def after_create;  end
-  def after_update;  end
-  def after_destroy; end
-end

data/lib/cyrax/extensions/has_callbacks.rb

@@ -1,26 +0,0 @@
-require 'active_support/core_ext/object'
-require 'active_support/core_ext/class'
-require 'active_support/deprecation'
-
-module Cyrax::Extensions
-  module HasCallbacks
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :resource_callbacks_handler_class
-    end
-
-    def invoke_callback(name, resource)
-      if resource_callbacks_handler_class
-        resource_callbacks_handler_class.new(resource).send(name)
-      end
-    end
-
-    module ClassMethods
-      def callbacks_handler(name, options = {})
-        ActiveSupport::Deprecation.warn "#callbacks_handler is deprecated. Redefine method and use short alias instead"
-        self.resource_callbacks_handler_class = name
-      end
-    end
-  end
-end

data/spec/cyrax/callbacks_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-module Cyrax
-  describe Callbacks do
-    subject { Cyrax::Callbacks.new(double) }
-
-    it { should respond_to(:before_create) }
-    it { should respond_to(:after_create) }
-
-    it { should respond_to(:before_save) }
-    it { should respond_to(:after_save) }
-
-    it { should respond_to(:before_update) }
-    it { should respond_to(:after_update) }
-
-    it { should respond_to(:before_destroy) }
-    it { should respond_to(:after_destroy) }
-  end
-end

data/spec/cyrax/extensions/has_callbacks_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-module Cyrax
-  class BaseWithCallbacks < Cyrax::Base
-    include Cyrax::Extensions::HasCallbacks
-  end
-
-  describe Cyrax::Extensions::HasCallbacks do
-    subject { BaseWithCallbacks.new }
-
-    describe '#invoke_callback' do
-      context 'when callback handler class is not defined' do
-        let(:name) { double }
-        let(:resource) { double }
-        before { subject.class.stub(:resource_callbacks_handler_class) }
-        it { subject.invoke_callback(name, resource).should be_nil }
-      end
-
-      context 'when callback handler class is defined' do
-        let(:name) { "foo" }
-        let(:resource) { double }
-        let(:handle_class) { double.as_null_object }
-        before { subject.class.stub(:resource_callbacks_handler_class).and_return(handle_class) }
-
-        it 'initializes handle class instance' do
-          handle_class.should_receive(:new).with(resource)
-          subject.invoke_callback(name, resource)
-        end
-
-        it 'calls corresponding method on instance' do
-          instance = double.as_null_object
-          handle_class.stub(:new).and_return(instance)
-          instance.should_receive(:foo)
-          subject.invoke_callback(name, resource)
-        end
-      end
-    end
-
-    describe '#callbacks_handler' do
-      it 'should define callbacks handler class' do
-        subject.class.callbacks_handler('Foo')
-        subject.class.resource_callbacks_handler_class.should eq('Foo')
-      end
-    end
-  end
-end