application_service 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5098843852847896293de30d2f5c4fecad1b3102
-  data.tar.gz: e0155d8b8a81b6b603446550cdc6828cbddc8d2a
+SHA256:
+  metadata.gz: 235e898fc8f4abc701f68d1544f9d716a1d85b22dbab342f7e1b01e88c7beb55
+  data.tar.gz: 59c4f11f63cf3d71b519e033ca4b84a59465ae51d64f421c98327601366d2ae5
 SHA512:
-  metadata.gz: 2f7e81a4f71400cc1439cd684b2332cc847afec95e351fe8b35e050e3424b0d7206a3b3b5581fe5e6637b1f5b4cae287f9337376df79b9fe2564fe36fa393312
-  data.tar.gz: cef7d3d2b4cfc15fe1fe8d396b5921be18a4fc75f1d5330e496594d14ff14c41eb60ca4e8c82540615ed952f7f20ba47cba50df72046becdf9468e22d0522cc7
+  metadata.gz: db1262eefac8b5e07799e355a4f75da20aa2f594a91db008386a26cce215acd053ce69202a46ad9f92a1c069bdae72bbe74e5a9ca0f85f59259dc30016a244fe
+  data.tar.gz: f62165d54067b9f38dc8622de53f053679255e99a98ae9a6b688ffbe4ddffe1f465c1115c04ede877a76647a40f1c790349b125c9c89544dc5822dd4c1f36ed8

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.6.6

data/Gemfile

@@ -1,13 +1,8 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-gem 'activesupport'
+gem 'activesupport', '>= 5.0.0.1', '< 7.0'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
-  gem "jeweler", "~> 1.8.4"
+  gem 'rspec', '~> 3.5'
+  gem 'jeweler', '~> 2.2', '>= 2.2.1'
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/application_service.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: application_service 0.2.2 ruby lib
+# stub: application_service 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "application_service"
-  s.version = "0.2.2"
+  s.name = "application_service".freeze
+  s.version = "0.3.0"
 
-  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 = "2014-11-18"
-  s.description = "A service layer scaffold for rails apps extracted from Agra"
-  s.email = "woodhull@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Nathan Woodhull".freeze]
+  s.date = "2020-12-31"
+  s.description = "A service layer scaffold for rails apps extracted from Agra".freeze
+  s.email = "woodhull@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     ".ruby-gemset",
     ".ruby-version",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -34,27 +33,23 @@ Gem::Specification.new do |s|
     "spec/application_service_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/woodhull/application_service"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Service Layer Scaffold"
+  s.homepage = "http://github.com/woodhull/application_service".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.2".freeze
+  s.summary = "Service Layer Scaffold".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.0.0.1", "< 7.0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.2", ">= 2.2.1"])
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0.1", "< 7.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.2", ">= 2.2.1"])
   end
 end
 

data/lib/application_service.rb

@@ -3,15 +3,13 @@ require 'active_support/all'
 class ApplicationService
 
   include ActiveSupport::Callbacks
-  define_callbacks :save, :create, :update, :destroy,
-                   :terminator => "result == false"
+  define_callbacks :save, :create, :update, :destroy, {terminator: ->(target, result) { result.call == false }, skip_after_callbacks_if_terminated: true}
 
   def initialize
   end
 
-
   def self.before(callback, *args)
-    options = extract_callback_options(args, '!halted')
+    options = extract_callback_options(args)
 
     args.each do |arg|
       set_callback callback, :before, arg, options
@@ -22,7 +20,12 @@ class ApplicationService
   end
 
   def self.after(callback, *args)
-    options = extract_callback_options(args, "!halted && value")
+    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
@@ -127,13 +130,10 @@ class ApplicationService
     end
   end
 
-  def self.extract_callback_options(args, default_if_option)
+  private
+
+  def self.extract_callback_options(args)
     options = args.last.is_a?(Hash) ? args.pop : {}
-    if options && options.has_key?(:if)
-      options[:if] = [options[:if], default_if_option]
-    else
-      options[:if] = default_if_option
-    end
 
     options
   end

data/spec/application_service_spec.rb

@@ -9,35 +9,35 @@ describe ApplicationService do
     it "should allow set and get" do
       obj = double()
       as = ApplicationService.new
-      as.current_object= obj
-      as.current_object.should == obj
+      as.current_object = obj
+      expect(as.current_object).to eq(obj)
     end
   end
 
   describe "#save" do
     it "should let you save an object" do
       obj = double()
-      obj.stub(:new_record?).and_return(true)
-      obj.should_receive(:save)
+      allow(obj).to receive(:new_record?).and_return(true)
+      expect(obj).to receive(:save)
       subject.save(obj)
     end
 
     it "should trigger create" do
       obj = double()
-      obj.stub(:new_record?).and_return(true)
-      obj.stub(:save)
+      allow(obj).to receive(:new_record?).and_return(true)
+      allow(obj).to receive(:save)
 
-      subject.should_receive(:create)
+      expect(subject).to receive(:create)
       subject.save(obj)
     end
 
 
     it "should trigger update" do
       obj = double()
-      obj.stub(:new_record?).and_return(false)
-      obj.stub(:save)
+      allow(obj).to receive(:new_record?).and_return(false)
+      allow(obj).to receive(:save)
 
-      subject.should_receive(:update)
+      expect(subject).to receive(:update)
       subject.save(obj)
     end
   end
@@ -45,27 +45,27 @@ describe ApplicationService do
   describe "#save!" do
     it "should let you save an object" do
       obj = double()
-      obj.stub(:new_record?).and_return(true)
-      obj.should_receive(:save!)
+      allow(obj).to receive(:new_record?).and_return(true)
+      expect(obj).to receive(:save!)
       subject.save!(obj)
     end
 
     it "should trigger create" do
       obj = double()
-      obj.stub(:new_record?).and_return(true)
-      obj.stub(:save!)
+      allow(obj).to receive(:new_record?).and_return(true)
+      allow(obj).to receive(:save!)
 
-      subject.should_receive(:create!)
+      expect(subject).to receive(:create!)
       subject.save!(obj)
     end
 
 
     it "should trigger update" do
       obj = double()
-      obj.stub(:new_record?).and_return(false)
-      obj.stub(:save!)
+      allow(obj).to receive(:new_record?).and_return(false)
+      allow(obj).to receive(:save!)
 
-      subject.should_receive(:update!)
+      expect(subject).to receive(:update!)
       subject.save!(obj)
     end
   end
@@ -73,8 +73,8 @@ describe ApplicationService do
   describe "#update_attributes" do
     it "should trigger update" do
       obj = double()
-      obj.should_receive(:assign_attributes).with( {:foo => 'bar'}).and_return(:true)
-      obj.should_receive(:save)
+      expect(obj).to receive(:assign_attributes).with( {:foo => 'bar'}).and_return(:true)
+      expect(obj).to receive(:save)
 
       subject.update_attributes(obj, {:foo => 'bar'})
     end
@@ -83,7 +83,7 @@ describe ApplicationService do
   describe '#destroy' do
     it "should trigger destroy" do
       obj = double()
-      obj.should_receive(:destroy)
+      expect(obj).to receive(:destroy)
 
       subject.destroy(obj)
     end
@@ -159,7 +159,7 @@ describe ApplicationService do
           expect(service).to receive(:before_save_callback).once
           expect(service).to receive(:after_save_callback).once
 
-          expect { service.admin_save(object) }.to raise_error
+          expect { service.admin_save(object) }.to raise_error(StandardError)
 
           expect(object).to receive(:save).and_return(true)
 
@@ -209,12 +209,12 @@ describe ApplicationService do
         end
 
         service = service_klass.new
-        service.should_not_receive(:before_save_callback)
+        expect(service).to_not receive(:before_save_callback)
         service.save(object)
 
         invoke_callback = true
         service = service_klass.new
-        service.should_receive(:before_save_callback).and_return(true)
+        expect(service).to receive(:before_save_callback).and_return(true)
         service.save(object)
       end
 
