state_machina 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31ba09ef350378e653c3f7c99c3ade469cdb2da45bffebd2669ab7e61e316a8c
-  data.tar.gz: 97b54c53c83db2dbc0fe7e25664b0feb98ef7b82b7c8a5ad5dde536aaba24f8f
+  metadata.gz: 3f0a424d08f9a7c3103b4e1eca3d27cda85089c72c25fecdceaad77bf4ba7ad1
+  data.tar.gz: 5eb6269265360180bc155872205765ae49574e593b1614ec003125ab8109c27a
 SHA512:
-  metadata.gz: 1edbdd79a822c472e7eadb77869c68282c467f36602a323214170af7690dce27e18dec9b53f821690f47a65c7a189fb4441d1df8ed48301e96b05c855a71ea63
-  data.tar.gz: ed5e069229f0b4c8d6abae3fe050a97b73066a784b6abfe94d2e37a940a8b86f5cf4251fa1e6a9d632ad16af9743675e06c6b0e081a8566a41347459e08f7f1b
+  metadata.gz: 3f19e17c7e7ac1f8420027b727954bac2677878ef4c9bc2c8b9b8a17af09b9902b7d00f170d3eea7cab154caa90a0e13382a4237f4adbed5c2436f5958608bf5
+  data.tar.gz: ee4ba5d3bdc4aa9e4f6fa03612312a5f53215fdabf270d99d032a1e4ba73a72429dc45b1bc3166de030b34217c8c03288cf4458ce35a95b9dd16e5b32f0f00cf

data/Gemfile

@@ -10,3 +10,5 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
+
+gem "activesupport", "< 8", require: false

data/Gemfile.lock

@@ -1,17 +1,25 @@
 PATH
   remote: .
   specs:
