resource_manager 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca47a34574bff820fa5de5fffafd1922250db9fd
-  data.tar.gz: 41ed5ad6d2252dc082001d89898b2296f2619e15
+  metadata.gz: 889d565e3adc71321786d04a1ee9ab5adb4a0f6d
+  data.tar.gz: f8aeb3332f592fea72114099f6519be4622b0626
 SHA512:
-  metadata.gz: 7bd257353d994a808fec5bc9c3cc4ff31e803bff31c6c9a4d590d868f3bd03bee1b35aa1dbbc8f6cf80e74bf75659a1bf833d5176e45738a44ba20bcf796e9b6
-  data.tar.gz: 6599659bdf811d9b6442e8aac1cd1cf3546f92873058356a9a16d5ec62ef7e6278452de01ceb40d8c74beb2a7c8ce502a5e89755c2512be89dac50ffeef4ef35
+  metadata.gz: e0a24a5aad021e72791cfdd6a7f0318fe8666e6811ef116c45f85c73b33f9ac4b1fee2f78ee948af7a4246aa45df2a3fc06a4253cc43f9f4a9b97d05b948ad9f
+  data.tar.gz: 795ef835e288504590ad1508c4930d9ca84d28372a1b4a99ca88295ecec4f4320162ab3138215cdd38e7d331d257965fe6b55d0e997793f057d4e79b08764554

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2
+  - 2.1.3
+  - jruby-19mode
+script: bundle exec rspec
+cache: bundler

data/lib/resource_manager.rb

@@ -1,9 +1,7 @@
 require 'resource_manager/version'
-require 'resource_manager/transactionable'
 
 module ResourceManager
   class Base
-    include ResourceManager::Transactionable
 
     class_attribute :model
     class_attribute :before_create_callback, :after_create_callback, :before_update_callback, :after_update_callback, :before_destroy_callback, :after_destroy_callback
@@ -35,55 +33,59 @@ module ResourceManager
       end
     end
 
-    def create(params)
-      transaction do
-        run_callback(:before_create, params)
-
-        result = if self.create_action.present?
-                   instance_exec(params, &self.create_action)
-                 else
-                   item = model.new(params)
-                   saved = item.save
-                   yield(item, saved) if block_given?
-                 end
-
-        run_callback(:after_create, item) if saved
-        result
+    ['', '!'].each do |name|
+      define_method "create#{name}" do |params|
+        transaction do
+          run_callback(:before_create, params)
+
+          if self.create_action.present?
+            instance_exec(params, &self.create_action)
+          else
+            item = model.new(params)
+            saved = item.send("save#{name}")
+            yield(item, saved) if block_given?
+            item
+          end
+
+          run_callback(:after_create, item, params) if saved
+          item
+        end
       end
-    end
 
-    def update(item_or_id, params)
-      transaction do
-        item = item(item_or_id)
-        run_callback(:before_update, item, params)
-
-        result = if self.update_action.present?
-                   instance_exec(item, params, &self.update_action)
-                 else
-                   item.assign_attributes(params)
-                   changed = item.changed
-                   saved = item.save
-                   yield(item, saved) if block_given?
-                 end
-
-        run_callback(:after_update, item, params, changed) if saved
-        result
+      define_method "update#{name}" do |item_or_id, params|
+        transaction do
+          item = item(item_or_id)
+          run_callback(:before_update, item, params)
+
+          if self.update_action.present?
+            instance_exec(item, params, &self.update_action)
+          else
+            item.assign_attributes(params)
+            changed = item.changed
+            saved = item.send("save#{name}")
+            yield(item, saved) if block_given?
+            item
+          end
+
+          run_callback(:after_update, item, params, changed) if saved
+          item
+        end
       end
-    end
 
-    def destroy(item_or_id)
-      transaction do
-        item = item(item_or_id)
-        run_callback(:before_destroy, item)
+      define_method "destroy#{name}" do |item_or_id|
+        transaction do
+          item = item(item_or_id)
+          run_callback(:before_destroy, item)
 
-        if self.destroy_action.present?
-          instance_exec(item, &self.destroy_action)
-        else
-          item.destroy
-        end
+          if self.destroy_action.present?
+            instance_exec(item, &self.destroy_action)
+          else
+            item.send("destroy#{name}")
+          end
 
-        run_callback(:after_destroy, item)
-        nil
+          run_callback(:after_destroy, item)
+          item
+        end
       end
     end
 
@@ -100,5 +102,9 @@ module ResourceManager
         model.find(item_or_id)
       end
     end
+
+    def transaction(&block)
+      ActiveRecord::Base.transaction &block
+    end
   end
 end

data/lib/resource_manager/version.rb

@@ -1,3 +1,3 @@
 module ResourceManager
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/resource_manager.gemspec

@@ -19,4 +19,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
+  spec.add_development_dependency 'rspec',  '~> 2.14'
+  spec.add_development_dependency 'simplecov-html',  '~> 0.8'
+  spec.add_development_dependency 'mocha',  '~> 1.1'
+
+  spec.add_runtime_dependency 'activesupport',  '~> 4.1.6'
 end

data/spec/lib/resource_manager_spec.rb

@@ -0,0 +1,273 @@
+require 'spec_helper'
+
+describe ResourceManager::Base do
+
+  context 'with model as class' do
+
+    let!(:manager) {
+      Class.new(ResourceManager::Base) do
+        model Model
+      end.new
+    }
+
+    context 'with callbacks' do
+      describe '#create' do
+        it 'calls before create callback' do
+          result_params = nil
+          callback = Proc.new{ |params| result_params = params}
+
+          manager.class.before_create(&callback)
+          manager.create(test: 1)
+          expect(result_params).to eq({test: 1})
+        end
+
+        it 'calls after create callback' do
+          result_params = nil
+          result_item = nil
+          callback = Proc.new{ |item, params| result_item = item; result_params = params}
+          manager.class.after_create(&callback)
+
+          manager.create({test: 1})
+
+          expect(result_params).to eq({test: 1})
+          expect(result_item).to be_a_kind_of(Model)
+        end
+
+        it 'returns Model instance' do
+          expect(manager.create({test: 1})).to be_a_kind_of(Model)
+        end
+
+        it 'yields block' do
+          manager.create({test: 1}) do |item, result|
+            expect(item).to be_a_kind_of(Model)
+            expect(result).to be_truthy
+          end
+        end
+
+        context 'with failed saving' do
+          before do
+            Model.any_instance.stubs(:save).returns(false)
+          end
+
+          it 'does not call after_create' do
+            result_params = nil
+            result_item = nil
+            callback = Proc.new{ |item, params| result_item = item; result_params = params}
+            manager.class.after_create(&callback)
+
+            manager.create({test: 1})
+
+            expect(result_params).to be_nil
+            expect(result_item).to be_nil
+          end
+
+          it 'yields block' do
+            manager.create({test: 1}) do |item, result|
+              expect(item).to be_a_kind_of(Model)
+              expect(result).to be_falsey
+            end
+          end
+        end
+      end
+
+      describe '#create!' do
+        it 'returns Model instance' do
+          expect(manager.create!({test: 1})).to be_a_kind_of(Model)
+        end
+
+        context 'with failed saving' do
+          before do
+            Model.any_instance.stubs(:save!).raises(StandardError.new)
+          end
+
+          it 'returns Model instance' do
+            expect{manager.create!({test: 1})}.to raise_error(StandardError)
+          end
+
+        end
+      end
+
+      describe '#update' do
+        it 'calls before update callback' do
+          result_params = nil
+          result_item = nil
+          callback = Proc.new{ |item, params| result_item = item; result_params = params}
+          manager.class.before_update(&callback)
+
+          manager.update(1, test: 1)
+
+          expect(result_params).to eq({test: 1})
+          expect(result_item).to be_a_kind_of(Model)
+        end
+
+
+        it 'calls after update callback' do
+          result_params = nil
+          result_item = nil
+          result_changed = nil
+          callback = Proc.new{ |item, params, changed| result_item = item; result_params = params; result_changed = changed}
+          manager.class.after_update(&callback)
+
+          manager.update(1, test: 1)
+
+          expect(result_params).to eq({test: 1})
+          expect(result_item).to be_a_kind_of(Model)
+          expect(result_changed).to be_a_kind_of(Hash)
+        end
+
+        it 'returns  Model instance' do
+          expect(manager.update(1, {test: 1})).to be_a_kind_of(Model)
+        end
+
+        it 'yields block' do
+          manager.update(1, {test: 1}) do |item, result|
+            expect(item).to be_a_kind_of(Model)
+            expect(result).to be_truthy
+          end
+        end
+
+        context 'with failed saving' do
+          before do
+            Model.any_instance.stubs(:save).returns(false)
+          end
+
+          it 'does not call after_update' do
+            result_params = nil
+            result_item = nil
+            result_changed= nil
+            callback = Proc.new{ |item, params, changed| result_item = item; result_params = params; result_changed = changed}
+            manager.class.after_update(&callback)
+
+            manager.update(1, {test: 1})
+
+            expect(result_params).to be_nil
+            expect(result_item).to be_nil
+            expect(result_changed).to be_nil
+          end
+
+          it 'yields block' do
+            manager.update(1, {test: 1}) do |item, result|
+              expect(item).to be_a_kind_of(Model)
+              expect(result).to be_falsey
+            end
+          end
+        end
+      end
+
+      describe '#update!' do
+        it 'returns Model instance' do
+          expect(manager.update!(1, {test: 1})).to be_a_kind_of(Model)
+        end
+
+        context 'with failed saving' do
+          before do
+            Model.any_instance.stubs(:save!).raises(StandardError.new)
+          end
+
+          it 'returns Model instance' do
+            expect{manager.update!(1, {test: 1})}.to raise_error(StandardError)
+          end
+
+        end
+      end
+
+
+      describe '#destroy' do
+        it 'calls before destroy callback' do
+          result_item = nil
+          callback = Proc.new{ |item| result_item = item}
+          manager.class.before_destroy(&callback)
+          manager.destroy(1)
+
+          expect(result_item).to be_a_kind_of(Model)
+        end
+
+
+        it 'calls after destroy callback' do
+          result_item = nil
+          callback = Proc.new{ |item| result_item = item}
+          manager.class.after_destroy(&callback)
+          manager.destroy(1)
+
+          expect(result_item).to be_a_kind_of(Model)
+        end
+
+        it 'returns Model instance' do
+          expect(manager.destroy(Model.new)).to be_a_kind_of(Model)
+        end
+
+
+      end
+
+
+      describe '#destroy!' do
+        it 'returns Model instance' do
+          expect(manager.destroy!(1)).to be_a_kind_of(Model)
+        end
+
+        context 'with failed saving' do
+          before do
+            Model.any_instance.stubs(:destroy!).raises(StandardError.new)
+          end
+
+          it 'returns Model instance' do
+            expect{manager.destroy!(1)}.to raise_error(StandardError)
+          end
+
+        end
+      end
+
+    end
+
+    context 'with actions' do
+      describe '#create' do
+        it 'calls before create callback' do
+          result_params = nil
+          callback = Proc.new{ |params| result_params = params}
+
+          manager.class.create(&callback)
+          manager.create(test: 1)
+          expect(result_params).to eq({test: 1})
+        end
+      end
+
+      describe '#update' do
+        it 'calls before create callback' do
+          result_params = nil
+          result_item = nil
+          callback = Proc.new{ |item, params| result_item = item; result_params = params}
+
+          manager.class.update(&callback)
+          manager.update(1, test: 1)
+          expect(result_params).to eq({test: 1})
+          expect(result_item).to be_a_kind_of(Model)
+        end
+      end
+
+      describe '#destroy' do
+        it 'calls before create callback' do
+          result_item = nil
+          callback = Proc.new{ |item| result_item = item}
+
+          manager.class.destroy(&callback)
+          manager.destroy(1)
+          expect(result_item).to be_a_kind_of(Model)
+        end
+      end
+    end
+  end
+
+  context 'with model as lambda' do
+    let!(:manager) {
+      Class.new(ResourceManager::Base) do
+        model ->{ Model }
+      end.new
+    }
+
+    describe '#create' do
+      it 'Model instance' do
+        expect(manager.create({test: 1})).to be_a_kind_of(Model)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+#require 'coveralls'
+require 'simplecov'
+
+#Coveralls.wear!
+require 'support/mocks/model'
+require 'support/mocks/active_record/base'
+
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/object/blank'
+require 'mocha'
+
+SimpleCov.start
+
+
+$LOAD_PATH << '../lib'
+
+require 'resource_manager'
+
+RSpec.configure do |config|
+  config.order = 'random'
+  config.mock_with :mocha
+end

data/spec/support/mocks/active_record/base.rb

@@ -0,0 +1,7 @@
+module ActiveRecord
+  class Base
+    def self.transaction
+      yield
+    end
+  end
+end

data/spec/support/mocks/model.rb

@@ -0,0 +1,34 @@
+class Model
+  class << self
+    def find(_)
+      Model.new
+    end
+  end
+
+  def initialize(_ = {})
+
+  end
+
+  def destroy
+  end
+
+  def destroy!
+
+  end
+
+  def save
+    true
+  end
+
+  def save!
+    true
+  end
+
+  def assign_attributes(_)
+
+  end
+
+  def changed
+    {}
+  end
+end

metadata

@@ -1,43 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: resource_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gleb Sinyavsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: simplecov-html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.6
 description: Base for service objects that encapsulates model actions and callbacks
 email:
 - zhulik.gleb@gmail.com
@@ -45,16 +115,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .coveralls.yml
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/resource_manager.rb
-- lib/resource_manager/transactionable.rb
 - lib/resource_manager/version.rb
 - resource_manager.gemspec
+- spec/lib/resource_manager_spec.rb
+- spec/spec_helper.rb
+- spec/support/mocks/active_record/base.rb
+- spec/support/mocks/model.rb
 homepage: https://github.com/zhulik/resource_manager
 licenses:
 - MIT
@@ -65,18 +140,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Base for service objects that encapsulates model actions and callbacks
-test_files: []
+test_files:
+- spec/lib/resource_manager_spec.rb
+- spec/spec_helper.rb
+- spec/support/mocks/active_record/base.rb
+- spec/support/mocks/model.rb

data/lib/resource_manager/transactionable.rb

@@ -1,7 +0,0 @@
-module ResourceManager
-  module Transactionable
-    def transaction(&block)
-      ActiveRecord::Base.transaction &block
-    end
-  end
-end