state_machina 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96e79a8445f5e634f2960c84426f8077c14a47d194b3c57aaf6c42d4af3f051a
-  data.tar.gz: 5e468a6142945e806388559b25acd51de47e572a2db00f5e98031ed369515fe9
+  metadata.gz: f1ce6ace127413c5e3ea50cc6163740defad6f378f3485716cbbd8bcd1e301bd
+  data.tar.gz: a42a94cb064e593a95f9d4d13750ce3dc850e51b2882570749ca03b4df667c94
 SHA512:
-  metadata.gz: 70ba62ffb247210651920127acb68c00db4d8e21acd5440f48c58d92f21ede835acb3cc6bf8bdc41027a25919b86ca5c8a4796280af7988a6f42906959f1c164
-  data.tar.gz: 271323b162d7617010f34080d093efcaa588edfd80b60c481178a8aa3844d45df8a0a5d1728497e79f5550d9bc762f41529daedbc9560f3380f7a03f1aa2b7a3
+  metadata.gz: c50c65b8264fc4149a0560e3b2ac6cd3d53e6dab4dea14b5731cf50380917b003811a5b0cad2e808772dbc16eef0318601505fe36efe2373a7eadc8765b0aa0d
+  data.tar.gz: 415f21703f10b5d1094bb8c78972ea47a70a3f152be7d781e38901aee8be75a15229a7a5d088dfdc347ef41db10c58ec50f31c54d024f9d562dc20318a0dd07a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    state_machina (0.1.0)
+    state_machina (0.1.2)
       concurrent-ruby (< 2)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     method_source (1.0.0)
     parallel (1.21.0)

data/lib/state_machina/extended_integration.rb

@@ -0,0 +1,18 @@
+module StateMachina
+  module ExtendedIntegration
+    module ClassMethods
+      # Extends a machine on a model where the machine is already defined
+      def extend_machine(klass, machine_name = 'default')
+        model_name = StateMachina::Util.normalized_klass_to_name(klass)
+
+        yield(StateMachina::Registry.find_machine!(model_name, machine_name))
+      end
+
+      alias_method :extend_state_machine, :extend_machine
+    end
+
+    def self.included(model)
+      model.extend(StateMachina::ExtendedIntegration::ClassMethods)
+    end
+  end
+end

data/lib/state_machina/integration.rb

@@ -1,9 +1,49 @@
 module StateMachina
   module Integration
+    module ClassMethods
+      # Defines a new machine on a model
+      def define_machine(machine_name = 'default', column_name: :state, metadata: {})
+        model_name = StateMachina::Util.normalized_klass_to_name(self)
+        machine = StateMachina::Machine.new(model_name, machine_name, column_name: column_name, metadata: metadata)
+
+        yield(StateMachina::Registry.register_machine(machine))
+      end
+
+      alias_method :define_state_machine, :define_machine
+
+      # Extends a machine on a model where the machine is already defined
+      def extend_machine(klass, machine_name = 'default')
+        model_name = StateMachina::Util.normalized_klass_to_name(klass)
+
+        yield(StateMachina::Registry.find_machine!(model_name, machine_name))
+      end
+
+      alias_method :extend_state_machine, :extend_machine
+
+      # Returns the defined machine on a model
+      def machine(machine_name = 'default')
+        model_name = StateMachina::Util.normalized_klass_to_name(self)
+
+        StateMachina::Registry.find_machine!(model_name, machine_name)
+      end
+
+      alias_method :state_machine, :machine
+
+      # Returns the defined machines on a model
+      def machines
+        model_name = StateMachina::Util.normalized_klass_to_name(self)
+
+        StateMachina::Registry.find_machines(model_name)
+      end
+
+      alias_method :state_machines, :machines
+    end
+
     def self.included(model)
-      model.extend StateMachina::Definitions
+      model.extend(StateMachina::Integration::ClassMethods)
     end
 
+    # Returns the defined machine on a model instance
     def machine(machine_name = 'default')
       model_name = StateMachina::Util.normalized_klass_to_name(self.class)
 
@@ -14,6 +54,7 @@ module StateMachina
 
     alias_method :state_machine, :machine
 
+    # Returns the defined machines on a model instance
     def machines
       model_name = StateMachina::Util.normalized_klass_to_name(self.class)
 

data/lib/state_machina/registry.rb

@@ -9,7 +9,7 @@ module StateMachina
     end
 
     def self.find_machine!(model_name, machine_name)
-      machines.fetch(model_name.to_s, {}).fetch(machine_name.to_s) || raise(NoMachineFoundError, "for model: #{model_name}, with name: #{machine_name}")
+      machines.fetch(model_name.to_s, {}).fetch(machine_name.to_s, nil) || raise(NoMachineFoundError, "for model: #{model_name}, with name: #{machine_name}")
     end
 
     def self.register_machine(machine)

data/lib/state_machina/transition.rb

@@ -21,6 +21,7 @@ module StateMachina
     end
 
     def permitted?
+      return false unless possible?
       return true if guard.nil?
       return false if guard_context.nil?
 

data/lib/state_machina/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StateMachina
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/state_machina.rb

@@ -2,9 +2,9 @@
 
 require "concurrent"
 
-require_relative "state_machina/definitions"
 require_relative "state_machina/event"
 require_relative "state_machina/events_collection"
+require_relative "state_machina/extended_integration"
 require_relative "state_machina/integration"
 require_relative "state_machina/machine"
 require_relative "state_machina/registry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: state_machina
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -56,9 +56,9 @@ files:
 - README.md
 - Rakefile
 - lib/state_machina.rb
-- lib/state_machina/definitions.rb
 - lib/state_machina/event.rb
 - lib/state_machina/events_collection.rb
+- lib/state_machina/extended_integration.rb
 - lib/state_machina/integration.rb
 - lib/state_machina/machine.rb
 - lib/state_machina/registry.rb

data/lib/state_machina/definitions.rb

@@ -1,26 +0,0 @@
-module StateMachina
-  module Definitions
-    def machine(machine_name = 'default', column_name: :state, metadata: {})
-      model_name = StateMachina::Util.normalized_klass_to_name(self)
-      machine = StateMachina::Machine.new(model_name, machine_name, column_name: column_name, metadata: metadata)
-
-      yield(StateMachina::Registry.register_machine(machine))
-    end
-
-    alias_method :state_machine, :machine
-
-    def extend_machine(klass, machine_name = 'default')
-      model_name = StateMachina::Util.normalized_klass_to_name(klass)
-
-      yield(StateMachina::Registry.find_machine!(model_name, machine_name))
-    end
-
-    alias_method :extend_state_machine, :extend_machine
-
-    def find_machine(machine_name = 'default')
-      model_name = StateMachina::Util.normalized_klass_to_name(self)
-
-      StateMachina::Registry.find_machine!(model_name, machine_name)
-    end
-  end
-end