-    state_machina (0.1.5)
+    state_machina (0.1.6)
       concurrent-ruby (< 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.8.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     ast (2.4.2)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
     diff-lcs (1.5.0)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
     method_source (1.0.0)
+    minitest (5.22.3)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
@@ -47,14 +55,19 @@ GEM
     rubocop-ast (1.16.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
     unicode-display_width (2.1.0)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
 
 DEPENDENCIES
+  activesupport (< 8)
   pry (< 0.15)
   rake (~> 13.0)
   rspec (~> 3.0)

data/lib/state_machina/event.rb

@@ -19,11 +19,12 @@ module StateMachina
     end
 
     def transitions
-      transitions = StateMachina::Registry.find_transitions(model_name, machine_name, name)
+      transitions = StateMachina::Registry.find_transitions(model_name, machine_name, name).map(&:dup)
       transitions.each do |transition|
         transition.machine = machine
         transition.guard_context = guard_context
       end
+
       transitions
     end
 
@@ -32,9 +33,7 @@ module StateMachina
     end
 
     def resolve_to_transition
-      transitions.find do |transition|
-        transition.possible? && transition.permitted?
-      end
+      transitions.find(&:permitted?)
     end
 
     def possible?

data/lib/state_machina/integration.rb

@@ -47,7 +47,7 @@ module StateMachina
     def machine(machine_name = 'default')
       model_name = StateMachina::Util.normalized_klass_to_name(self.class)
 
-      machine = StateMachina::Registry.find_machine!(model_name, machine_name)
+      machine = StateMachina::Registry.find_machine!(model_name, machine_name).dup
       machine.model = self
       machine
     end
@@ -58,7 +58,7 @@ module StateMachina
     def machines
       model_name = StateMachina::Util.normalized_klass_to_name(self.class)
 
-      machines = StateMachina::Registry.find_machines(model_name)
+      machines = StateMachina::Registry.find_machines(model_name).map(&:dup)
       machines.map do |machine|
         machine.model = self
         machine

data/lib/state_machina/machine.rb

@@ -3,6 +3,8 @@ module StateMachina
     attr_reader :model_name, :name, :column_name, :metadata
     attr_accessor :model
 
+    delegate :before?, :before_inclusive?, :past?, :past_inclusive?, :between?, :between_inclusive?, to: :current_state
+
     def initialize(model_name, name, column_name: :state, metadata: {})
       @model_name = model_name
       @name = name.to_s
@@ -23,7 +25,7 @@ module StateMachina
     end
 
     def states
-      states = StateMachina::Registry.find_states(model_name, name).values
+      states = StateMachina::Registry.find_states(model_name, name).values.map(&:dup)
       states.each do |state|
         state.machine = self
       end
@@ -32,7 +34,7 @@ module StateMachina
     end
 
     def events(possible: false, permitted: false, guard_context: model)
-      events = StateMachina::Registry.find_events(model_name, name).values
+      events = StateMachina::Registry.find_events(model_name, name).values.map(&:dup)
       events.each do |event|
         event.machine = self
         event.guard_context = guard_context

data/lib/state_machina/registry.rb

@@ -14,7 +14,7 @@ module StateMachina
 
     def self.register_machine(machine)
       machines[machine.model_name] ||= {}
-      machines[machine.model_name][machine.name] = machine
+      machines[machine.model_name][machine.name] = machine.freeze
 
       machine
     end
@@ -30,7 +30,7 @@ module StateMachina
     def self.register_state(state)
       states[state.model_name] ||= {}
       states[state.model_name][state.machine_name] ||= {}
-      states[state.model_name][state.machine_name][state.name] = state
+      states[state.model_name][state.machine_name][state.name] = state.freeze
 
       state
     end
@@ -46,7 +46,7 @@ module StateMachina
     def self.register_event(event)
       events[event.model_name] ||= {}
       events[event.model_name][event.machine_name] ||= {}
-      events[event.model_name][event.machine_name][event.name] = event
+      events[event.model_name][event.machine_name][event.name] = event.freeze
 
       event
     end
@@ -63,7 +63,7 @@ module StateMachina
       transitions[transition.model_name] ||= {}
       transitions[transition.model_name][transition.machine_name] ||= {}
       transitions[transition.model_name][transition.machine_name][transition.event_name] ||= []
-      transitions[transition.model_name][transition.machine_name][transition.event_name].append(transition)
+      transitions[transition.model_name][transition.machine_name][transition.event_name].append(transition.freeze)
 
       transition
     end

data/lib/state_machina/state.rb

@@ -13,25 +13,25 @@ module StateMachina
     def before?(other_state_name)
       return false if machine.nil?
 
-      !machine.states.before(machine.current_state_name).map(&:name).include?(other_state_name)
+      machine.states.before(other_state_name).map(&:name).include?(machine.current_state_name)
     end
 
     def before_inclusive?(other_state_name)
       return false if machine.nil?
 
-      !machine.states.before_inclusive(machine.current_state_name).map(&:name).include?(other_state_name)
+      machine.states.before_inclusive(other_state_name).map(&:name).include?(machine.current_state_name)
     end
 
     def past?(other_state_name)
       return false if machine.nil?
 
-      !machine.states.past(machine.current_state_name).map(&:name).include?(other_state_name)
+      machine.states.past(other_state_name).map(&:name).include?(machine.current_state_name)
     end
 
     def past_inclusive?(other_state_name)
       return false if machine.nil?
 
-      !machine.states.past_inclusive(machine.current_state_name).map(&:name).include?(other_state_name)
+      machine.states.past_inclusive(other_state_name).map(&:name).include?(machine.current_state_name)
     end
 
     def between?(from_state_name, to_state_name)

data/lib/state_machina/states_collection.rb

@@ -21,7 +21,10 @@ module StateMachina
     end
 
     def before(state_name)
-      to_a[..(index_by_name(state_name) - 1)]
+      index = index_by_name(state_name) - 1
+      return [] if index.negative?
+
+      to_a[..index]
     end
 
     def before_inclusive(state_name)
@@ -37,11 +40,17 @@ module StateMachina
     end
 
     def between(from_state_name, to_state_name)
-      to_a[index_by_name(from_state_name)...index_by_name(to_state_name)]
+      indexes = [index_by_name(from_state_name), index_by_name(to_state_name)]
+      raise(ArgumentError, "to_state should be higher than from_state") if indexes != indexes.sort
+
+      to_a[indexes[0]...indexes[1]]
     end
 
     def between_inclusive(from_state_name, to_state_name)
-      to_a[index_by_name(from_state_name)..index_by_name(to_state_name)]
+      indexes = [index_by_name(from_state_name), index_by_name(to_state_name)]
+      raise(ArgumentError, "to_state should be higher than from_state") if indexes != indexes.sort
+
+      to_a[indexes[0]..indexes[1]]
     end
 
     private

data/lib/state_machina/version.rb

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

data/lib/state_machina.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "concurrent"
+require "active_support/core_ext/module/delegation"
 
 require_relative "state_machina/event"
 require_relative "state_machina/events_collection"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: state_machina
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby