argon 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f853de6635b2fa7f7f2396dbd717b887db8551b4
-  data.tar.gz: bde251e06db6bbca9139ffaca646324baf6b2292
+  metadata.gz: b09160785840c5182b6b589f4d5f54b0d63195a1
+  data.tar.gz: 5a41ae363e257e607726e453304da872849546b2
 SHA512:
-  metadata.gz: a0c5d625c54084e0ef75160f1e898201c16bd96bd004aaccf672858b8fc190e2f8afe7abd9262e62e6c177bcf8c65683879f40646a519742021ede2079402278
-  data.tar.gz: 77212e155468547c7fc3656ed6715b97184e8ee4b8b8b519b44a8bbe1c78245a882b169629504f95d0d5399877489a9e2fccc389b472b09fba4afa5aad391274
+  metadata.gz: a1f0d95b2405e163b88c8a07f7636fe9150fe8be919220ed97505efc1cc8bbe7d5dd3aff08cfc26c16960c6410703b1c1246e209699971e2d8afd76eae79ac5b
+  data.tar.gz: a6ff9a9fc30fafc0f44e9b4c7be3ddcbef2493f04c8b4878f13a5ac68b5deee39942396f6ef4f20cd1ca5df84d996a6db9543cf5894c78e2096a07be0f07f56d

data/lib/argon.rb

@@ -103,11 +103,13 @@ module Argon
         end
       end
 
-      raise Argon::Error.new("`on_successful_transition` must be a lambda of signature `(record:, from:, to:)`") if !on_successful_transition.nil? && !on_successful_transition.is_a?(Proc)
-      raise Argon::Error.new("`on_successful_transition` must be a lambda of signature `(record:, from:, to:)`") if on_successful_transition.parameters.to_set != [[:keyreq, :record],[:keyreq, :from],[:keyreq, :to]].to_set
+      raise Argon::Error.new("`on_successful_transition` must be a boolean") unless [true, false].include?(on_successful_transition)
+      raise Argon::Error.new("`on_successful_transition` must be a method of signature `(field:, action:, from:, to:)`") if on_successful_transition && !self.instance_methods.include?(:on_successful_transition)
+      raise Argon::Error.new("`on_successful_transition` must be a method of signature `(field:, action:, from:, to:)`") if on_successful_transition && self.instance_method(:on_successful_transition).parameters.to_set != %i(field action from to).map{|f| [:keyreq, f] }.to_set
 
-      raise Argon::Error.new("`on_failed_transition` must be a lambda of signature `(record:, from:, to:)`") if !on_failed_transition.nil? && !on_failed_transition.is_a?(Proc)
-      raise Argon::Error.new("`on_failed_transition` must be a lambda of signature `(record:, from:, to:)`") if on_failed_transition.parameters.to_set != [[:keyreq, :record],[:keyreq, :from],[:keyreq, :to]].to_set
+      raise Argon::Error.new("`on_failed_transition` must be a boolean") unless [true, false].include?(on_failed_transition)
+      raise Argon::Error.new("`on_failed_transition` must be a method of signature `(field:, action:, from:, to:)`") if on_failed_transition && !self.instance_methods.include?(:on_failed_transition)
+      raise Argon::Error.new("`on_failed_transition` must be a method of signature `(field:, action:, from:, to:)`") if on_failed_transition && self.instance_method(:on_failed_transition).parameters.to_set != %i(field action from to).map{|f| [:keyreq, f] }.to_set
 
       events_list.each do |event_name|
       end
@@ -158,7 +160,9 @@ module Argon
           end
 
           if self.send(field) != from
-            on_failed_transition.call(record: self, from: self.send(field), to: to)
+            if on_failed_transition
+              self.on_failed_transition(field: field, action: action, from: from, to: to)
+            end
             raise Argon::InvalidTransitionError.new("Invalid state transition")
           end
 
@@ -184,11 +188,15 @@ module Argon
               end
             end
           rescue => e
-            on_failed_transition.call(record: self, from: self.send(field), to: to)
+            if on_failed_transition
+              self.on_failed_transition(field: field, action: action, from: from, to: to)
+            end
             raise e
           end
 
-          on_successful_transition.call(record: self, from: from, to: to)
+          if on_successful_transition
+            self.on_successful_transition(field: field, action: action, from: from, to: to)
+          end
 
           unless after_lock_callback.nil?
             if args.empty?

data/lib/argon/version.rb

@@ -1,3 +1,3 @@
 module Argon
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argon
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Ajith Hussain
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler