application_service 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235e898fc8f4abc701f68d1544f9d716a1d85b22dbab342f7e1b01e88c7beb55
-  data.tar.gz: 59c4f11f63cf3d71b519e033ca4b84a59465ae51d64f421c98327601366d2ae5
+  metadata.gz: d8f6fcf621468775e24be24281197c8e247de5ac87b2dcc57711880b368b6b00
+  data.tar.gz: 2916bad018667a7d9cb04b6c9e94a8f712434d7b9cb3bd8ab2b27420a3f5b59a
 SHA512:
-  metadata.gz: db1262eefac8b5e07799e355a4f75da20aa2f594a91db008386a26cce215acd053ce69202a46ad9f92a1c069bdae72bbe74e5a9ca0f85f59259dc30016a244fe
-  data.tar.gz: f62165d54067b9f38dc8622de53f053679255e99a98ae9a6b688ffbe4ddffe1f465c1115c04ede877a76647a40f1c790349b125c9c89544dc5822dd4c1f36ed8
+  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.6.6
+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

@@ -4,5 +4,6 @@ gem 'activesupport', '>= 5.0.0.1', '< 7.0'
 
 group :development do
   gem 'rspec', '~> 3.5'
+  gem 'rubocop'
   gem 'jeweler', '~> 2.2', '>= 2.2.1'
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

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.3.0 ruby lib
+# stub: application_service 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "application_service".freeze
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   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.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 = [
@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".rubocop.yml",
     ".ruby-gemset",
     ".ruby-version",
+    ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
@@ -35,7 +37,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/application_service".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "Service Layer Scaffold".freeze
 
   if s.respond_to? :specification_version then
@@ -45,10 +47,12 @@ Gem::Specification.new do |s|
   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>.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,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

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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nathan Woodhull
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -74,8 +88,10 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -89,7 +105,7 @@ homepage: http://github.com/woodhull/application_service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Service Layer Scaffold
 test_files: []