finite_machine 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0927d8bb3748c70aaf7c257b64baad97fecd95f609bcfe916d5f6f017bd9483c'
-  data.tar.gz: b571c8bbec3efbe87c92b3d6b789a416159980cf3bf61605baef8dbb95d1aad0
+  metadata.gz: 15958842bd437354dba874d9b4a50ade99a2a41f4bc12353ccfd8154e391a367
+  data.tar.gz: 66f77251b336d802430769a83e635b4b52d689ac202d45a52b9aaec8b7fa8ff2
 SHA512:
-  metadata.gz: c7fc9e56117dd2c0f47bd58fcda2f83517feea908382160bc402638742f54b2f6541f3cdef812995f7f44c64a9d3d9852e70e4aff3a8fdaf5cf0109bfbcf7883
-  data.tar.gz: 05cfeb53284406a2ddb4815f11bd349b6ded5bfaa2d25b2897ed51a3913d89ed36f58e9f108f59fc5098f14131860c2e0d1d8d37735fc6ff76e2fa17cb9982a6
+  metadata.gz: 2e53a7002f0f60cbf2d68ccf2b3eae07674fafd4cfb831837f52e20589696d0f4e6476d83a1565b1eb615acf0e2cec7c614001c64f5b95b0ed9aa9ad677d40b3
+  data.tar.gz: d757f96ae40c372b720de43d3fd5db175e30b09d78fd3eb8b48042db5aafd1d14c3472e06f61ce9170f7f33fdc314674e6f0abb9d5b196759dec1ecec478563a

data/CHANGELOG.md

@@ -1,12 +1,26 @@
 # Change Log
 
+## [v0.13.0] - 2020-05-13
+
+### Added
+* Add sync as a dependency
+* Add metadata to gemspec
+
+### Changed
+* Change StateMachine#final_state to #terminal_states by Brad Gessler(@bradgessler)
+* Change to remove artefacts like tests & tasks from gemspec
+
+### Fixed
+* Fix Ruby 2.7 keyword arguments warnings
+* Fix MessageQueue deadlock by Pavel Rosický(@ahorek)
+
 ## [v0.12.1] - 2019-07-12
 
 ### Changed
 * Change to relax dev dependencies versions
 
 ### Fixed
-# Fix FiniteMachine.new to stop coercing object target that responds to to_hash into options
+* Fix FiniteMachine.new to stop coercing object target that responds to to_hash into options
 
 ## [v0.12.0] - 2018-11-11
 
@@ -291,6 +305,8 @@
 
 * Initial release
 
+[v0.13.0]: https://github.com/peter-murach/finite_machine/compare/v0.12.1...v0.13.0
+[v0.12.1]: https://github.com/peter-murach/finite_machine/compare/v0.12.0...v0.12.1
 [v0.12.0]: https://github.com/peter-murach/finite_machine/compare/v0.11.3...v0.12.0
 [v0.11.3]: https://github.com/peter-murach/finite_machine/compare/v0.11.2...v0.11.3
 [v0.11.2]: https://github.com/peter-murach/finite_machine/compare/v0.11.1...v0.11.2

data/README.md

@@ -200,7 +200,7 @@ TrafficLights = FiniteMachine.define do
   event :stop,  :yellow => :red
   event :ready, :red    => :yellow
   event :go,    :yellow => :green
-end)
+end
 ```
 
 Then you can create however many instance of above class:

data/lib/finite_machine.rb

@@ -47,7 +47,7 @@ module FiniteMachine
   # Raised when argument is already defined
   AlreadyDefinedError = Class.new(::ArgumentError)
 
-  class << self
+  module ClassMethods
     attr_accessor :logger
 
     # Initialize an instance of finite machine
@@ -78,6 +78,8 @@ module FiniteMachine
       Class.new(Definition, &block)
     end
   end
+
+  extend ClassMethods
 end # FiniteMachine
 
 FiniteMachine.logger = Logger.new(STDERR)

data/lib/finite_machine/choice_merger.rb

@@ -13,7 +13,7 @@ module FiniteMachine
     #   the transitions and attributes
     #
     # @api private
-    def initialize(machine, name, **transitions)
+    def initialize(machine, name, transitions = {})
       @machine     = machine
       @name        = name
       @transitions = transitions
@@ -34,7 +34,7 @@ module FiniteMachine
     # @return [FiniteMachine::Transition]
     #
     # @api public
-    def choice(to, **conditions)
+    def choice(to, conditions = {})
       transition_builder = TransitionBuilder.new(@machine, @name,
                                                  @transitions.merge(conditions))
       transition_builder.call(@transitions[:from] => to)

data/lib/finite_machine/dsl.rb

@@ -10,7 +10,7 @@ module FiniteMachine
     # Initialize a generic DSL
     #
     # @api public
-    def initialize(machine, **attrs)
+    def initialize(machine, attrs)
       @machine = machine
       @attrs   = attrs
     end
@@ -53,7 +53,7 @@ module FiniteMachine
     # Initialize top level DSL
     #
     # @api public
-    def initialize(machine, **attrs)
+    def initialize(machine, attrs)
       super(machine, attrs)
 
       @machine.state = FiniteMachine::DEFAULT_STATE
@@ -96,7 +96,7 @@ module FiniteMachine
     # @return [StateMachine]
     #
     # @api public
-    def initial(value, **options)
+    def initial(value, options = {})
       state = (value && !value.is_a?(Hash)) ? value : raise_missing_state
       name, @defer_initial, @silent_initial = *parse_initial(options)
       @initial_event = name
@@ -122,7 +122,7 @@ module FiniteMachine
     #
     # @api public
     def terminal(*values)
-      self.final_state = values
+      self.terminal_states = values
     end
 
     # Create event and associate transition

data/lib/finite_machine/message_queue.rb

@@ -180,7 +180,6 @@ module FiniteMachine
       until @dead
         @mutex.synchronize do
           while @queue.empty?
-            break if @dead
             @not_empty.wait(@mutex)
           end
           event = @queue.pop

data/lib/finite_machine/state_machine.rb

@@ -28,8 +28,8 @@ module FiniteMachine
     # Initial state, defaults to :none
     attr_threadsafe :initial_state
 
-    # Final state, defaults to :none
-    attr_threadsafe :final_state
+    # Final state, defaults to nil
+    attr_threadsafe :terminal_states
 
     # The prefix used to name events.
     attr_threadsafe :namespace
@@ -226,7 +226,7 @@ module FiniteMachine
     #
     # @api public
     def terminated?
-      is?(final_state)
+      is?(terminal_states)
     end
 
     # Restore this machine to a known state

data/lib/finite_machine/two_phase_lock.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sync'
+require "sync"
 
 module FiniteMachine
   # Mixin to provide lock to a {Threadable}
@@ -12,9 +12,10 @@ module FiniteMachine
     # @return [Sync]
     #
     # @api private
-    def sync
-      @sync = Sync.new
+    def lock
+      @lock = Sync.new
     end
+    module_function :lock
 
     # Synchronize given block of code
     #
@@ -25,9 +26,8 @@ module FiniteMachine
     #
     # @api private
     def synchronize(mode, &block)
-      sync.synchronize(mode, &block)
+      lock.synchronize(mode, &block)
     end
-
-    module_function :sync, :synchronize
+    module_function :synchronize
   end # TwoPhaseLock
 end # FiniteMachine

data/lib/finite_machine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiniteMachine
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finite_machine
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,47 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sync
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +70,7 @@ description: A minimal finite state machine with a straightforward syntax. You c
   quickly model states, add callbacks and use object-oriented techniques to integrate
   with ORMs.
 email:
-- me@piotrmurach.com
+- piotr@piotrmurach.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,12 +78,6 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- Rakefile
-- benchmarks/memory_profile.rb
-- benchmarks/memory_usage.rb
-- examples/atm.rb
-- examples/bug_system.rb
-- finite_machine.gemspec
 - lib/finite_machine.rb
 - lib/finite_machine/async_call.rb
 - lib/finite_machine/callable.rb
@@ -127,67 +107,15 @@ files:
 - lib/finite_machine/two_phase_lock.rb
 - lib/finite_machine/undefined_transition.rb
 - lib/finite_machine/version.rb
-- spec/integration/system_spec.rb
-- spec/performance/benchmark_spec.rb
-- spec/spec_helper.rb
-- spec/unit/alias_target_spec.rb
-- spec/unit/async_callbacks_spec.rb
-- spec/unit/auto_methods_spec.rb
-- spec/unit/callable/call_spec.rb
-- spec/unit/callbacks_spec.rb
-- spec/unit/can_spec.rb
-- spec/unit/cancel_callbacks_spec.rb
-- spec/unit/choice_spec.rb
-- spec/unit/define_spec.rb
-- spec/unit/definition_spec.rb
-- spec/unit/event_names_spec.rb
-- spec/unit/events_map/add_spec.rb
-- spec/unit/events_map/choice_transition_spec.rb
-- spec/unit/events_map/clear_spec.rb
-- spec/unit/events_map/events_spec.rb
-- spec/unit/events_map/inspect_spec.rb
-- spec/unit/events_map/match_transition_spec.rb
-- spec/unit/events_map/move_to_spec.rb
-- spec/unit/events_map/states_for_spec.rb
-- spec/unit/events_spec.rb
-- spec/unit/handlers_spec.rb
-- spec/unit/hook_event/any_state_or_event_spec.rb
-- spec/unit/hook_event/build_spec.rb
-- spec/unit/hook_event/eql_spec.rb
-- spec/unit/hook_event/initialize_spec.rb
-- spec/unit/hook_event/notify_spec.rb
-- spec/unit/hooks/clear_spec.rb
-- spec/unit/hooks/find_spec.rb
-- spec/unit/hooks/inspect_spec.rb
-- spec/unit/hooks/register_spec.rb
-- spec/unit/if_unless_spec.rb
-- spec/unit/initial_spec.rb
-- spec/unit/inspect_spec.rb
-- spec/unit/is_spec.rb
-- spec/unit/log_transitions_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/message_queue_spec.rb
-- spec/unit/new_spec.rb
-- spec/unit/respond_to_spec.rb
-- spec/unit/state_parser/parse_spec.rb
-- spec/unit/states_spec.rb
-- spec/unit/subscribers_spec.rb
-- spec/unit/target_spec.rb
-- spec/unit/terminated_spec.rb
-- spec/unit/transition/check_conditions_spec.rb
-- spec/unit/transition/inspect_spec.rb
-- spec/unit/transition/matches_spec.rb
-- spec/unit/transition/states_spec.rb
-- spec/unit/transition/to_state_spec.rb
-- spec/unit/trigger_spec.rb
-- spec/unit/undefined_transition/eql_spec.rb
-- tasks/console.rake
-- tasks/coverage.rake
-- tasks/spec.rake
-homepage: http://piotrmurach.github.io/finite_machine/
+homepage: https://piotrmurach.github.io/finite_machine/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/piotrmurach/finite_machine/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/finite_machine
+  homepage_uri: https://piotrmurach.github.io/finite_machine/
+  source_code_uri: https://github.com/piotrmurach/finite_machine
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -203,62 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A minimal finite state machine with a straightforward syntax.
-test_files:
-- spec/integration/system_spec.rb
-- spec/performance/benchmark_spec.rb
-- spec/spec_helper.rb
-- spec/unit/alias_target_spec.rb
-- spec/unit/async_callbacks_spec.rb
-- spec/unit/auto_methods_spec.rb
-- spec/unit/callable/call_spec.rb
-- spec/unit/callbacks_spec.rb
-- spec/unit/can_spec.rb
-- spec/unit/cancel_callbacks_spec.rb
-- spec/unit/choice_spec.rb
-- spec/unit/define_spec.rb
-- spec/unit/definition_spec.rb
-- spec/unit/event_names_spec.rb
-- spec/unit/events_map/add_spec.rb
-- spec/unit/events_map/choice_transition_spec.rb
-- spec/unit/events_map/clear_spec.rb
-- spec/unit/events_map/events_spec.rb
-- spec/unit/events_map/inspect_spec.rb
-- spec/unit/events_map/match_transition_spec.rb
-- spec/unit/events_map/move_to_spec.rb
-- spec/unit/events_map/states_for_spec.rb
-- spec/unit/events_spec.rb
-- spec/unit/handlers_spec.rb
-- spec/unit/hook_event/any_state_or_event_spec.rb
-- spec/unit/hook_event/build_spec.rb
-- spec/unit/hook_event/eql_spec.rb
-- spec/unit/hook_event/initialize_spec.rb
-- spec/unit/hook_event/notify_spec.rb
-- spec/unit/hooks/clear_spec.rb
-- spec/unit/hooks/find_spec.rb
-- spec/unit/hooks/inspect_spec.rb
-- spec/unit/hooks/register_spec.rb
-- spec/unit/if_unless_spec.rb
-- spec/unit/initial_spec.rb
-- spec/unit/inspect_spec.rb
-- spec/unit/is_spec.rb
-- spec/unit/log_transitions_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/message_queue_spec.rb
-- spec/unit/new_spec.rb
-- spec/unit/respond_to_spec.rb
-- spec/unit/state_parser/parse_spec.rb
-- spec/unit/states_spec.rb
-- spec/unit/subscribers_spec.rb
-- spec/unit/target_spec.rb
-- spec/unit/terminated_spec.rb
-- spec/unit/transition/check_conditions_spec.rb
-- spec/unit/transition/inspect_spec.rb
-- spec/unit/transition/matches_spec.rb
-- spec/unit/transition/states_spec.rb
-- spec/unit/transition/to_state_spec.rb
-- spec/unit/trigger_spec.rb
-- spec/unit/undefined_transition/eql_spec.rb
+test_files: []

data/Rakefile

@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-require "bundler/gem_tasks"
-
-FileList['tasks/**/*.rake'].each(&method(:import))
-
-jruby = RUBY_ENGINE == 'ruby'
-specs = ['spec']
-specs << 'spec:perf' if jruby
-
-desc 'Run all specs'
-task ci: specs

data/benchmarks/memory_profile.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../lib/finite_machine'
-require 'ruby-prof'
-
-result = RubyProf.profile do
-  FiniteMachine.new
-end
-
-printer = RubyProf::FlatPrinter.new(result)
-printer.print($stdout)