application_service 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afad05d4876e7cafd22bb8bce2730a169cb9e029
-  data.tar.gz: 703a9e2891a39498f4b6de3bb9bb64cc63f85456
+SHA256:
+  metadata.gz: d8f6fcf621468775e24be24281197c8e247de5ac87b2dcc57711880b368b6b00
+  data.tar.gz: 2916bad018667a7d9cb04b6c9e94a8f712434d7b9cb3bd8ab2b27420a3f5b59a
 SHA512:
-  metadata.gz: 369f6259e634ab762d1869c4aa74be7d29a5b284ff0a5098c26e0368df46f6ba48c39d1595329bfd64912b1fb0fc9cc9d57553ed362cbff9637447c6e84ecde3
-  data.tar.gz: e94ab5a22735d6e25fd9a90087c53d2ee31fd7f8ebfc793cbe9c04e64fc3ec4e05e769b021b4e561ac0ce6f0b88a7b0bf51705dafcb7db4ac6f453dee53ea661
+  metadata.gz: 246018e2846dae816ac311825c5d5a5e8867bf010fad635d3b852508c63a6ebf419893e0d2ab3cde248e2532bffccf7801268577de040d2f474bc2b9dd86694c
+  data.tar.gz: ce54981d596afff4f2e5d664083f7b530707640d1fba7ead3ee3c2161a0d3315562e61928fcf0c502fb39a4c57b214159acd223651684787f1203b08e0329f32

data/.rubocop.yml

@@ -0,0 +1,26 @@
+AllCops:
+  DisabledByDefault: true
+
+Security:
+  Enabled: true
+
+Bundler/DuplicatedGem:
+  Enabled: true
+Bundler/InsecureProtocolSource:
+  Enabled: true
+Layout/IndentationStyle:
+  Enabled: true
+Layout/SpaceInsideRangeLiteral:
+  Enabled: true
+Lint:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Naming/AsciiIdentifiers:
+  Enabled: true
+Naming/ClassAndModuleCamelCase:
+  Enabled: true
+Naming/ConstantName:
+  Enabled: true
+Naming/FileName:
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.7.3

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.7
+cache: bundler
+before_install:
+  - gem install bundler
+script:
+  - bundle exec rspec
+  - bundle exec rubocop

data/Gemfile

@@ -1,13 +1,9 @@
 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 'rubocop'
+  gem 'jeweler', '~> 2.2', '>= 2.2.1'
 end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.4.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.3 ruby lib
+# stub: application_service 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "application_service"
-  s.version = "0.2.3"
+  s.name = "application_service".freeze
+  s.version = "0.4.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 = "2016-01-26"
-  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 = "2021-05-20"
+  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"
@@ -21,10 +21,11 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".rubocop.yml",
     ".ruby-gemset",
     ".ruby-version",
+    ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -34,27 +35,25 @@ 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.4.8"
-  s.summary = "Service Layer Scaffold"
+  s.homepage = "http://github.com/woodhull/application_service".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.6".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<rubocop>.freeze, ["~> 1.15"])
+    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<rubocop>.freeze, ["~> 1.15"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.2", ">= 2.2.1"])
   end
 end
 

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.call == 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)
@@ -63,16 +67,16 @@ class ApplicationService
     end
   end
 
-  def update_attributes(obj, params)
+  def update_attributes(obj, params, with_admin_save: false)
     @obj = obj
     @obj.assign_attributes(params)
 
     yield if block_given?
 
-    run_callbacks :save do
-      run_callbacks :update do
-         @obj.save
-      end
+    if with_admin_save
+      self.admin_save(obj)
+    else
+      self.save(obj)
     end
   end
 
@@ -100,6 +104,12 @@ class ApplicationService
     @on_admin_save = false
   end
 
+  def self.extract_callback_options(args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+
+    options
+  end
+
   private
 
   def create!(save_method=:save!)
@@ -125,13 +135,4 @@ class ApplicationService
       @obj.send(save_method)
     end
   end
-
-  private
-
-  def self.extract_callback_options(args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-
-    options
-  end
-
 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,45 +45,53 @@ 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
 
   describe "#update_attributes" do
+    let(:obj) { double(new_record?: false) }
+
     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
+
+    it 'should trigger admin_save if argument is true' do
+      expect(obj).to receive(:assign_attributes).with( {:foo => 'bar'}).and_return(true)
+      expect(obj).to receive(:admin_save)
+
+      subject.update_attributes(obj, {:foo => 'bar'}, with_admin_save: true)
+    end
   end
 
   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 +167,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 +217,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,14 +234,14 @@ 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
 
@@ -243,20 +251,58 @@ describe ApplicationService do
         end
 
         service = service_klass.new
-        service.should_not_receive(:before_save_callback2)
-        service.stub(:before_save_callback1).and_return(false)
+        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
+      it "should invoke callback if callback successful" do
         service_klass = Class.new(ApplicationService) do
-          before :save, :before_save_callback, if: 'false'
+          before :save, :before_save_callback1, :before_save_callback2
         end
 
         service = service_klass.new
-        service.should_not_receive(:before_save_callback)
+        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: -> { false }
+          before :save, :before_save_callback_2
+
+        end
+
+        service = service_klass.new
+        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
@@ -268,12 +314,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
 
@@ -285,16 +331,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

data/spec/spec_helper.rb

@@ -5,8 +5,8 @@ require 'application_service'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].sort.each { |f| require f }
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: application_service
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Nathan Woodhull
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,68 @@ dependencies:
     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: '0'
+        version: 5.0.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 - !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: 1.8.4
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 description: A service layer scaffold for rails apps extracted from Agra
 email: woodhull@gmail.com
 executables: []
@@ -62,10 +88,11 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -78,7 +105,7 @@ homepage: http://github.com/woodhull/application_service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Service Layer Scaffold
 test_files: []

data/Gemfile.lock

@@ -1,73 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.2.5.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    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.7.0)
-    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 (5.8.4)
-    multi_json (1.11.2)
-    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.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  jeweler (~> 1.8.4)
-  rspec
-
-BUNDLED WITH
-   1.11.2