cyrax 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmE3M2RiMzA0YzZkOWJlNjI1MWZmM2I4ZDVkMjNjMzRiYTI1YjVmMw==
+    ZDE0YjZkNTZmYTNmNzI1YzQzODY2Nzg1OWI4MDY3NDZmMzY5N2Y1Yg==
   data.tar.gz: !binary |-
-    YzM3YTgzM2Q2OTczMjVjNjgxYmQ3NzFkNTE2NjE5ZDBhNzQ4MDk2YQ==
+    MzlhNjI4YThhOTc5MWE3YzhkMjU2NDIzNmQ0YjU1YzExNDY1YjRmOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTJhMTMyZTJiM2EzOWVjNGQ0NjEzZjUyNTBlYWIzOGU4NDYzNzRiZDM1NmEz
-    YzMwNTZmMGFlMzE1NTVkZmE4NTc2NDQwNDg3N2M5MGVjZWVhYzQwMTEwNWJl
-    ODJjODU2OWJhNmEyNjVkZjQzZjEzYmE4MDM1ZDc4YzI2MTNmNGI=
+    Njk3YmQyYzdlOWFiZWUxODM0NjNmZTdlOTgzNTVhMDFjNmI3N2I3ODc3MTk1
+    ODc2NDJjNzI3ZDg1OWNiMDVjZjlkOGFmMGFhNzA4Y2JlYTEwMjExYjgwODk3
+    ODMyYmNhMWIzODk2MTg2YzcyYzQwYTYzMjg0ZjFmYTlmYjgzNDM=
   data.tar.gz: !binary |-
-    MjUyMmFmNzJkZDJkYWEwZWMzNGRiZWQwNDI3NmQwYWEyNzkwYjAzMjFlYjc1
-    MWQ4ZDAyOTkxMzEwNTk1NjZjNDdlZGM3MWQ3MzVmNWY5NWUwMDdlNjUzMjU0
-    NmRmNjUzOWM5OGZiYzlhM2Y4NzQyYWVmODdlZGEzZjU2ZDQzODE=
+    NDZjZTM1ZDNlNWM2NGFlODc4NmE0MzhmMWRiYmJkMDJiZDgzNmU1OTBiZjU3
+    ZDg1NGNjMDFkYTJiYjhiN2MzMjVmOTM1OGQ0MTA2NDBiYWVlZDAzNDE2ODQx
+    NjM4YzY1NWFlYWEzNDM3NWRjMWM0Y2QzNzBiMmQ3ZTBiNDQ4OGM=

data/lib/cyrax/extensions/has_resource.rb

@@ -7,11 +7,12 @@ module Cyrax::Extensions
       register_extension :has_resource
       class_attribute :resource_name
       class_attribute :resource_class_name
+      class_attribute :collection_name
     end
 
     def resource_class
-      if self.class.resource_class_name
-        self.class.resource_class_name.constantize
+      if self.resource_class_name
+        self.resource_class_name.constantize
       else
         resource_name.classify.constantize
       end
@@ -21,32 +22,10 @@ module Cyrax::Extensions
       resource_class
     end
 
-    def collection_name
-      resource_name.pluralize
-    end
-
     def resource_attributes
       filter_attributes(dirty_resource_attributes)
     end
 
-    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
-
-    def build_collection
-      resource_scope
-    end
-
-    def find_resource(id)
-      resource_scope.find(id)
-    end
-
     def response_name
       resource_name
     end
@@ -64,6 +43,7 @@ module Cyrax::Extensions
       def resource(name, options = {})
         self.resource_name = name.to_s
         self.resource_class_name = options[:class_name]
+        self.collection_name = name.to_s.pluralize
       end
     end
 

data/lib/cyrax/extensions/has_service.rb

@@ -19,7 +19,7 @@ module Cyrax::Extensions
       resource = build_resource(nil, custom_attributes||resource_attributes)
       invoke_callback(:before_create, resource)
       invoke_callback(:before_save, resource)
-      if resource.save
+      if save_resource(resource)
         invoke_callback(:after_create, resource)
         invoke_callback(:after_save, resource)
         set_message("#{resource_name.titleize} successfully created")
@@ -39,7 +39,7 @@ module Cyrax::Extensions
       resource = build_resource(params[:id], custom_attributes||resource_attributes)
       invoke_callback(:before_update, resource)
       invoke_callback(:before_save, resource)
-      if resource.save
+      if save_resource(resource)
         invoke_callback(:after_update, resource)
         invoke_callback(:after_save, resource)
         set_message("#{resource_name.titleize} successfully updated")
@@ -52,9 +52,35 @@ module Cyrax::Extensions
     def destroy
       resource = find_resource(params[:id])
       invoke_callback(:before_destroy, resource)
