argon 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4bc7f87bd0b3e31f15e1c194ea49faac796ba68
-  data.tar.gz: 2dced65f814d1d838b57800dd7336bf30f1fbd1d
+  metadata.gz: 705eb7f43e327e729691ed9b48ad18653ad33de2
+  data.tar.gz: 42c30f0c9b3d22930c5a2f64a5884024b5d54667
 SHA512:
-  metadata.gz: e87960bccf2ec34fe5cf927566c8f714325ea79fe9e42eed57b374c5570148289f29e1ad44ccc0af0453b03620b92514c3008df551994c99bcedc5c9c476cdf0
-  data.tar.gz: '0619768228c23bba7e01dd756e99d66d82c14be9d0d30c2d14987341fea1d9bd5450854b9cb942e509910f912aeedc9c04be8d0cb13836cab098b6bc6604e03a'
+  metadata.gz: 97c1a137e2496e1b041497f1e0258316c4b64c67f86196e680f23c730b5c884390dba1bb80faf32ca5a66362b70f876a0fb06075c79140daa353b81781470cb3
+  data.tar.gz: 4aa1da9170c820b95e2e2de0419399146218bf2db251d69fe44b61ea9ea50738b9674b0b1e67d9eb13fb89de99592365ef50cd1c8c667e2a488b78560df065d6

data/argon.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rails"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "symbolic_enum", "~> 1.1.0"
 end

data/lib/argon/version.rb

@@ -1,3 +1,3 @@
 module Argon
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/argon.rb

@@ -4,12 +4,14 @@ require 'argon/invalid_transition_error'
 require 'argon/invalid_parameter_error'
 require 'active_support/concern'
 require 'active_support/inflector'
+require 'symbolic_enum'
 require 'pry-byebug'
 
 module Argon
   extend ActiveSupport::Concern
   extend ActiveSupport::Inflector
   include ActiveSupport::Inflector
+  include SymbolicEnum
 
   module ClassMethods
     def state_machine(mapping)
@@ -104,11 +106,11 @@ module Argon
         registered_edge_pairs << [from, to]
       end
 
-      raise Argon::Error.new("`on_successful_transition` must be a lambda of signature `(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 `(from:, to:)`") if on_successful_transition.parameters.to_set != [[:keyreq, :from],[:keyreq, :to]].to_set
+      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_failed_transition` must be a lambda of signature `(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 `(from:, to:)`") if on_failed_transition.parameters.to_set != [[:keyreq, :from],[:keyreq, :to]].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
 
       events_list.each do |event_name|
       end
@@ -130,24 +132,7 @@ module Argon
         self.class_variable_get(:@@state_machines || {})
       end
 
-      # Replicating enum functionality (partially)
-      define_singleton_method("#{ field.to_s.pluralize }") do
-        states_map
-      end
-
-      reverse_states_map = states_map.map{|v| [v[1],v[0]]}.to_h
-
-      define_method(field) do
-        reverse_states_map[self[field]]
-      end
-
-      states_map.each_pair do |state_name, state_value|
-        scope state_name, -> { where(field => state_value) }
-
-        define_method("#{ state_name }?".to_sym) do
-          self[field] == state_value
-        end
-      end
+      symbolic_enum field => states_map, disable_setters: true
 
       edges_list.each do |edge_details|
         from               = edge_details[:from]
@@ -176,7 +161,7 @@ module Argon
           end
 
           if self.send(field) != from
-            on_failed_transition.call(from: self.send(field), to: to)
+            on_failed_transition.call(record: self, from: self.send(field), to: to)
             raise Argon::InvalidTransitionError.new("Invalid state transition")
           end
 
@@ -198,11 +183,11 @@ module Argon
               end
             end
           rescue => e
-            on_failed_transition.call(from: self.send(field), to: to)
+            on_failed_transition.call(record: self, from: self.send(field), to: to)
             raise e
           end
 
-          on_successful_transition.call(from: from, to: to)
+          on_successful_transition.call(record: self, from: from, to: to)
 
           unless after_lock_callback.nil?
             if args.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argon
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ajith Hussain
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: symbolic_enum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: 
 email:
 - csy0013@googlemail.com