@@ -226,42 +226,75 @@ describe ApplicationService do
         end
 
         service = service_klass.new
-        service.should_not_receive(:before_save_callback_1)
-        service.should_not_receive(:before_save_callback_2)
+        expect(service).not_to receive(:before_save_callback_1)
+        expect(service).not_to receive(:before_save_callback_2)
         service.save(object)
 
         invoke_callback = true
         service = service_klass.new
-        service.should_receive(:before_save_callback_1).and_return(true)
-        service.should_receive(:before_save_callback_2).and_return(true)
+        expect(service).to receive(:before_save_callback_1).and_return(true)
+        expect(service).to receive(:before_save_callback_2).and_return(true)
         service.save(object)
       end
 
       it "should not invoke callback if halted without options" do
-        pending('Need to look deeper on ActiveSupport::Callback code to understand how halt works')
-
         service_klass = Class.new(ApplicationService) do
-          before :save, :before_save_callback
+          before :save, :before_save_callback1, :before_save_callback2
         end
 
         service = service_klass.new
-        service.should_not_receive(:before_save_callback)
-        service.stub(:halted).and_return(true)
+        expect(service).not_to receive(:before_save_callback2)
+        allow(service).to receive(:before_save_callback1).and_return(false)
         service.save(object)
       end
 
-      it "should not invoke callback if halted with options" do
-        pending('Need to look deeper on ActiveSupport::Callback code to understand how halt works')
+      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
+        expect(service).to receive(:before_save_callback2)
+        allow(service).to receive(: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: 'true'
+          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.stub(:halted).and_return(true)
+        expect(service).not_to receive(:before_save_callback)
+        expect(service).to receive(:before_save_callback_2)
+
+        expect(object).to 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
+        allow(service).to receive(:before_save_callback).and_return(false)
+        expect(object).not_to 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
+        expect(service).to receive(:before_save_callback).and_return(true)
+        expect(service.save(object)).to eq(true)
+      end
     end
 
     describe '#after' do
@@ -273,12 +306,12 @@ describe ApplicationService do
         end
 
         service = service_klass.new
-        service.should_not_receive(:after_save_callback)
+        expect(service).not_to receive(:after_save_callback)
         service.save(object)
 
         invoke_callback = true
         service = service_klass.new
-        service.should_receive(:after_save_callback).and_return(true)
+        expect(service).to receive(:after_save_callback).and_return(true)
         service.save(object)
       end
 
@@ -290,16 +323,47 @@ describe ApplicationService do
         end
 
         service = service_klass.new
-        service.should_not_receive(:after_save_callback_1)
-        service.should_not_receive(:after_save_callback_2)
+        expect(service).not_to receive(:after_save_callback_1)
+        expect(service).not_to receive(:after_save_callback_2)
         service.save(object)
 
         invoke_callback = true
         service = service_klass.new
-        service.should_receive(:after_save_callback_1).and_return(true)
-        service.should_receive(:after_save_callback_2).and_return(true)
+        expect(service).to receive(:after_save_callback_1).and_return(true)
+        expect(service).to 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
+        expect(service).to 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
+        expect(service).not_to 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
+        expect(object).to receive(:save).and_return(false)
+        expect(service).not_to receive(:after_save_callback)
+        expect(service.save(object)).to eq(false)
+      end
     end
   end
 end

metadata

@@ -1,57 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: application_service
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.2.1
 description: A service layer scaffold for rails apps extracted from Agra
 email: woodhull@gmail.com
 executables: []
@@ -60,12 +72,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".document"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -84,17 +95,16 @@ 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: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Service Layer Scaffold

data/Gemfile.lock

@@ -1,71 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.6)
-    atomic (1.1.10)
-    builder (3.2.2)
-    diff-lcs (1.2.4)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.7)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (3.2.0)
-    highline (1.6.21)
-    i18n (0.6.4)
-    jeweler (1.8.8)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    minitest (4.7.5)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.2)
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  jeweler (~> 1.8.4)
-  rspec