-      resource.destroy
+      delete_resource(resource)
       invoke_callback(:after_destroy, resource)
       respond_with(resource)
     end
+
+    def find_resource(id)
+      resource_scope.find(id)
+    end
+
+    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
+
+    def save_resource(resource)
+      resource.save
+    end
+
+    def delete_resource(resource)
+      resource.destroy
+    end
+
+    def build_collection
+      resource_scope
+    end
   end
 end

data/lib/cyrax/version.rb

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

data/spec/cyrax/base_resource_spec.rb

@@ -4,10 +4,6 @@ class Foo; end
 module Cyrax
   describe BaseResource do
     describe 'it should behave like resource' do
-      context 'class methods' do
-        subject { Cyrax::BaseResource }
-        it{ should respond_to(:new) }
-      end
       context 'instance methods' do
         subject { Cyrax::BaseResource.new }
         it{ should respond_to(:accessor) }
@@ -30,19 +26,19 @@ module Cyrax
     end
 
     subject { Cyrax::BaseResource.new }
-    let(:resource) { mock.as_null_object }
-    let(:collection) { [mock] }
+    let(:resource) { double.as_null_object }
+    let(:collection) { [double] }
     before do
-      subject.stub!(:params).and_return({id:123})
-      subject.stub!(:find_resource).and_return(resource)
-      subject.stub!(:resource_name).and_return('foo')
+      subject.stub(:params).and_return({id:123})
+      subject.stub(:find_resource).and_return(resource)
+      subject.class.send :resource, :foo
     end
 
-    describe '#collection' do
+    describe '#read_all' do
       it 'responds with decorated collection' do
         subject.should_receive(:build_collection).and_return(collection)
         subject.should_receive(:respond_with).with(collection, name: 'foos', present: :collection)
-        subject.collection
+        subject.read_all
       end
     end
 
@@ -91,7 +87,7 @@ module Cyrax
 
     describe '#create' do
       let(:params) { {foo: 'bar'} }
-      before { subject.stub!(:build_resource).and_return(resource) }
+      before { subject.stub(:build_resource).and_return(resource) }
       it 'responds with resource' do
         subject.should_receive(:build_resource).with(nil, params)
         subject.should_receive(:respond_with).with(resource)
@@ -99,7 +95,7 @@ module Cyrax
       end
 
       context 'when resource successfully saved' do
-        before { resource.stub!(:save).and_return(true) }
+        before { resource.stub(:save).and_return(true) }
 
         it 'invokes callbacks' do
           subject.should_receive(:invoke_callback).with(:before_save, resource)
@@ -116,7 +112,7 @@ module Cyrax
       end
 
       context 'when resource could not be saved' do
-        before { resource.stub!(:save).and_return(false) }
+        before { resource.stub(:save).and_return(false) }
 
         it 'invokes callbacks' do
           subject.should_receive(:invoke_callback).with(:before_save, resource)
@@ -135,7 +131,7 @@ module Cyrax
 
     describe '#update' do
       let(:params) { {foo: 'bar'} }
-      before { subject.stub!(:build_resource).and_return(resource) }
+      before { subject.stub(:build_resource).and_return(resource) }
       it 'responds with resource' do
         subject.should_receive(:build_resource).with(123, params)
         subject.should_receive(:respond_with).with(resource)
@@ -143,7 +139,7 @@ module Cyrax
       end
 
       context 'when resource successfully saved' do
-        before { resource.stub!(:save).and_return(true) }
+        before { resource.stub(:save).and_return(true) }
 
         it 'invokes callbacks' do
           subject.should_receive(:invoke_callback).with(:before_save, resource)
@@ -160,7 +156,7 @@ module Cyrax
       end
 
       context 'when resource could not be saved' do
-        before { resource.stub!(:save).and_return(false) }
+        before { resource.stub(:save).and_return(false) }
 
         it 'invokes callbacks' do
           subject.should_receive(:invoke_callback).with(:before_save, resource)

data/spec/cyrax/callbacks_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Cyrax
   describe Callbacks do
-    subject { Cyrax::Callbacks.new(mock) }
+    subject { Cyrax::Callbacks.new(double) }
 
     it { should respond_to(:before_create) }
     it { should respond_to(:after_create) }

data/spec/cyrax/decorator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Cyrax
   describe Decorator do
-    let(:decorable) { mock(foo:'bar') }
+    let(:decorable) { double(foo:'bar') }
     subject { Cyrax::Decorator.new(decorable) }
 
     its(:resource) { should eq(decorable) }

data/spec/cyrax/extensions/has_callbacks_spec.rb

@@ -10,17 +10,17 @@ module Cyrax
 
     describe '#invoke_callback' do
       context 'when callback handler class is not defined' do
-        let(:name) { mock }
-        let(:resource) { mock }
-        before { subject.class.stub!(:resource_callbacks_handler_class) }
+        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) { mock }
+        let(:resource) { double }
         let(:handle_class) { double.as_null_object }
-        before { subject.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)
@@ -29,7 +29,7 @@ module Cyrax
 
         it 'calls corresponding method on instance' do
           instance = double.as_null_object
-          handle_class.stub!(:new).and_return(instance)
+          handle_class.stub(:new).and_return(instance)
           instance.should_receive(:foo)
           subject.invoke_callback(name, resource)
         end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -56,53 +56,13 @@ module Cyrax
       end
 
       describe '#resource_scope' do
-        before { subject.stub!(:resource_class).and_return(Foo) }
+        before { subject.stub(:resource_class).and_return(Foo) }
         its(:resource_scope) { should eq(Foo) }
       end
 
-      describe '#build_collection' do
-        before { subject.stub!(:resource_class).and_return(Foo) }
-        its(:build_collection) { should eq(Foo) }
-      end
-
-      describe '#find_resource' do
-        let(:resource_scope) { mock }
-        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) { mock }
-          before { subject.stub!(:resource_scope).and_return(resource_scope) }
-          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) { mock.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
-
       describe '#resource_attributes' do
-        let(:dirty_resource_attributes) { mock }
-        before { subject.stub!(:dirty_resource_attributes).and_return(dirty_resource_attributes)}
+        let(:dirty_resource_attributes) { double }
+        before { subject.stub(:dirty_resource_attributes).and_return(dirty_resource_attributes)}
         it 'filters dirty attributes' do
           subject.should_receive(:filter_attributes).with(dirty_resource_attributes)
           subject.resource_attributes
@@ -114,15 +74,15 @@ module Cyrax
       describe '#dirty_resource_attributes' do
         context 'when params are present' do
           it 'should return from params by resource_name' do
-            subject.stub!(:resource_name).and_return(:foo)
-            subject.stub!(:params).and_return({foo: {bar: 'bazz'}})
+            subject.stub(:resource_name).and_return(:foo)
+            subject.stub(:params).and_return({foo: {bar: 'bazz'}})
             subject.send(:dirty_resource_attributes).should eq({bar: 'bazz'})
           end
         end
         context 'when there are no params' do
           it 'should return empty hash' do
-            subject.stub!(:resource_name).and_return(:foo)
-            subject.stub!(:params).and_return({})
+            subject.stub(:resource_name).and_return(:foo)
+            subject.stub(:params).and_return({})
             subject.send(:dirty_resource_attributes).should eq({})
           end
         end

data/spec/cyrax/extensions/has_response_spec.rb

@@ -8,8 +8,8 @@ module Cyrax
   describe Cyrax::Extensions::HasResponse do
     subject { BaseWithResponse.new }
     before do
-      subject.stub!(:decorable?).and_return(false)
-      subject.stub!(:decorator_class).and_return(nil)
+      subject.stub(:decorable?).and_return(false)
+      subject.stub(:decorator_class).and_return(nil)
     end
 
     describe '#set_message' do
@@ -40,8 +40,8 @@ module Cyrax
 
     describe '#add_errors_from' do
       let(:messages) { [[:foo, 'bar'], [:bar, 'bazz']]}
-      let(:errors) { mock(messages: messages)}
-      let(:model) { mock(errors: errors) }
+      let(:errors) { double(messages: messages)}
+      let(:model) { double(errors: errors) }
 
       it 'should add errors from model error messages' do
         subject.add_errors_from(model)
@@ -57,9 +57,9 @@ module Cyrax
     end
 
     describe '#respond_with' do
-      before { subject.stub!(:response_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)
+        Cyrax::Response.should_receive(:new).with(:foo, 'bar').and_return(double.as_null_object)
         subject.respond_with('bar')
       end
 
@@ -68,7 +68,7 @@ module Cyrax
       end
 
       it 'should assign message, errors and additional assignments to response object' do
-        response = mock
+        response = double
         Cyrax::Response.should_receive(:new).and_return(response)
         response.should_receive(:message=)
         response.should_receive(:errors=)

data/spec/cyrax/extensions/has_service_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+class StrongParameters < Hash
+  def permit(attrs)
+    self.slice(*attrs)
+  end
+end
+
+class Bar; end
+class Foo; end
+
+module Cyrax
+  class BaseWithService < Cyrax::Base
+    include Cyrax::Extensions::HasService
+  end
+
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,6 +97,7 @@ files:
 - spec/cyrax/extensions/has_decorator_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/response_spec.rb
 - spec/spec_helper.rb
 homepage: 
@@ -132,5 +133,6 @@ test_files:
 - spec/cyrax/extensions/has_decorator_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/response_spec.rb
 - spec/spec_helper.rb