estate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0777265b6deae44f96eb4fbc8f150bb73b1f2d98849107b9750eeb0ac025ca49
-  data.tar.gz: 916c2a835c05ed793d87e25883cb6999ebf87687c260f39eba90e994cf0aa228
+  metadata.gz: 4b3da0543146b0a82972f87969bc2278b1deb7ab600965370caf143bd8b342d7
+  data.tar.gz: e87a26965c47b976746059431196048fb2b03cb829475e5e1eabf48b80054694
 SHA512:
-  metadata.gz: 37e595f2f4451386df31a2b563af980037c90f91786760c9c88f9090418ffd3b640473bc5c2d16a1826c3646302d2041b151a0807d106e1dbc6c85dc126bbfbd
-  data.tar.gz: f939381283ace662a7d97169cc7e0bf26ad8d05a78eb40585f456e84768bda4474c1ae0501d5f7d232eb401d577341d2ce09f4fa3b02137adca8019e87c65114
+  metadata.gz: bd904b3f3dbcf36895fb76c3c76ce05c7cb4af45ab30150fb8d9becd2120c9a7add11ada7051396e3f5cfc7093702221b7f6e77de994e04e347f1018802ce0f3
+  data.tar.gz: c69b6df5691fcc4104c28e9ce5eb23ad294c54002a8ff32c498750074c7c6bded4bbe7cb0707d69f3abd23ab4f47e67b59ca25571784c008e63c41135620e76e

data/lib/estate/configuration.rb

@@ -2,16 +2,6 @@
 
 module Estate
   module Configuration
-    class << self
-      def init_config(column_name, allow_empty_initial_state, raise_on_error)
-        @column_name = column_name
-        @allow_empty_initial_state = allow_empty_initial_state
-        @raise_on_error = raise_on_error
-      end
-
-      attr_reader :column_name, :allow_empty_initial_state, :raise_on_error
-    end
-
     module Defaults
       COLUMN_NAME = :state
       ALLOW_EMPTY_INITIAL_STATE = false

data/lib/estate/estate.rb

@@ -5,7 +5,6 @@ module Estate
     base.extend Estate::ClassMethods
 
     Estate::Requirements.check_requirements(base)
-    Estate::StateMachine.create_store
     Estate::Setup.call(base)
   end
 
@@ -13,18 +12,18 @@ module Estate
     def estate(column: Estate::Configuration::Defaults::COLUMN_NAME,
                empty_initial_state: Estate::Configuration::Defaults::ALLOW_EMPTY_INITIAL_STATE,
                raise_on_error: Estate::Configuration::Defaults::RAISE_ON_ERROR)
-      Estate::Configuration.init_config(column, empty_initial_state, raise_on_error)
+      Estate::StateMachine.init(name, column, empty_initial_state, raise_on_error)
 
       yield if block_given?
     end
 
-    def state(name = nil)
-      raise(StandardError, 'state must be a Symbol or a String') unless Estate::StateMachine.argument_valid?(name)
+    def state(state_name = nil)
+      raise(StandardError, 'state must be a Symbol or a String') unless Estate::StateMachine.argument_valid?(state_name)
 
-      if Estate::StateMachine.state_exists?(name)
-        raise(StandardError, "state `:#{name}` is already defined")
+      if Estate::StateMachine.state_exists?(name, state_name)
+        raise(StandardError, "state `:#{state_name}` is already defined")
       else
-        Estate::StateMachine.register_state(name)
+        Estate::StateMachine.register_state(name, state_name)
       end
     end
 
@@ -35,15 +34,15 @@ module Estate
 
       raise(StandardError, 'argument `to` must be a Symbol or a String') unless Estate::StateMachine.argument_valid?(to)
 
-      raise(StandardError, "state `#{from}` is not defined") unless Estate::StateMachine.state_exists?(from)
+      raise(StandardError, "state `#{from}` is not defined") unless Estate::StateMachine.state_exists?(name, from)
 
-      raise(StandardError, "state `#{to}` is not defined") unless Estate::StateMachine.state_exists?(to)
+      raise(StandardError, "state `#{to}` is not defined") unless Estate::StateMachine.state_exists?(name, to)
 
-      if Estate::StateMachine.transition_exists?(from, to)
+      if Estate::StateMachine.transition_exists?(name, from, to)
         raise(StandardError, "`transition from: :#{from}, to: :#{to}` already defined")
       end
 
-      Estate::StateMachine.register_transition(from, to)
+      Estate::StateMachine.register_transition(name, from, to)
     end
   end
 end

data/lib/estate/logic/active_record/specific_logic.rb

@@ -11,7 +11,7 @@ module Estate
         module_function
 
         def add_error(instance, message, attribute: :base)
-          if Estate::Configuration.raise_on_error
+          if config_for(instance)[:raise_on_error]
             exception_message = attribute == :base ? message : "#{attribute}: #{message}"
             raise(StandardError, exception_message)
           else
@@ -20,8 +20,8 @@ module Estate
         end
 
         def get_states(instance)
-          from_state = instance.public_send("#{Estate::Configuration.column_name}_was")
-          to_state = instance.public_send(Estate::Configuration.column_name)
+          from_state = instance.public_send("#{config_for(instance)[:column_name]}_was")
+          to_state = instance.public_send(config_for(instance)[:column_name])
           [from_state, to_state]
         end
       end

data/lib/estate/logic/common_logic.rb

@@ -4,22 +4,29 @@ module Estate
   module Logic
     module CommonLogic
       def validate_state_changes(instance, from_state, to_state)
+        state_machine_name = instance.class.name
+
         if from_state == to_state
-          if from_state.nil? && !Estate::Configuration.allow_empty_initial_state
-            add_error(instance, "empty `#{Estate::Configuration.column_name}` is not allowed")
+          if from_state.nil? && !config_for(instance)[:empty_initial_state]
+            add_error(instance, "empty `#{config_for(instance)[:column_name]}` is not allowed")
           end
         elsif to_state.nil?
           add_error(instance, 'transition to empty state is not allowed')
-        elsif !Estate::StateMachine.state_exists?(to_state)
+        elsif !Estate::StateMachine.state_exists?(state_machine_name, to_state)
           add_error(instance, "state `#{to_state}` is not defined")
-        elsif !transition_allowed?(from_state, to_state)
+        elsif !transition_allowed?(state_machine_name, from_state, to_state)
           add_error(instance, "transition from `#{from_state}` to `#{to_state}` is not allowed",
-                    attribute: Estate::Configuration.column_name)
+                    attribute: config_for(instance)[:column_name])
         end
       end
 
-      def transition_allowed?(from_state, to_state)
-        from_state.nil? || Estate::StateMachine.transition_exists?(from_state, to_state)
+      def transition_allowed?(state_machine_name, from_state, to_state)
+        from_state.nil? || Estate::StateMachine.transition_exists?(state_machine_name, from_state, to_state)
+      end
+
+      def config_for(instance)
+        state_machine_name = instance.class.name
+        Estate::StateMachine.state_machines[state_machine_name][:config]
       end
     end
   end

data/lib/estate/logic/sequel/specific_logic.rb

@@ -16,8 +16,8 @@ module Estate
         end
 
         def get_states(instance)
-          from_state, = instance.column_change(Estate::Configuration.column_name)
-          to_state = instance.values[Estate::Configuration.column_name]
+          from_state, = instance.column_change(config_for(instance)[:column_name])
+          to_state = instance.values[config_for(instance)[:column_name]]
           [from_state, to_state]
         end
       end

data/lib/estate/state_machine.rb

@@ -3,34 +3,42 @@
 module Estate
   class StateMachine
     class << self
-      def create_store
-        @states = {}
-        @transitions = {}
+      def init(state_machine_name, column_name, empty_initial_state, raise_on_error)
+        @state_machines ||= {}
+        @state_machines[state_machine_name] = {
+          config: {
+            column_name: column_name,
+            empty_initial_state: empty_initial_state, # TODO: allow_empty_initial_state ?
+            raise_on_error: raise_on_error
+          },
+          states: {},
+          transitions: {}
+        }
       end
 
-      def state_exists?(state)
-        states.key?(state.to_sym)
+      def state_exists?(state_machine_name, state_name)
+        state_machines[state_machine_name][:states].key?(state_name.to_sym)
       end
 
-      def register_state(state)
-        states[state.to_sym] = nil
+      def register_state(state_machine_name, state_name)
+        state_machines[state_machine_name][:states][state_name.to_sym] = nil
       end
 
-      def transition_exists?(from_state, to_state)
+      def transition_exists?(state_machine_name, from_state, to_state)
         transition_key = { from: from_state.to_sym, to: to_state.to_sym }
-        transitions.key?(transition_key)
+        state_machines[state_machine_name][:transitions].key?(transition_key)
       end
 
-      def register_transition(from_state, to_state)
+      def register_transition(state_machine_name, from_state, to_state)
         transition_key = { from: from_state.to_sym, to: to_state.to_sym }
-        transitions[transition_key] = nil
+        state_machines[state_machine_name][:transitions][transition_key] = nil
       end
 
       def argument_valid?(argument)
         argument.is_a?(Symbol) || argument.is_a?(String)
       end
 
-      attr_reader :states, :transitions
+      attr_reader :state_machines
     end
   end
 end

data/lib/estate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Estate
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: estate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Igor Korepanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop