state_machina 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d12ffeaf652cc4da21dfce6218b807c15234179973298ae52b5201f0439ae6
-  data.tar.gz: 06bddb26f70659df01bbc8a9e23cf586e0f616cc26b7ec1c267996a64342b7b2
+  metadata.gz: 72088dda2911712eec95b2a4915a9c62375cf43cfdde49338d58c32d448e108a
+  data.tar.gz: de86ad656d1abb2d6fd06d32dfc49e8030a2dfde4413194adafecfe679c086c3
 SHA512:
-  metadata.gz: 771e60029f66d6f0b8ea70c599335356ae9944e05d4148e7b8eccab34c18e5e506c3ee9b6ca69546789830abc0b52482ad26788e5414d66cec3b97e051c33380
-  data.tar.gz: 9302926d8356f8858b196a340665e455734d13897c464b4d1cd8a9363aad05a08eaacd3cd378a504b24054cd8c615bcb92a52921a0d5a1ca722563625ab92ec3
+  metadata.gz: a9f9d175b449b71693ccb0c879d7022831dbdc90aa6e5efd38d16961090bc235ba28e6952b9f8e4989ec5b1a5cf5ac00994bcdad79d01200fa48a13f1486ab28
+  data.tar.gz: 4fee723a2a9372cffd177c492c901b0e40aeb9d04025f2514e72dfb04b64929eaa8c572b10fb0ba4f3b1a8ed44d61adc7c90385f38fbec6c83e00f3cb1aded17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    state_machina (0.1.0)
+    state_machina (0.1.1)
       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/machine.rb

@@ -53,7 +53,11 @@ module StateMachina
     end
 
     def update_state(new_state)
-      model.public_send("#{column_name}=", new_state)
+      if model.respond_to?(:update)
+        model.update(column_name => new_state)
+      else
+        model.public_send("#{column_name}=", new_state)
+      end
     end
 
     private

data/lib/state_machina/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StateMachina
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 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.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-27 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,20 +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
-  end
-end