application_service 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5098843852847896293de30d2f5c4fecad1b3102
-  data.tar.gz: e0155d8b8a81b6b603446550cdc6828cbddc8d2a
+  metadata.gz: afad05d4876e7cafd22bb8bce2730a169cb9e029
+  data.tar.gz: 703a9e2891a39498f4b6de3bb9bb64cc63f85456
 SHA512:
-  metadata.gz: 2f7e81a4f71400cc1439cd684b2332cc847afec95e351fe8b35e050e3424b0d7206a3b3b5581fe5e6637b1f5b4cae287f9337376df79b9fe2564fe36fa393312
-  data.tar.gz: cef7d3d2b4cfc15fe1fe8d396b5921be18a4fc75f1d5330e496594d14ff14c41eb60ca4e8c82540615ed952f7f20ba47cba50df72046becdf9468e22d0522cc7
+  metadata.gz: 369f6259e634ab762d1869c4aa74be7d29a5b284ff0a5098c26e0368df46f6ba48c39d1595329bfd64912b1fb0fc9cc9d57553ed362cbff9637447c6e84ecde3
+  data.tar.gz: e94ab5a22735d6e25fd9a90087c53d2ee31fd7f8ebfc793cbe9c04e64fc3ec4e05e769b021b4e561ac0ce6f0b88a7b0bf51705dafcb7db4ac6f453dee53ea661

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.2.4

data/Gemfile.lock

@@ -1,14 +1,13 @@
 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)
+    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)
-    atomic (1.1.10)
     builder (3.2.2)
     diff-lcs (1.2.4)
     faraday (0.8.9)
@@ -23,7 +22,7 @@ GEM
       oauth2
     hashie (3.2.0)
     highline (1.6.21)
-    i18n (0.6.4)
+    i18n (0.7.0)
     jeweler (1.8.8)
       builder
       bundler (~> 1.0)
@@ -35,8 +34,8 @@ GEM
       rdoc
     json (1.8.1)
     jwt (1.0.0)
-    minitest (4.7.5)
-    multi_json (1.10.1)
+    minitest (5.8.4)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
@@ -58,9 +57,9 @@ GEM
     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)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -69,3 +68,6 @@ DEPENDENCIES
   activesupport
   jeweler (~> 1.8.4)
   rspec
+
+BUNDLED WITH
+   1.11.2

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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.2 ruby lib
+# stub: application_service 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "application_service"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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.date = "2016-01-26"
   s.description = "A service layer scaffold for rails apps extracted from Agra"
   s.email = "woodhull@gmail.com"
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/application_service"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "Service Layer Scaffold"
 
   if s.respond_to? :specification_version then

data/lib/application_service.rb

@@ -3,15 +3,14 @@ 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 == false }
 
   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 +21,7 @@ class ApplicationService
   end
 
   def self.after(callback, *args)
-    options = extract_callback_options(args, "!halted && value")
+    options = extract_callback_options(args)
 
     args.each do |arg|
       set_callback callback, :after, arg, options
@@ -127,13 +126,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

@@ -238,28 +238,23 @@ describe ApplicationService do
       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)
+        service.should_not_receive(:before_save_callback2)
+        service.stub(: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')
-
         service_klass = Class.new(ApplicationService) do
-          before :save, :before_save_callback, if: 'true'
+          before :save, :before_save_callback, if: 'false'
         end
 
         service = service_klass.new
         service.should_not_receive(:before_save_callback)
-        service.stub(:halted).and_return(true)
         service.save(object)
       end
     end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: application_service
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         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: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.4
 description: A service layer scaffold for rails apps extracted from Agra
@@ -60,10 +60,10 @@ 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
@@ -84,17 +84,17 @@ 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: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Service Layer Scaffold