cyrax 0.7.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eff1fd9535d9a82b63c71132ec9040edddb69288
-  data.tar.gz: f377af1ac353f61b1119c071cfb8c5e421667dd4
+SHA256:
+  metadata.gz: 468b7482d42c779907d5f69afd25057120a2f9f3a88d5701dda02e14e2789fc5
+  data.tar.gz: 3f42ca73dda52d2dbfcaebfd067aeb8b151fe8eb8e34e65f238b7d8ff17565bb
 SHA512:
-  metadata.gz: 83123a1f12c82ca5d7cfaf0601ed58cc8fc43e31b9f690f649d10579db146ef742bbc73bc7b55f6386e46ee92593b676897c30013d9f617096fda3fa57c11711
-  data.tar.gz: f666cfddc2d0e38c72132b4a5390c076f8b2510f0cf484a909640e195a80acb2b575dac3b13b5eec6c7c294af382efdf4af68b87cd0bb491110751a35328a881
+  metadata.gz: 815a0c1ab08bd9d714c4003b8be967a2ad6c506fb95726b87111f8fdda29d0197589b6f75a881e9aa1def6c28c5b87f4a39bfc888725f6afc82e9d33741f7547
+  data.tar.gz: c64d11365bd3a6534a6ec338e64005a7dc74a3c8295685ba1699f3702b01ac20042f20ef39dce75b0850c1f2d8ccb580466e0fd5bec8ac4ca1c0886b74a5c3b7

data/README.md

@@ -6,13 +6,13 @@ Cyrax is microframework to build layered architecture, one of the core concepts
 
 Add this line to your Gemfile.
 
-Rails 4:
+Rails 5:
 
-    gem 'cyrax', '~> 0.7.6'
+    gem 'cyrax', '~> 0.9.0'
 
-Rails 3:
+Rails 4:
 
-    gem 'cyrax', '~> 0.3.8'
+    gem 'cyrax', '~> 0.5.0'
 
 ## Usage
 

data/lib/cyrax/decorator.rb

@@ -1,4 +1,6 @@
 require 'active_model'
+require 'active_model/serializers/xml'
+
 class Cyrax::Decorator < Cyrax::Wrapper
   include ActiveModel::Serialization
   include ActiveModel::Serializers::JSON
@@ -31,5 +33,18 @@ class Cyrax::Decorator < Cyrax::Wrapper
     def decorate_collection(resource)
       Cyrax::Presenters::DecoratedCollection.decorate(resource, decorator: self)
     end
+
+    def respond_to?(method_sym, include_private = false)
+      super || @@decorated_class.respond_to?(method_sym, include_private)
+    end
+
+    def method_missing(method, *args, &block)
+      return super unless @@decorated_class.respond_to?(method)
+      @@decorated_class.send(method, *args, &block)
+    end
+
+    def decorated_class(klass)
+      @@decorated_class = klass
+    end
   end
 end

data/lib/cyrax/extensions/has_decorator.rb

@@ -3,24 +3,24 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :_decorator_class
+      class_attribute :decorator_class_name
+    end
+
+    def decorator_class_name
+      options[:decorator] || self.class.decorator_class_name
     end
 
     def decorable?
-      !decorator_class.nil?
+      !decorator_class_name.nil?
     end
 
     def decorator_class
-      options[:decorator] || self.class._decorator_class
+      decorator_class_name.to_s.classify.constantize
     end
 
     module ClassMethods
-      def decorator(klass)
-        if klass.is_a?(String)
-          ActiveSupport::Deprecation.warn "sending String in #decorator method is deprecated. send Class instead"
-          klass = klass.constantize
-        end
-        self._decorator_class = klass
+      def decorator(name)
+        self.decorator_class_name = name ? name.to_s : nil
       end
     end
   end

data/lib/cyrax/extensions/has_resource.rb

@@ -4,28 +4,41 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :_resource_name
-      class_attribute :_collection_name
-      class_attribute :_resource_class
-    end
-
-    def resource_name
-      self.class._resource_name
-    end
-
-    def collection_name
-      self.class._collection_name
+      class_attribute :resource_name
+      class_attribute :resource_class_name
+      class_attribute :collection_name
     end
 
     # Returns the resource class as a constant - e.g. Product
     def resource_class
-      self.class._resource_class || resource_name.classify.constantize
+      if self.resource_class_name
+        self.resource_class_name.constantize
+      else
+        resource_name.classify.constantize
+      end
+    end
+
+    # Returns the resource class - e.g. Product
+    # If you want your resource to return something interesting, you should override this in your resource by defining the method and returning your own scope
+    #
+    # @example Overriding resource_scope
+    #   class Products::UserResource < Products::BaseResource
+    #     def resource_scope
+    #       accessor.products
+    #     end
+    #   end
+    def resource_scope
+      resource_class
     end
 
     def resource_attributes
       filter_attributes(dirty_resource_attributes)
     end
 
+    def response_name
+      resource_name
+    end
+
     module ClassMethods
 
       # Class method for setting all the attributes that you want to access in the resource
@@ -51,21 +64,13 @@ module Cyrax::Extensions
       # @param name [Symbol] The name of the resource
       # @param options Hash [Hash] Options
       def resource(name, options = {})
-        if options[:class_name].present?
-          ActiveSupport::Deprecation.warn "sending :class_name in #resource method is deprecated. send :class instead"
-          options[:class] = options[:class_name].to_s.constantize
-        end
-        self._resource_name = name.to_s
-        self._resource_class = options[:class]
-        self._collection_name = name.to_s.pluralize
+        self.resource_name = name.to_s
+        self.resource_class_name = options[:class_name]
+        self.collection_name = name.to_s.pluralize
       end
     end
 
     private
-      def response_name
-        resource_name
-      end
-
       def dirty_resource_attributes
         if Cyrax.strong_parameters
           params.require(resource_name)
@@ -74,6 +79,10 @@ module Cyrax::Extensions
         end
       end
 
+      def default_resource_attributes
+        {}
+      end
+
       def filter_attributes(attributes)
         if Cyrax.strong_parameters
           attributes.permit(self.class.accessible_attributes)

data/lib/cyrax/extensions/has_serializer.rb

@@ -3,24 +3,24 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :_serializer_class
+      class_attribute :serializer_class_name
+    end
+
+    def serializer_class_name
+      options[:serializer] || self.class.serializer_class_name
     end
 
     def serializable?
-      !serializer_class.nil?
+      !serializer_class_name.nil?
     end
 
     def serializer_class
-      options[:serializer] || self.class._serializer_class
+      serializer_class_name.to_s.classify.constantize
     end
 
     module ClassMethods
-      def serializer(klass)
-        if klass.is_a?(String)
-          ActiveSupport::Deprecation.warn "sending String in #serializer method is deprecated. send Class instead"
-          klass = klass.constantize
-        end
-        self._serializer_class = klass
+      def serializer(name)
+        self.serializer_class_name = name ? name.to_s : nil
       end
     end
   end

data/lib/cyrax/extensions/has_service.rb

@@ -1,15 +1,17 @@
 module Cyrax::Extensions
   module HasService
+    VALIDATION_ERROR_STATUS = 422
     extend ActiveSupport::Concern
 
     # Builds and returns a collection response for Rails
     # @return [Cyrax::Response] response
     def read_all(&block)
       authorize_resource!(:read_all, resource_class)
-      collection = repository.find_all
+      collection = build_collection
       block.call(collection) if block_given?
       respond_with collection, name: collection_name, present: :collection
     end
+    # Overrides collection with read_all
     alias_method :read_all!, :read_all
 
     # Builds a new resource without saving to DB
@@ -17,7 +19,7 @@ module Cyrax::Extensions
     # Used for :new action in controller
     # @return [Cyrax::Response] response
     def build(&block)
-      resource = repository.build(nil)
+      resource = build_resource(nil)
       authorize_resource!(:build, resource)
       block.call(resource) if block_given?
       respond_with resource
@@ -28,14 +30,14 @@ module Cyrax::Extensions
     # Used for :create action in controller
     # @return [Cyrax::Response] response
     def create(custom_attributes = nil, &block)
-      resource = repository.build(nil)
-      old_resource = resource.dup
-      set_resource_attributes(resource, custom_attributes||resource_attributes)
+      resource = build_resource(nil, custom_attributes||resource_attributes)
       authorize_resource!(:create, resource)
       transaction do
-        if repository.save(resource)
+        if save_resource(resource)
           set_message(:created)
-          block.call(resource, old_resource) if block_given?
+          block.call(resource) if block_given?
+        elsif Cyrax.automatically_set_invalid_status
+          set_status VALIDATION_ERROR_STATUS
         end
       end
       respond_with(resource)
@@ -46,7 +48,7 @@ module Cyrax::Extensions
     # Used for :show action in controller
     # @return [Cyrax::Response] response
     def read(&block)
-      resource = repository.find(resource_params_id)
+      resource = find_resource(resource_params_id)
       block.call(resource) if block_given?
       respond_with resource
     end
@@ -58,14 +60,14 @@ module Cyrax::Extensions
     # Used for :update action in controller
     # @return [Cyrax::Response] response
     def update(custom_attributes = nil, &block)
-      resource = repository.build(resource_params_id)
-      old_resource = resource.dup
-      set_resource_attributes(resource, custom_attributes||resource_attributes)
+      resource = build_resource(resource_params_id, custom_attributes||resource_attributes)
       authorize_resource!(:update, resource)
       transaction do
-        if repository.save(resource)
+        if save_resource(resource)
           set_message(:updated)
-          block.call(resource, old_resource) if block_given?
+          block.call(resource) if block_given?
+        elsif Cyrax.automatically_set_invalid_status
+          set_status VALIDATION_ERROR_STATUS
         end
       end
       respond_with(resource)
@@ -76,16 +78,50 @@ module Cyrax::Extensions
     # Used for :destroy action in controller
     # @return [Cyrax::Response] response
     def destroy(&block)
-      resource = repository.find(resource_params_id)
+      resource = find_resource(resource_params_id)
       authorize_resource!(:destroy, resource)
       transaction do
-        repository.delete(resource)
+        delete_resource(resource)
         block.call(resource) if block_given?
       end
       respond_with(resource)
     end
     alias_method :destroy!, :destroy
 
+    # Finds and returns a single item from the DB
+    # @param id [int] ID of item
+    # @return [object] The object
+    def find_resource(id)
+      resource_scope.find(id)
+    end
+
+    # Instantiates the resource
+    # @param id [int] ID or nil if you want a new object
+    # @param attributes [hash] Attributes you want to add to the resource
+    # @return [object] The object
+    def build_resource(id, attributes = {})
+      if id.present?
+        resource = find_resource(id)
+        resource.attributes = attributes
+        resource
+      else
+        resource_scope.new(default_resource_attributes.merge(attributes))
+      end
+    end
+
+    # Saves a resource
+    # @param resource [object] The resource to save
+    def save_resource(resource)
+      resource.save
+    end
+
+    # Remove a resource
+    # Calls destroy method on resource
+    # @param resource [object] The resource to destroy
+    def delete_resource(resource)
+      resource.destroy
+    end
+
     # Authorize a resource
     # Should be called on each service method and should be implemented on each resource.
     # Implementation may raise an exception which may be handled by controller.
@@ -95,6 +131,16 @@ module Cyrax::Extensions
       # raise AuthorizationError
     end
 
+    # Returns a collection of the resource we are calling.
+    #
+    # If you want your resource to return something interesting, you should override the resource_scope method.
+    # Otherwise by default it will return the constantized model name and it will call .all on it during presentation.
+    #
+    # @return [type] The collection
+    def build_collection
+      resource_scope
+    end
+
     def transaction(&block)
       if defined?(ActiveRecord::Base)
         ActiveRecord::Base.transaction do
@@ -108,9 +154,5 @@ module Cyrax::Extensions
     def resource_params_id
       params[:id]
     end
-
-    def set_resource_attributes(resource, attributes = {})
-      resource.attributes = attributes
-    end
   end
 end

data/lib/cyrax/helpers/controller.rb

@@ -15,7 +15,7 @@ module Cyrax::ControllerHelper
       result = result.to_model if result.respond_to?(:to_model)
 
       respond_to do |format|
-        format.any do
+        format.html do
           # set flashes
           if response.success?
             flash[:notice] = options[:notice] if options[:notice].present?
@@ -27,7 +27,11 @@ module Cyrax::ControllerHelper
           super(result, options, &block)
         end
         format.json do
-          render json: MultiJson.dump(response.as_json)
+          render json: MultiJson.dump(response.as_json), status: options[:status] || 200
+        end
+        format.any do
+          set_resource_from(response)
+          super(response, options, &block)
         end
       end
     else

data/lib/cyrax/resource.rb

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

data/lib/cyrax/response.rb

@@ -62,7 +62,12 @@ class Cyrax::Response
   end
 
   def method_missing(method, *args, &block)
-    super unless assignments.has_key?(method)
-    assignments[method]
+    if method.to_s == resource_name
+      result
+    elsif assignments.has_key?(method)
+      assignments[method]
+    else
+      super
+    end
   end
 end

data/lib/cyrax/serializer.rb

@@ -1,7 +1,7 @@
 class Cyrax::Serializer < Cyrax::Wrapper
   def serialize
     options[:serializer] = self
-    
+
     if block = self.class.total_count_block
       serialize_wrapped(options, &block)
     else

data/lib/cyrax/serializers/scope.rb

@@ -68,14 +68,14 @@ module Cyrax::Serializers
         value = resource.send(attribute)
         result[attribute] = scope.serialize(value, options)
       end
-      @namespace_attrs.map do |attribute, scope|
-        result[attribute] = scope.serialize(resource, options)
-      end
       @assigned_attrs.map do |attribute, scope|
         assignments = options[:assignments] || {}
         value = assignments[attribute]
         result[attribute] = scope.serialize(value, options)
       end
+      @namespace_attrs.map do |attribute, scope|
+        result[attribute] = scope.serialize(resource, options)
+      end
       @attrs.map do |attribute, options|
         result[attribute] = resource.send(attribute)
       end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.7.8"
+  VERSION = "0.9.0"
 end

data/lib/cyrax.rb

@@ -6,7 +6,6 @@ require "cyrax/extensions/has_response.rb"
 require "cyrax/extensions/has_service.rb"
 require "cyrax/extensions/has_decorator.rb"
 require "cyrax/extensions/has_serializer.rb"
-require "cyrax/extensions/has_repository.rb"
 require "cyrax/presenters/base_collection.rb"
 require "cyrax/presenters/decorated_collection.rb"
 require "cyrax/serializers/scope.rb"
@@ -18,10 +17,10 @@ require "cyrax/presenter.rb"
 require "cyrax/response.rb"
 require "cyrax/decorator.rb"
 require "cyrax/serializer.rb"
-require "cyrax/repository.rb"
 
 module Cyrax
   @@strong_parameters = true
+  @@automatically_set_invalid_status = true
 
   def self.strong_parameters
     @@strong_parameters
@@ -30,4 +29,12 @@ module Cyrax
   def self.strong_parameters=(value)
     @@strong_parameters = value
   end
+
+  def self.automatically_set_invalid_status
+    @@automatically_set_invalid_status
+  end
+
+  def self.automatically_set_invalid_status=(value)
+    @@automatically_set_invalid_status = value
+  end
 end

data/spec/cyrax/extensions/has_decorator_spec.rb

@@ -20,32 +20,32 @@ module Cyrax
     subject { BaseWithDecorator.new }
 
     describe 'class attributes' do
-      its(:class) { should respond_to(:_decorator_class) }
+      its(:class) { should respond_to(:decorator_class_name) }
     end
 
     describe 'class methods' do
       describe '#decorator' do
-        before { subject.class.decorator(Foo) }
+        before { subject.class.decorator(:foo) }
 
-        its(:decorator_class) { should eq(Foo) }
+        its(:decorator_class_name) { should eq('foo') }
       end
     end
 
     describe 'instance methods' do
       describe '#decorator_class' do
-        before { subject.class.decorator(Foo) }
+        before { subject.class.decorator(:foo) }
         its(:decorator_class) { should eq(Foo) }
       end
 
       describe '#decorable?' do
         context 'when `decorator_class_name` present' do
-          before { subject.class.decorator(Foo) }
-          its(:decorable?) { should be true }
+          before { subject.class.decorator(:foo) }
+          its(:decorable?) { should be_true }
         end
 
         context 'when `decorator_class_name` empty' do
           before { subject.class.decorator(nil) }
-          its(:decorable?) { should be false }
+          its(:decorable?) { should be_false }
         end
       end
     end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -18,17 +18,16 @@ module Cyrax
     subject { BaseWithResource.new }
 
     describe 'class attributes' do
-      its(:class) { should respond_to(:_resource_name) }
-      its(:class) { should respond_to(:_collection_name) }
-      its(:class) { should respond_to(:_resource_class) }
+      its(:class) { should respond_to(:resource_name) }
+      its(:class) { should respond_to(:resource_class_name) }
     end
 
     describe 'class methods' do
       describe '#resource' do
-        before { subject.class.resource(:foo, class: Bar, name:'bazz') }
+        before { subject.class.resource(:foo, class_name:'bar', name:'bazz') }
 
         its(:resource_name) { should eq('foo') }
-        its(:resource_class) { should eq(Bar) }
+        its(:resource_class_name) { should eq('bar') }
       end
     end
 
@@ -46,7 +45,7 @@ module Cyrax
 
       describe '#resource_class' do
         context 'when `class_name` option is supplied' do
-          before { subject.class.resource(:foo, class: Bar) }
+          before { subject.class.resource(:foo, class_name:'Bar') }
           its(:resource_class) { should eq(Bar) }
         end
 
@@ -56,6 +55,11 @@ module Cyrax
         end
       end
 
+      describe '#resource_scope' do
+        before { subject.stub(:resource_class).and_return(Foo) }
+        its(:resource_scope) { should eq(Foo) }
+      end
+
       describe '#resource_attributes' do
         let(:dirty_resource_attributes) { double }
         before { subject.stub(:dirty_resource_attributes).and_return(dirty_resource_attributes)}
@@ -84,6 +88,11 @@ module Cyrax
           end
         end
       end
+      describe '#default_resource_attributes' do
+        it 'should return empty hash by default' do
+          subject.send(:default_resource_attributes).should eq({})
+        end
+      end
 
       describe '#filter_attributes' do
         it 'should return supplied attributes by default' do

data/spec/cyrax/extensions/has_response_spec.rb

@@ -22,14 +22,14 @@ module Cyrax
     describe '#add_error' do
       it 'should add error' do
         subject.add_error(:foo, 'bar')
-        subject.instance_variable_get(:@_errors).has_key?(:foo).should be true
+        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, 'bar', 1==0)
-        subject.instance_variable_get(:@_errors).has_key?(:foo).should be true
+        subject.instance_variable_get(:@_errors).has_key?(:foo).should be_true
       end
 
       it 'should not add error when condition true' do

data/spec/cyrax/extensions/has_service_spec.rb

@@ -16,5 +16,48 @@ module Cyrax
 
   describe Cyrax::Extensions::HasResource do
     subject { BaseWithService.new }
+
+    describe 'instance methods' do
+      describe '#build_collection' do
+        before { subject.stub(:resource_scope).and_return(Foo) }
+        its(:build_collection) { should eq(Foo) }
+      end
+
+      describe '#find_resource' do
+        let(:resource_scope) { double }
+        before { subject.stub(:resource_scope).and_return(resource_scope) }
+        it 'finds resource by id' do
+          allow_message_expectations_on_nil
+          resource_scope.should_receive(:find).with(123)
+          subject.find_resource(123)
+        end
+      end
+
+      describe '#build_resource' do
+        context 'when id is nil' do
+          let(:resource_scope) { double }
+          before { subject.stub(:resource_scope).and_return(resource_scope) }
+          before { subject.stub(:default_resource_attributes).and_return({}) }
+          it 'initializes new object' do
+            allow_message_expectations_on_nil
+            resource_scope.should_receive(:new).with({foo: 'bar'})
+            subject.build_resource(nil, {foo: 'bar'})
+          end
+        end
+        context 'when id is present' do
+          let(:resource) { double.as_null_object }
+          it 'finds resource' do
+            subject.should_receive(:find_resource).with(123).and_return(resource)
+            subject.build_resource(123, {foo: 'bar'})
+          end
+
+          it 'assigns provided attributes' do
+            subject.stub(:find_resource).and_return(resource)
+            resource.should_receive(:attributes=).with({foo: 'bar'})
+            subject.build_resource(123, {foo: 'bar'})
+          end
+        end
+      end
+    end
   end
 end

data/spec/cyrax/resource_spec.rb

@@ -10,7 +10,11 @@ module Cyrax
         it{ should respond_to(:params) }
         it{ should respond_to(:resource_name) }
         it{ should respond_to(:resource_class) }
+        it{ should respond_to(:resource_scope) }
         it{ should respond_to(:resource_attributes) }
+        it{ should respond_to(:build_resource) }
+        it{ should respond_to(:build_collection) }
+        it{ should respond_to(:find_resource) }
         it{ should respond_to(:assign_resource) }
         it{ should respond_to(:respond_with) }
         it{ should respond_to(:set_message) }
@@ -21,19 +25,17 @@ module Cyrax
     end
 
     subject { Cyrax::Resource.new }
-    let(:repository) { double }
     let(:resource) { double.as_null_object }
     let(:collection) { [double] }
     before do
       subject.stub(:params).and_return({id:123})
-      subject.stub(:repository).and_return(repository)
-      repository.stub(:find).and_return(resource)
+      subject.stub(:find_resource).and_return(resource)
       subject.class.send :resource, :foo
     end
 
     describe '#read_all' do
       it 'responds with decorated collection' do
-        repository.should_receive(:find_all).and_return(collection)
+        subject.should_receive(:build_collection).and_return(collection)
         subject.should_receive(:respond_with).with(collection, name: 'foos', present: :collection)
         subject.read_all
       end
@@ -41,7 +43,7 @@ module Cyrax
 
     describe '#build' do
       it 'responds with resource' do
-        repository.should_receive(:build).with(nil).and_return(resource)
+        subject.should_receive(:build_resource).with(nil).and_return(resource)
         subject.should_receive(:respond_with).with(resource)
         subject.build
       end
@@ -49,7 +51,7 @@ module Cyrax
 
     describe '#edit' do
       it 'responds with resource' do
-        repository.should_receive(:find)
+        subject.should_receive(:find_resource)
         subject.should_receive(:respond_with).with(resource)
         subject.edit
       end
@@ -57,34 +59,36 @@ module Cyrax
 
     describe '#read' do
       it 'responds with resource' do
-        repository.should_receive(:find)
+        subject.should_receive(:find_resource)
         subject.should_receive(:respond_with).with(resource)
         subject.read
       end
     end
 
     describe '#destroy' do
-      it 'destroys resource and responds with resource' do
-        repository.should_receive(:find)
-        repository.should_receive(:delete)
+      it 'responds with resource' do
+        subject.should_receive(:find_resource)
         subject.should_receive(:respond_with).with(resource)
         subject.destroy
       end
+
+      it 'destroys resource' do
+        resource.should_receive(:destroy)
+        subject.destroy
+      end
     end
 
     describe '#create' do
       let(:params) { {foo: 'bar'} }
-      before { repository.stub(:build).and_return(resource) }
+      before { subject.stub(:build_resource).and_return(resource) }
       it 'responds with resource' do
-        repository.should_receive(:save).with(resource)
-        repository.should_receive(:build).with(nil)
-        subject.should_receive(:set_resource_attributes).with(resource, params)
+        subject.should_receive(:build_resource).with(nil, params)
         subject.should_receive(:respond_with).with(resource)
         subject.create(params)
       end
 
       context 'when resource successfully saved' do
-        before { repository.stub(:save).and_return(true) }
+        before { resource.stub(:save).and_return(true) }
 
         it 'sets message' do
           subject.should_receive(:set_message).with(:created)
@@ -93,28 +97,31 @@ module Cyrax
       end
 
       context 'when resource could not be saved' do
-        before { repository.stub(:save).and_return(false) }
+        before { resource.stub(:save).and_return(false) }
 
         it 'does not set message' do
           subject.should_not_receive(:set_message).with(:created)
           subject.create(params)
         end
+
+        it "sets 422 status" do
+          subject.should_receive(:set_status).with(422)
+          subject.create(params)
+        end
       end
     end
 
     describe '#update' do
       let(:params) { {foo: 'bar'} }
-      before { repository.stub(:build).and_return(resource) }
+      before { subject.stub(:build_resource).and_return(resource) }
       it 'responds with resource' do
-        repository.should_receive(:build).with(123)
-        repository.should_receive(:save).with(resource)
-        subject.should_receive(:set_resource_attributes).with(resource, params)
+        subject.should_receive(:build_resource).with(123, params)
         subject.should_receive(:respond_with).with(resource)
         subject.update(params)
       end
 
       context 'when resource successfully saved' do
-        before { repository.stub(:save).and_return(true) }
+        before { resource.stub(:save).and_return(true) }
 
         it 'sets message' do
           subject.should_receive(:set_message).with(:updated)
@@ -123,11 +130,16 @@ module Cyrax
       end
 
       context 'when resource could not be saved' do
-        before { repository.stub(:save).and_return(false) }
+        before { resource.stub(:save).and_return(false) }
 
         it 'does not set message' do
           subject.should_not_receive(:set_message).with(:created)
-          subject.create(params)
+          subject.update(params)
+        end
+
+        it "sets 422 status" do
+          subject.should_receive(:set_status).with(422)
+          subject.update(params)
         end
       end
     end

data/spec/cyrax/response_spec.rb

@@ -21,24 +21,24 @@ module Cyrax
     describe '#success?' do
       context 'when there are no errors' do
         before { subject.with_errors({}) }
-        its(:success?) { should be true }
+        its(:success?) { should be_true }
       end
 
       context 'when there are errors' do
         before { subject.with_errors({foo: 'some', bar: 'errors'}) }
-        its(:success?) { should be false }
+        its(:success?) { should be_false }
       end
     end
 
     describe '#failure?' do
       context 'when there are no errors' do
         before { subject.with_errors({}) }
-        its(:failure?) { should be false }
+        its(:failure?) { should be_false }
       end
 
       context 'when there are errors' do
         before { subject.with_errors(['some', 'errors']) }
-        its(:failure?) { should be true }
+        its(:failure?) { should be_true }
       end
     end
 
@@ -78,13 +78,13 @@ 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 }
+        specify { subject.has_error?(:foo).should be_false }
       end
 
       context 'when there are errors' do
         before { subject.with_errors({foo: 'some', bar: 'errors'}) }
-        specify { subject.has_error?(:foo).should be true }
-        specify { subject.has_error?(:foo1).should be false }
+        specify { subject.has_error?(:foo).should be_true }
+        specify { subject.has_error?(:foo1).should be_false }
       end
     end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Droidlabs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: has_active_logger
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +98,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.99.0
 description: Small library for adding service layer to Rails projects
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -107,7 +135,6 @@ files:
 - lib/cyrax/base.rb
 - lib/cyrax/decorator.rb
 - lib/cyrax/extensions/has_decorator.rb
-- lib/cyrax/extensions/has_repository.rb
 - lib/cyrax/extensions/has_resource.rb
 - lib/cyrax/extensions/has_response.rb
 - lib/cyrax/extensions/has_serializer.rb
@@ -116,7 +143,6 @@ files:
 - lib/cyrax/presenter.rb
 - lib/cyrax/presenters/base_collection.rb
 - lib/cyrax/presenters/decorated_collection.rb
-- lib/cyrax/repository.rb
 - lib/cyrax/resource.rb
 - lib/cyrax/response.rb
 - lib/cyrax/serializer.rb
@@ -126,20 +152,18 @@ files:
 - spec/cyrax/base_spec.rb
 - spec/cyrax/decorator_spec.rb
 - spec/cyrax/extensions/has_decorator_spec.rb
-- spec/cyrax/extensions/has_repository_spec.rb
 - spec/cyrax/extensions/has_resource_spec.rb
 - spec/cyrax/extensions/has_response_spec.rb
 - spec/cyrax/extensions/has_service_spec.rb
-- spec/cyrax/repository_spec.rb
 - spec/cyrax/resource_spec.rb
 - spec/cyrax/response_spec.rb
 - spec/cyrax/serializer_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,21 +178,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Small library for adding service layer to Rails projects
 test_files:
-- spec/cyrax/base_spec.rb
-- spec/cyrax/decorator_spec.rb
+- spec/spec_helper.rb
+- spec/cyrax/resource_spec.rb
+- spec/cyrax/extensions/has_response_spec.rb
 - spec/cyrax/extensions/has_decorator_spec.rb
-- spec/cyrax/extensions/has_repository_spec.rb
 - spec/cyrax/extensions/has_resource_spec.rb
-- spec/cyrax/extensions/has_response_spec.rb
 - spec/cyrax/extensions/has_service_spec.rb
-- spec/cyrax/repository_spec.rb
-- spec/cyrax/resource_spec.rb
 - spec/cyrax/response_spec.rb
+- spec/cyrax/decorator_spec.rb
 - spec/cyrax/serializer_spec.rb
-- spec/spec_helper.rb
+- spec/cyrax/base_spec.rb

data/lib/cyrax/extensions/has_repository.rb

@@ -1,48 +0,0 @@
-module Cyrax::Extensions
-  module HasRepository
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_repository_class
-      class_attribute :_repository_options
-    end
-
-    def repository_class
-      options[:repository] || self.class._repository_class || Cyrax::Repository
-    end
-
-    def repository
-      options = (self.class._repository_options || {}).merge(
-        as: accessor, resource_class: resource_class, params: params
-      )
-      repository_class.new(options)
-    end
-
-    module ClassMethods
-      def inherited(subclass)
-        subclass._repository_options = self._repository_options.try(:clone)
-      end
-
-      def repository(name = nil, &block)
-        if name.is_a?(Symbol)
-          klass, finder_name = nil, name
-        elsif name.is_a?(String)
-          ActiveSupport::Deprecation.warn "sending String in #decorator method is deprecated. send Class instead"
-          klass, finder_name = name.constantize, nil
-        elsif name.present?
-          klass, finder_name = name, nil
-        end
-
-        if klass.present?
-          self._repository_class = klass
-        end
-        if block_given?
-          self._repository_options = self._repository_options.try(:clone)
-          self._repository_options ||= {}
-          self._repository_options[:finders] ||= {}
-          self._repository_options[:finders][finder_name || :scope] = block
-        end
-      end
-    end
-  end
-end

data/lib/cyrax/repository.rb

@@ -1,113 +0,0 @@
-class Cyrax::Repository
-  include HasActiveLogger::Mixin
-  attr_accessor :options
-  attr_accessor :accessor
-  attr_accessor :params
-  attr_accessor :resource_class
-  attr_accessor :finders
-
-  def initialize(options = {})
-    @options = options
-    @accessor = options[:as]
-    @params = options[:params]
-    @resource_class = options[:resource_class]
-    @finders = options[:finders] || {}
-  end
-
-  def finder(name, *attrs)
-    block = finders[name]
-    instance_exec(*attrs, &block)
-  end
-
-  def finder?(name)
-    finders.has_key?(name)
-  end
-
-  def finder_or_run(name, *attrs)
-    finder?(name) ? finder(name, *attrs) : send("#{name}!", *attrs)
-  end
-
-  # Returns the resource class - e.g. Product by default.
-  # If you want your repository to scope with something interesting, 
-  # you should override this in your repository by defining the method and returning your own scope
-  #
-  # @example Overriding scope
-  #   class Products::Repository < Cyrax::Repository
-  #     def scope
-  #       accessor.products
-  #     end
-  #   end
-  def scope
-    finder_or_run(:scope)
-  end
-  def scope!
-    resource_class
-  end
-
-  # Instantiates the resource
-  # @param id [int] ID or nil if you want a new object
-  # @param attributes [hash] Attributes you want to add to the resource
-  # @return [object] The object
-  def build(id, attributes = {})
-    finder_or_run(:build, id, attributes)
-  end
-  def build!(id, attributes = {})
-    if id.present?
-      resource = find(id)
-      resource.attributes = attributes
-      resource
-    else
-      scope.new(default_attributes.merge(attributes))
-    end
-  end
-
-  # Finds and returns a multiple items within the scope from the DB
-  # @return [Array] Array of objects
-  def find_all
-    finder_or_run(:find_all)
-  end
-  def find_all!
-    defined?(ActiveRecord) && scope.is_a?(ActiveRecord::Relation) ? scope.load : scope.all
-  end
-
-  # Finds and returns a single item from the DB
-  # @param id [int] ID of item
-  # @return [object] The object
-  def find(id)
-    finder_or_run(:find, id)
-  end
-  def find!(id)
-    scope.find(id)
-  end
-
-  # Saves a resource
-  # @param resource [object] The resource to save
-  def save(resource)
-    finder_or_run(:save, resource)
-  end
-  def save!(resource)
-    resource.save
-  end
-
-  # Removes a resource
-  # Calls destroy method on resource
-  # @param resource [object] The resource to destroy
-  def delete(resource)
-    finder_or_run(:delete, resource)
-  end
-  def delete!(resource)
-    resource.destroy
-  end
-
-  def default_attributes
-    finder_or_run(:default_attributes)
-  end
-  def default_attributes!
-    {}
-  end
-
-  def method_missing(method, *args, &block)
-    return super unless finder?(method)
-    finder(method, *args)
-  end
-end

data/spec/cyrax/extensions/has_repository_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-class Bar; end
-class Foo; end
-
-module Cyrax
-  class BaseWithRepository < Cyrax::Base
-    include Cyrax::Extensions::HasRepository
-  end
-
-  describe Cyrax::Extensions::HasRepository do
-    subject { BaseWithRepository.new }
-
-    describe 'class attributes' do
-      its(:class) { should respond_to(:_repository_class) }
-    end
-
-    describe 'class methods' do
-      describe '#repository' do
-        context "define repository class" do
-          before { subject.class.repository(Foo) }
-          
-          its(:repository_class) { should eq(Foo) }
-        end
-      end
-    end
-  end
-end

data/spec/cyrax/repository_spec.rb

@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-class Foo; end
-module Cyrax
-  describe Repository do
-    describe 'it should behave like repository' do
-      context 'instance methods' do
-        subject { Cyrax::Repository.new }
-        it{ should respond_to(:resource_class) }
-        it{ should respond_to(:scope) }
-        it{ should respond_to(:build) }
-        it{ should respond_to(:find_all) }
-        it{ should respond_to(:find) }
-        it{ should respond_to(:save) }
-        it{ should respond_to(:delete) }
-      end
-    end
-
-    describe 'instance methods' do
-      describe '#find_all' do
-        let(:scope) { double }
-        before { subject.stub(:scope).and_return(scope) }
-        it 'finds all objects by default' do
-          scope.should_receive(:all)
-          subject.find_all
-        end
-      end
-
-      describe '#find_resource' do
-        let(:scope) { double }
-        before { subject.stub(:scope).and_return(scope) }
-        it 'finds resource by id' do
-          allow_message_expectations_on_nil
-          scope.should_receive(:find).with(123)
-          subject.find(123)
-        end
-      end
-
-      describe '#build_resource' do
-        context 'when id is nil' do
-          let(:scope) { double }
-          before { subject.stub(:scope).and_return(scope) }
-          before { subject.stub(:default_attributes).and_return({}) }
-          it 'initializes new object' do
-            allow_message_expectations_on_nil
-            scope.should_receive(:new).with({foo: 'bar'})
-            subject.build(nil, {foo: 'bar'})
-          end
-        end
-        context 'when id is present' do
-          let(:resource) { double.as_null_object }
-          it 'finds resource' do
-            subject.should_receive(:find).with(123).and_return(resource)
-            subject.build(123, {foo: 'bar'})
-          end
-
-          it 'assigns provided attributes' do
-            subject.stub(:find).and_return(resource)
-            resource.should_receive(:attributes=).with({foo: 'bar'})
-            subject.build(123, {foo: 'bar'})
-          end
-        end
-      end
-
-      describe '#default_attributes' do
-        it 'should return empty hash by default' do
-          subject.send(:default_attributes).should eq({})
-        end
-      end
-    end
-  end
-end