application_service 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ee603240f72dc651aeac22e346c14444f57a0f26
-  data.tar.gz: cd49b620585510edabf4178ff85a57c37eff0bd2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTRmNDA2Y2RhZTQ1NDJhMDI4M2I1ZjQwNGZjODgxZDk3YmUyOTMwNA==
+  data.tar.gz: !binary |-
+    MWI2MDA5OWI2OWM5ZGE3NjMyOWIxZGE5NGQ5ZWM1ODljMzU2ZjlhMA==
 SHA512:
-  metadata.gz: 14b7a8fc47c6ae77cf4fa3d79b3f03888e4a8573044200eaed899d6c1d2726be8d1bfc997c2ba2ea0467660d23cbe36e2c17bcf83d43b7ba7de4db6beecdf0f5
-  data.tar.gz: f486c0061caf62f11ae63f0217c2bcff6b54ecb54cec779fccd28d17a28ccb61ea79250a92c83b930f1b03d26fd3a546631e0f08ef45fe362541bf7ff0ce88f1
+  metadata.gz: !binary |-
+    NjYxYzY4NjhkNDFmMjg4Y2RjNTNiNzUyYTkyYTQ3MzdhNzEyNWY1ZGI4NDc1
+    MmJiZTJiMGJlNDRhN2YzMTJmMjcxZjlmZTU0NjI2ODg2NGRhMjkyNDlhNWY2
+    YzE1MGYwZWZkZGI0NzEyYjRjZGQ2N2RkNjQwMTg1MzUwMzJiOGE=
+  data.tar.gz: !binary |-
+    YzUyMWY4ZDA2YTVhNzhkNTY4NTI1MjllMWEzNjI3ZDk3YTJhNmIyZTk4NDE5
+    Y2JlNjA1NmRhYzA3OWY0ZWNmZmU1NWMwMGZkMTZiNWQzZGNkNzJkZDk5ODNl
+    OWQwYzhiYWYwOTg2YmRkYmRmMmU2YjI1YWZmNjdmNDUwNzdjOTA=

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p286-perf
+1.9.3-p484

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/application_service.gemspec

@@ -0,0 +1,60 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: application_service 0.0.2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "application_service"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nathan Woodhull"]
+  s.date = "2014-01-10"
+  s.description = "A service layer scaffold for rails apps extracted from Agra"
+  s.email = "woodhull@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    ".ruby-gemset",
+    ".ruby-version",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "application_service.gemspec",
+    "lib/application_service.rb",
+    "spec/application_service_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/woodhull/application_service"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.1.11"
+  s.summary = "Service Layer Scaffold"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    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
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+

data/lib/application_service.rb

@@ -11,14 +11,18 @@ class ApplicationService
 
 
   def self.before(callback, *args)
+    options = extract_callback_options(args, '!halted')
+
     args.each do |arg|
-      set_callback callback, :before, arg, :if => "!halted"
+      set_callback callback, :before, arg, options
     end
   end
 
   def self.after(callback, *args)
+    options = extract_callback_options(args, "!halted && value")
+
     args.each do |arg|
-      set_callback callback, :after, arg, :if => "!halted && value"
+      set_callback callback, :after, arg, options
     end
   end
 
@@ -66,5 +70,15 @@ class ApplicationService
     end
   end
 
+  def self.extract_callback_options(args, default_if_option)
+    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
 
-end
+end

data/spec/application_service_spec.rb

@@ -52,4 +52,110 @@ describe ApplicationService do
     end
 
   end
-end
+
+  describe 'callbacks' do
+    let(:object) { double(new_record?: false, save: true) }
+
+    describe '#before' do
+      it "should allow option as last argument for single callback method" do
+        invoke_callback = false
+
+        service_klass = Class.new(ApplicationService) do
+          before :save, :before_save_callback, if: -> { invoke_callback }
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:before_save_callback)
+        service.save(object)
+
+        invoke_callback = true
+        service = service_klass.new
+        service.should_receive(:before_save_callback).and_return(true)
+        service.save(object)
+      end
+
+      it "should allow option as last argument for multiple callback methods" do
+        invoke_callback = false
+
+        service_klass = Class.new(ApplicationService) do
+          before :save, :before_save_callback_1, :before_save_callback_2, if: -> { invoke_callback }
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:before_save_callback_1)
+        service.should_not_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)
+        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
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:before_save_callback)
+        service.stub(:halted).and_return(true)
+        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'
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:before_save_callback)
+        service.stub(:halted).and_return(true)
+        service.save(object)
+      end
+    end
+
+    describe '#after' do
+      it "should allow option as last argument for single callback method" do
+        invoke_callback = false
+
+        service_klass = Class.new(ApplicationService) do
+          after :save, :after_save_callback, if: -> { invoke_callback }
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:after_save_callback)
+        service.save(object)
+
+        invoke_callback = true
+        service = service_klass.new
+        service.should_receive(:after_save_callback).and_return(true)
+        service.save(object)
+      end
+
+      it "should allow option as last argument for multiple callback methods" do
+        invoke_callback = false
+
+        service_klass = Class.new(ApplicationService) do
+          after :save, :after_save_callback_1, :after_save_callback_2, if: -> { invoke_callback }
+        end
+
+        service = service_klass.new
+        service.should_not_receive(:after_save_callback_1)
+        service.should_not_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)
+        service.save(object)
+      end
+    end
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: application_service
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-01-10 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
@@ -44,14 +44,16 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: !binary |-
+          MS44LjQ=
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: !binary |-
+          MS44LjQ=
 description: A service layer scaffold for rails apps extracted from Agra
 email: woodhull@gmail.com
 executables: []
@@ -70,6 +72,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- application_service.gemspec
 - lib/application_service.rb
 - spec/application_service_spec.rb
 - spec/spec_helper.rb
@@ -83,17 +86,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.0.4
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Service Layer Scaffold