application_service 0.2.6 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8cf0e27732278a5b59314f2026b94c38fc60efc7
-  data.tar.gz: 69b3edb80cf28b33c0baf7f72316d43c340fd572
+SHA256:
+  metadata.gz: 87237dd34364ef71483ec478dde114e69e45c35210d2cd82e3369b9907db4940
+  data.tar.gz: 40f18312cd9606cee57a8cab09b0b72c8ceac1b056083c227e0697a630aad5ba
 SHA512:
-  metadata.gz: 81e3cdb81ea574a6b053162cb87e7051d349a4bed13f1f2b983df65b35be7e28562f9df1e9fad99b09c7b540f16c5c4d44be6cbbf3d943f19a03fd04543b5299
-  data.tar.gz: 25d83f5721dfdb39e91f5689aee236a53103cf91715e472a54081739369d1c10eb60c99b26af399ec34457c76a7525ee61e0f4ac53fb2a86234d94e8576b606f
+  metadata.gz: '029975f7377f57cd983358f5b82afe1ce291c879914044d312467b94b047f5586b68f27f090e76a3f28b783947a5460da2f721dfedb123f7f68d5b4f77991844'
+  data.tar.gz: 3d44b1b5efca69c3c15a1e65c33c5b786c9e101fccce1e206f99234e3b91424f41a2fc581dbc437aeffda8a8f52886af709d2616a07aae7bf8d488cf8dbb92ed

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rspec
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rubocop

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.5
+3.0.3

data/Gemfile

@@ -1,8 +1,9 @@
 source "http://rubygems.org"
 
-gem 'activesupport', '~> 5.0', '>= 5.0.0.1'
+gem 'activesupport', '>= 5.0.0.1'
 
 group :development do
   gem 'rspec', '~> 3.5'
+  gem 'rubocop'
   gem 'jeweler', '~> 2.2', '>= 2.2.1'
 end

data/README.md

@@ -0,0 +1,21 @@
+# application\_service
+
+A service layer for rails apps.
+
+[![CI Status](https://github.com/controlshift/application_service/actions/workflows/ci.yml/badge.svg)](https://github.com/controlshift/application_service/actions/workflows/ci.yml)
+
+## Contributing to application\_service
+
+- Check out the latest code from `main` to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+- Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+- Fork the project.
+- Start a feature/bugfix branch.
+- Commit and push until you are happy with your contribution.
+- Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+- Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2013 Nathan Woodhull. See LICENSE.txt for
+further details.
+

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.4.1

data/application_service.gemspec

@@ -2,30 +2,32 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: application_service 0.2.6 ruby lib
+# stub: application_service 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "application_service".freeze
-  s.version = "0.2.6"
+  s.version = "0.4.1"
 
   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 = "2018-12-03"
+  s.date = "2022-03-02"
   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"
+    "README.md"
   ]
   s.files = [
     ".document",
+    ".github/workflows/ci.yml",
     ".rspec",
+    ".rubocop.yml",
     ".ruby-gemset",
     ".ruby-version",
     "Gemfile",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "application_service.gemspec",
@@ -35,25 +37,23 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/application_service".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.12".freeze
+  s.rubygems_version = "3.2.32".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>.freeze, [">= 5.0.0.1", "~> 5.0"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5"])
-      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.2.1", "~> 2.2"])
-    else
-      s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0.1", "~> 5.0"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.5"])
-      s.add_dependency(%q<jeweler>.freeze, [">= 2.2.1", "~> 2.2"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.0.0.1"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5"])
+    s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.2", ">= 2.2.1"])
   else
-    s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0.1", "~> 5.0"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0.1"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 2.2.1", "~> 2.2"])
+    s.add_dependency(%q<rubocop>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.2", ">= 2.2.1"])
   end
 end
 

data/lib/application_service.rb

@@ -3,7 +3,7 @@ require 'active_support/all'
 class ApplicationService
 
   include ActiveSupport::Callbacks
-  define_callbacks :save, :create, :update, :destroy, {terminator: ->(target, result) { result.call == false }, skip_after_callbacks_if_terminated: true}
+  define_callbacks :save, :create, :update, :destroy, {terminator: ->(_target, result) { result.call == false }, skip_after_callbacks_if_terminated: true}
 
   def initialize
   end
@@ -67,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
 
@@ -104,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!)
@@ -129,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

@@ -71,13 +71,21 @@ describe ApplicationService do
   end
 
   describe "#update_attributes" do
+    let(:obj) { double(new_record?: false) }
+
     it "should trigger update" do
-      obj = double()
-      expect(obj).to receive(:assign_attributes).with( {:foo => 'bar'}).and_return(:true)
+      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
@@ -261,7 +269,7 @@ describe ApplicationService do
 
       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, if: -> { false }
           before :save, :before_save_callback_2
 
         end
@@ -288,7 +296,7 @@ describe ApplicationService do
 
       it "should invoke callback if conditional is true" do
         service_klass = Class.new(ApplicationService) do
-          before :save, :before_save_callback, if: 'true'
+          before :save, :before_save_callback, if: -> { true }
         end
 
         service = service_klass.new
@@ -336,7 +344,7 @@ describe ApplicationService do
 
       it "should invoke callback if conditional is true" do
         service_klass = Class.new(ApplicationService) do
-          after :save, :after_save_callback, if: 'true'
+          after :save, :after_save_callback, if: -> { true }
         end
 
         service = service_klass.new
@@ -346,7 +354,7 @@ describe ApplicationService do
 
       it 'should not invoke callback if conditional is false' do
         service_klass = Class.new(ApplicationService) do
-          after :save, :after_save_callback, if: 'false'
+          after :save, :after_save_callback, if: -> { false }
         end
 
         service = service_klass.new

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.6
+  version: 0.4.1
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -45,40 +39,56 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: 2.2.1
 description: A service layer scaffold for rails apps extracted from Agra
 email: woodhull@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - ".document"
+- ".github/workflows/ci.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - application_service.gemspec
@@ -104,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Service Layer Scaffold

data/README.rdoc

@@ -1,19 +0,0 @@
-= application_service
-
-A service layer for rails apps. 
-
-== Contributing to application_service
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2013 Nathan Woodhull. See LICENSE.txt for
-further details.
-