cyrax 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWUxYTQwNmI1YzlmOGRmZWE2OWIwNDMzY2QwYzc1ZWM0ODliYTI2OA==
+    NmE3M2RiMzA0YzZkOWJlNjI1MWZmM2I4ZDVkMjNjMzRiYTI1YjVmMw==
   data.tar.gz: !binary |-
-    YTEzMGY5MjgxYjVmYzYwODYwZmRmNWJmYWI0NWQ3MjkzNzE2YjcyMg==
+    YzM3YTgzM2Q2OTczMjVjNjgxYmQ3NzFkNTE2NjE5ZDBhNzQ4MDk2YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzgxYTRmODEwYzNiZjY1YWRhYTlkZDY3ZTdjNTBhY2M5ODY4MmJlOTdlNDAz
-    MDdkZTYyMDY4ZGQ2ZDg2NzI3MjBjMWE1MWFmNmUxMWZiZWI2ZTFlOWJhN2Yw
-    ZjhiOTk1NjhjOWRlMzg0MGE1NDE4YzUwNzIxMjExNTJhNDAwOGU=
+    YTJhMTMyZTJiM2EzOWVjNGQ0NjEzZjUyNTBlYWIzOGU4NDYzNzRiZDM1NmEz
+    YzMwNTZmMGFlMzE1NTVkZmE4NTc2NDQwNDg3N2M5MGVjZWVhYzQwMTEwNWJl
+    ODJjODU2OWJhNmEyNjVkZjQzZjEzYmE4MDM1ZDc4YzI2MTNmNGI=
   data.tar.gz: !binary |-
-    MWVhYjc5MzIyMjQ0OWExMTE5MTQ4ZTAxMDVmYWZhZjg2NjNkZWZhN2YzMTQ5
-    MDdiNGJhN2ZmOGEwNzBhZjFmMjg0OWUxMDFlMmUxMWQzMzIwMWQwYzVlNDA1
-    YzM0ZGNlYmYzMjViODE3MmM1NjI4ZmRiZjA0MjFjYWY3ZGMzZmE=
+    MjUyMmFmNzJkZDJkYWEwZWMzNGRiZWQwNDI3NmQwYWEyNzkwYjAzMjFlYjc1
+    MWQ4ZDAyOTkxMzEwNTk1NjZjNDdlZGM3MWQ3MzVmNWY5NWUwMDdlNjUzMjU0
+    NmRmNjUzOWM5OGZiYzlhM2Y4NzQyYWVmODdlZGEzZjU2ZDQzODE=

data/lib/cyrax/base.rb

@@ -9,4 +9,20 @@ class Cyrax::Base
     @accessor = options[:as]
     @params = options[:params]
   end
+
+  def has_extension?(name)
+    self.class.has_extension?(name)
+  end
+
+  class << self
+    def register_extension(name)
+      @_extensions ||= []
+      @_extensions << name.to_sym
+    end
+
+    def has_extension?(name)
+      @_extensions ||= []
+      @_extensions.include?(name.to_sym)
+    end
+  end
 end

data/lib/cyrax/base_presenter.rb

@@ -10,11 +10,9 @@ class Cyrax::BasePresenter
   end
 
   class << self
-
     def present(object, options = {})
       self.new.present(object, options)
     end
-
   end
 
   private

data/lib/cyrax/extensions/has_callbacks.rb

@@ -6,6 +6,7 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     included do
+      register_extension :has_callbacks
       class_attribute :resource_callbacks_handler_class
     end
 

data/lib/cyrax/extensions/has_decorator.rb

@@ -3,12 +3,13 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     included do
+      register_extension :has_decorator
       class_attribute :decorator_class_name
     end
 
     module ClassMethods
       def decorator(name)
-        self.decorator_class_name = name.to_s
+        self.decorator_class_name = name ? name.to_s : nil
       end
     end
 

data/lib/cyrax/extensions/has_resource.rb

@@ -4,6 +4,7 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     included do
+      register_extension :has_resource
       class_attribute :resource_name
       class_attribute :resource_class_name
     end
@@ -46,16 +47,8 @@ module Cyrax::Extensions
       resource_scope.find(id)
     end
 
-    def wrapped_collection
-      collection = build_collection
-
-      if collection.kind_of?(Array)
-        return collection
-      elsif collection.respond_to?(:all)
-        return collection.all
-      else
-        return Array.wrap(collection)
-      end
+    def response_name
+      resource_name
     end
 
     module ClassMethods

data/lib/cyrax/extensions/has_response.rb

@@ -30,11 +30,17 @@ module Cyrax::Extensions
       @_message = message
     end
 
-    def respond_with(resource, options = {})
-      name = options[:name] || resource_name
-      presenter_options = options.merge(decorable: decorable?, decorator_class: decorator_class)
-      result = Cyrax::BasePresenter.present(resource, presenter_options)
-      response = Cyrax::Response.new(name, result)
+    def response_name
+      self.class.name.demodulize.underscore
+    end
+
+    def respond_with(result, options = {})
+      name = options[:name] || response_name
+      if has_extension?(:has_decorator)
+        options.merge!(decorable: decorable?, decorator_class: decorator_class)
+        result = Cyrax::BasePresenter.present(result, options)
+      end
+      response = result.is_a?(Cyrax::Response) ? result : Cyrax::Response.new(name, result)
       response.message = @_message
       response.errors = @_errors
       response.assignments = @_assignments

data/lib/cyrax/extensions/has_service.rb

@@ -2,6 +2,10 @@ module Cyrax::Extensions
   module HasService
     extend ActiveSupport::Concern
 
+    included do
+      register_extension :has_service
+    end
+
     def collection
       respond_with build_collection, name: collection_name, present: :collection
     end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/cyrax/extensions/has_callbacks_spec.rb

@@ -1,41 +1,45 @@
 require 'spec_helper'
 
 module Cyrax
-  describe Cyrax::Extensions::HasCallbacks do
+  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) { mock }
         let(:resource) { mock }
-        before { self.class.stub!(:resource_callbacks_handler_class) }
-        it { invoke_callback(name, resource).should be_nil }
+        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) { mock }
         let(:handle_class) { double.as_null_object }
-        before { self.class.stub!(:resource_callbacks_handler_class).and_return(handle_class) }
+        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)
-          invoke_callback(name, 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)
-          invoke_callback(name, resource)
+          subject.invoke_callback(name, resource)
         end
       end
     end
 
     describe '#callbacks_handler' do
       it 'should define callbacks handler class' do
-        self.class.callbacks_handler('Foo')
-        self.class.resource_callbacks_handler_class.should eq('Foo')
+        subject.class.callbacks_handler('Foo')
+        subject.class.resource_callbacks_handler_class.should eq('Foo')
       end
     end
   end

data/spec/cyrax/extensions/has_decorator_spec.rb

@@ -12,38 +12,39 @@ class Foo;
 end
 
 module Cyrax
-  describe Cyrax::Extensions::HasDecorator do
+  class BaseWithDecorator < Cyrax::Base
     include Cyrax::Extensions::HasDecorator
+  end
+
+  describe Cyrax::Extensions::HasDecorator do
+    subject { BaseWithDecorator.new }
 
     describe 'class attributes' do
-      subject { self.class }
-      it { should respond_to(:decorator_class_name) }
+      its(:class) { should respond_to(:decorator_class_name) }
     end
 
     describe 'class methods' do
       describe '#decorator' do
-        before { self.class.decorator(:foo) }
-        subject { self }
+        before { subject.class.decorator(:foo) }
 
         its(:decorator_class_name) { should eq('foo') }
       end
     end
 
     describe 'instance methods' do
-      subject { self }
-
       describe '#decorator_class' do
-        before { self.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 { self.class.decorator(:foo) }
+          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 }
         end
       end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -10,19 +10,21 @@ class Bar; end
 class Foo; end
 
 module Cyrax
-  describe Cyrax::Extensions::HasResource do
+  class BaseWithResource < Cyrax::Base
     include Cyrax::Extensions::HasResource
+  end
+
+  describe Cyrax::Extensions::HasResource do
+    subject { BaseWithResource.new }
 
     describe 'class attributes' do
-      subject { self.class }
-      it { should respond_to(:resource_name) }
-      it { should respond_to(:resource_class_name) }
+      its(:class) { should respond_to(:resource_name) }
+      its(:class) { should respond_to(:resource_class_name) }
     end
 
     describe 'class methods' do
       describe '#resource' do
-        before { self.class.resource(:foo, class_name:'bar', name:'bazz') }
-        subject { self }
+        before { subject.class.resource(:foo, class_name:'bar', name:'bazz') }
 
         its(:resource_name) { should eq('foo') }
         its(:resource_class_name) { should eq('bar') }
@@ -30,26 +32,25 @@ module Cyrax
     end
 
     describe 'instance methods' do
-      subject { self }
 
       describe '#resource_name' do
-        before { self.class.resource(:foo) }
+        before { subject.class.resource(:foo) }
         its(:resource_name) { should eq('foo') }
       end
 
       describe '#collection_name' do
-        before { self.class.resource(:foo) }
+        before { subject.class.resource(:foo) }
         its(:collection_name) { should eq('foos') }
       end
 
       describe '#resource_class' do
         context 'when `class_name` option is supplied' do
-          before { self.class.resource(:foo, class_name:'Bar') }
+          before { subject.class.resource(:foo, class_name:'Bar') }
           its(:resource_class) { should eq(Bar) }
         end
 
         context 'when `class_name` option is omited' do
-          before { self.class.resource(:foo) }
+          before { subject.class.resource(:foo) }
           its(:resource_class) { should eq(Foo) }
         end
       end
@@ -74,27 +75,6 @@ module Cyrax
         end
       end
 
-      describe '#wrapped_collection' do
-        subject { self.send(:wrapped_collection) }
-
-        context 'when #build_collection returns array' do
-          before { self.stub!(:build_collection).and_return([:bar]) }
-          it { should eq([:bar]) }
-        end
-
-        context 'when #build_collection returns any object except array' do
-          before { self.stub!(:build_collection).and_return(:bar) }
-          it { should eq([:bar]) }
-        end
-
-        context 'when #build_collection returns any object which responds to #all method' do
-          let(:obj) { mock(:all => [:bar] ) }
-          before { self.stub!(:build_collection).and_return(obj) }
-
-          it { should eq([:bar]) }
-        end
-      end
-
       describe '#build_resource' do
         context 'when id is nil' do
           let(:resource_scope) { mock }
@@ -131,7 +111,6 @@ module Cyrax
     end
 
     describe 'private methods' do
-      subject { self }
       describe '#dirty_resource_attributes' do
         context 'when params are present' do
           it 'should return from params by resource_name' do

data/spec/cyrax/extensions/has_response_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
 module Cyrax
-  describe Cyrax::Extensions::HasResponse do
+  class BaseWithResponse < Cyrax::Base
     include Cyrax::Extensions::HasResponse
+  end
 
-    subject { self }
+  describe Cyrax::Extensions::HasResponse do
+    subject { BaseWithResponse.new }
     before do
       subject.stub!(:decorable?).and_return(false)
       subject.stub!(:decorator_class).and_return(nil)
@@ -55,7 +57,7 @@ module Cyrax
     end
 
     describe '#respond_with' do
-      before { subject.stub!(:resource_name).and_return(:foo) }
+      before { subject.stub!(:response_name).and_return(:foo) }
       it 'calls Cyrax::Response' do
         Cyrax::Response.should_receive(:new).with(:foo, 'bar').and_return(mock.as_null_object)
         subject.respond_with('bar')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport