state_machina 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dafbf3b6c0e98deba3f63e96af9dc514736a486e1c899ef3160085141c987a95
-  data.tar.gz: c243f44bf6bc3c1fed703a8233ad9afe8f712081b946a7f72e3a227d621e0567
+  metadata.gz: 3f0a424d08f9a7c3103b4e1eca3d27cda85089c72c25fecdceaad77bf4ba7ad1
+  data.tar.gz: 5eb6269265360180bc155872205765ae49574e593b1614ec003125ab8109c27a
 SHA512:
-  metadata.gz: 685b1a4811ba9ce5949ade06712bb1381c88d4cec75d8677b125797e5095abc8b1de51f089450ac5e2cc335e829a2431251cf8f43924ca1fde074eee8b258360
-  data.tar.gz: b6c32281cef34382ad98b978c9f2df9204b96e15e2ffea630fd3dabd8a88ff63a1b53944549f63a24d7a17fb20626a7a1ef2ddb36eb84635dd68b13a761f57ff
+  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

@@ -7,11 +7,19 @@ PATH
 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/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

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.6"
+  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.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -68,7 +68,6 @@ files:
 - lib/state_machina/util.rb
 - lib/state_machina/version.rb
 - sig/state_machina.rbs
-- state_machina.gemspec
 homepage:
 licenses:
 - MIT

data/state_machina.gemspec

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/state_machina/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "state_machina"
-  spec.version = StateMachina::VERSION
-  spec.authors = ["Jan van der Pas"]
-  spec.email = ["jan.vanderpas@beequip.nl"]
-
-  spec.summary = "State machine supporting multiple machines per object"
-  # spec.description = "TODO: Write a longer description or delete this line."
-  # spec.homepage = "TODO: Put your gem's website or public repo URL here."
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
-
-  # spec.metadata["homepage_uri"] = spec.homepage
-  # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "concurrent-ruby", "< 2"
-  spec.add_development_dependency "pry", "< 0.15"
-end