application_service 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afad05d4876e7cafd22bb8bce2730a169cb9e029
-  data.tar.gz: 703a9e2891a39498f4b6de3bb9bb64cc63f85456
+  metadata.gz: b15acb3ccb93f710feacd808e1585005638843f7
+  data.tar.gz: def0376ab7d6c65223191490bc7d71815f0b6390
 SHA512:
-  metadata.gz: 369f6259e634ab762d1869c4aa74be7d29a5b284ff0a5098c26e0368df46f6ba48c39d1595329bfd64912b1fb0fc9cc9d57553ed362cbff9637447c6e84ecde3
-  data.tar.gz: e94ab5a22735d6e25fd9a90087c53d2ee31fd7f8ebfc793cbe9c04e64fc3ec4e05e769b021b4e561ac0ce6f0b88a7b0bf51705dafcb7db4ac6f453dee53ea661
+  metadata.gz: e80715590ec3ee6174c938dd681652b2539c4abb2e6a6e04296333b00915ce0afb511ec719b8abd4a10233d3b43a0499d65d70c110d3cc552ec71fc44aac5cdc
+  data.tar.gz: 0f8e90eaa1acc799fb8932d78252b7e463dea6557c7e78709f8acddf2ef0c9dbadc12a051e57f0bcc24f09f3ba1651b8704cd9a4c7d9c2f49be5b94e5a7d5632

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/application_service.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: application_service 0.2.3 ruby lib
+# stub: application_service 0.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "application_service"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Nathan Woodhull"]
-  s.date = "2016-01-26"
+  s.date = "2016-02-06"
   s.description = "A service layer scaffold for rails apps extracted from Agra"
   s.email = "woodhull@gmail.com"
   s.extra_rdoc_files = [

data/lib/application_service.rb

@@ -3,12 +3,11 @@ require 'active_support/all'
 class ApplicationService
 
   include ActiveSupport::Callbacks
-  define_callbacks :save, :create, :update, :destroy, terminator: ->(target, result) { result == false }
+  define_callbacks :save, :create, :update, :destroy, {terminator: ->(target, result) { result == false }, skip_after_callbacks_if_terminated: true}
 
   def initialize
   end
 
-
   def self.before(callback, *args)
     options = extract_callback_options(args)
 
@@ -23,6 +22,11 @@ class ApplicationService
   def self.after(callback, *args)
     options = extract_callback_options(args)
 
+    conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v|
+      v != false
+    }
+    options[:if] = Array(options[:if]) << conditional
+
     args.each do |arg|
       set_callback callback, :after, arg, options
       if options.fetch(:skip_on_admin_save, false)

data/spec/application_service_spec.rb

@@ -248,15 +248,53 @@ describe ApplicationService do
         service.save(object)
       end
 
-      it "should not invoke callback if halted with options" do
+      it "should invoke callback if callback successful" do
+        service_klass = Class.new(ApplicationService) do
+          before :save, :before_save_callback1, :before_save_callback2
+        end
+
+        service = service_klass.new
+        service.should_receive(:before_save_callback2)
+        service.stub(:before_save_callback1).and_return(true)
+        service.save(object)
+      end
+
+      it "should invoke subsequent callbacks if a callback is skipped with options" do
         service_klass = Class.new(ApplicationService) do
           before :save, :before_save_callback, if: 'false'
+          before :save, :before_save_callback_2
+
         end
 
         service = service_klass.new
         service.should_not_receive(:before_save_callback)
+        service.should_receive(:before_save_callback_2)
+
+        object.should_receive(:save).and_return(true)
+
         service.save(object)
       end
+
+      it "should halt execution if callback fails" do
+        service_klass = Class.new(ApplicationService) do
+          before :save, :before_save_callback
+        end
+
+        service = service_klass.new
+        service.stub(:before_save_callback).and_return(false)
+        object.should_not_receive(:save)
+        expect(service.save(object)).to eq(false)
+      end
+
+      it "should invoke callback if conditional is true" do
+        service_klass = Class.new(ApplicationService) do
+          before :save, :before_save_callback, if: 'true'
+        end
+
+        service = service_klass.new
+        service.should_receive(:before_save_callback).and_return(true)
+        expect(service.save(object)).to eq(true)
+      end
     end
 
     describe '#after' do
@@ -295,6 +333,37 @@ describe ApplicationService do
         service.should_receive(:after_save_callback_2).and_return(true)
         service.save(object)
       end
+
+      it "should invoke callback if conditional is true" do
+        service_klass = Class.new(ApplicationService) do
+          after :save, :after_save_callback, if: 'true'
+        end
+
+        service = service_klass.new
+        service.should_receive(:after_save_callback).and_return(true)
+        expect(service.save(object)).to eq(true)
+      end
+
+      it 'should not invoke callback if conditional is false' do
+        service_klass = Class.new(ApplicationService) do
+          after :save, :after_save_callback, if: 'false'
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:after_save_callback)
+        expect(service.save(object)).to eq(true)
+      end
+
+      it 'should not invoke after save callbacks when save fails' do
+        service_klass = Class.new(ApplicationService) do
+          after :save, :after_save_callback
+        end
+
+        service = service_klass.new
+        object.should_receive(:save).and_return(false)
+        service.should_not_receive(:after_save_callback)
+        expect(service.save(object)).to eq(false)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: application_service
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport