can_has_state 0.3.2 → 0.5.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDJjMTQyY2ViZWJmYjJkYmI3NjYwYmQ5MDc2ZjhiNjhjMmM1M2NlZA==
-  data.tar.gz: !binary |-
-    ZTcwMDBiMDE1NWI0ZDM3MDAzNTE4ZTI1ZWU5MTlmNmE3ZDRlYjQwMg==
+SHA256:
+  metadata.gz: 5d365502c2589118326d281c7cedd12cb327bace1baee85087359ece2e92c893
+  data.tar.gz: f6a28a286f71893b3fdfc005682c7111ac03c463877da310e807deb69eab110e
 SHA512:
-  metadata.gz: !binary |-
-    NzQxYzdjYTIxNjhhN2NlMmE2YzkxYzJhOWRjN2U3ODY4ODI5NDVmYTE5OGI0
-    MGU0YTMwODNhOWQwMTdiNDAwNGU3N2FmZTZlNjI4NzRlODhmZTdlMWU1YTI5
-    MWVhODc1NWEzZTJkYmIwMTQxZTYwZjllMTc5YjdmYTRjZjNmODI=
-  data.tar.gz: !binary |-
-    ODZmOWI2MzdlN2NiMGRmMmQwMjQyYTA1Y2RhN2Q4ZjNlYTQ2Y2NlMmUyNTdm
-    NmViOGYyNDE2YjkyODI2Y2RiYTZjMDA5NTU1NzY3YTFlODE4Yzg2MjlhYTQ2
-    MDViOTZiYjBmNDM5ZGQ3ZWNkZmNjOTdlNjkwNDU4ODYzNDUwMjQ=
+  metadata.gz: f6d0928cf94853df33a935e1635db3d1468dfda8394df71c7b518282eb4f80e67c86fcc9e3c79a844c953ce6d86eb274057f98dc70d566eb9b4c87a8bb5f6ffe
+  data.tar.gz: 29c8463d69deec0b205928e20c9a6c6a2b86e7e154f9b2b871d87139f637cf889806fb11e9f4cef6272013dc5b5672077b6e4385ceb9d4065605ffda2432faf8

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 thomas morgan
+Copyright 2012-2020 thomas morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -253,4 +253,4 @@ because the initial state value changed from nil to the initial state.
 
 ## Compatibility ##
 
-Tested with Ruby 1.9 and ActiveSupport and ActiveModel 4.0.
+Tested with Ruby 2.3-2.6+ and ActiveSupport and ActiveModel 5.2-6.1+.

data/lib/can_has_state.rb

@@ -5,4 +5,7 @@ require 'active_model'
   require "can_has_state/#{f}"
 end
 
+# require 'active_support/i18n'
+I18n.load_path << File.dirname(__FILE__) + '/can_has_state/locale/en.yml'
+
 require 'can_has_state/railtie' if defined?(Rails)

data/lib/can_has_state/definition.rb

@@ -8,13 +8,13 @@ module CanHasState
       @column = column_name.to_sym
       @states = {}
       @triggers = []
-      instance_eval &block
+      instance_eval(&block)
       @initial_state ||= @states.keys.first
     end
 
 
     def extend_machine(&block)
-      instance_eval &block
+      instance_eval(&block)
     end
 
 
@@ -28,7 +28,7 @@ module CanHasState
 
       # TODO: turn even guards into types of triggers ... then support :guard as a trigger param
       guards = []
-      message = "has invalid transition from %{from} to %{to}"
+      message = :invalid_transition
       # TODO: differentiate messages for :from errors vs. :guard errors
 
       options.each do |key, val|

data/lib/can_has_state/dirty_helper.rb

@@ -15,7 +15,7 @@ module CanHasState
           attr_reader(attr) unless respond_to?(attr)
           has_writer = respond_to?("#{attr}=")
           define_method "#{attr}=" do |val|
-            send("#{attr}_will_change!") unless val == instance_variable_get("@#{attr}")
+            send("#{attr}_will_change!") unless val == send(attr)
             has_writer ? super(val) : instance_variable_set("@#{attr}", val)
             changed_attributes.delete(attr) if attribute_was(attr) == send(attr)
           end

data/lib/can_has_state/locale/en.yml

@@ -0,0 +1,5 @@
+en:
+  errors:
+    messages:
+      invalid_state: "is not in a known state"
+      invalid_transition: "has an invalid transition from %{from} to %{to}"

data/lib/can_has_state/machine.rb

@@ -15,9 +15,10 @@ module CanHasState
       end
 
       def extend_state_machine(column, &block)
-        sm = state_machines.detect{|(col, stm)| col == column}
+        sm = state_machines.detect{|(col, _)| col == column}
+          # |(col, stm)|
         raise(ArgumentError, "Unknown state machine #{column}") unless sm
-        sm[1].extend_machine &block
+        sm[1].extend_machine(&block)
         sm
       end
 
@@ -70,7 +71,11 @@ module CanHasState
         # clear record of called triggers
         @triggers_called[column] = nil
         
-        from, to = send("#{column}_was"), send(column)
+        if respond_to?("#{column}_before_last_save") # rails 5.1+
+          from, to = send("#{column}_before_last_save"), send(column)
+        else
+          from, to = send("#{column}_was"), send(column)
+        end
         next if from == to
         sm.trigger(self, from, to, :deferred)
       end
@@ -82,22 +87,23 @@ module CanHasState
         from, to = send("#{column}_was"), send(column)
         next if from == to
         if !sm.known?(to)
-          err << [column, "is not in a known state"]
+          err << [column, :invalid_state]
         elsif !sm.allow?(self, to) #state_machine_allow?(column, to)
-          err << [column, sm.message(to) % {:from=>from, :to=>to}]
+          err << [column, sm.message(to), {from: from, to: to}]
         end
       end
       err
     end
 
     def can_has_valid_state_machines
-      can_has_state_errors.each do |(column, msg)|
-        errors.add column, msg
+      can_has_state_errors.each do |(column, msg, opts)|
+        errors.add column, msg, opts||{}
       end
     end
 
     def state_machine_allow?(column, to)
-      sm = state_machines.detect{|(col, stm)| col == column}
+      sm = state_machines.detect{|(col, _)| col == column}
+        # |(col, stm)|
       raise("Unknown state machine #{column}") unless sm
       sm[1].allow?(self, to)
     end

data/lib/can_has_state/version.rb

@@ -1,3 +1,3 @@
 module CanHasState
-  VERSION = '0.3.2'
+  VERSION = '0.5.2'
 end

data/test/can_has_state_test.rb

@@ -24,8 +24,8 @@ class Account
 
   def fake_persist
     if valid?
-      # just reset dirty tracking and pretend all is good
-      changed_attributes.clear
+      # reset dirty tracking as if we had persisted
+      changes_applied
       true
     end
   end
@@ -70,7 +70,7 @@ class UserPreState2
   end
 end
 
-class CanHasStateTest < MiniTest::Unit::TestCase #Minitest::Test
+class CanHasStateTest < Minitest::Test
 
   def test_builder_simple
     refute UserBare.respond_to?(:state_machine)
@@ -224,7 +224,7 @@ class CanHasStateTest < MiniTest::Unit::TestCase #Minitest::Test
 
     a.account_state = 'active'
     a.valid?
-    assert_match /invalid transition/, a.errors.to_a.first
+    assert_match(/invalid transition/, a.errors.to_a.first)
 
     a.account_state = 'inactive'
     assert a.valid?, "Errors: #{a.errors.to_a}"
@@ -232,7 +232,7 @@ class CanHasStateTest < MiniTest::Unit::TestCase #Minitest::Test
 
     a.account_state = 'special'
     a.valid?
-    assert_match /invalid transition/, a.errors.to_a.first
+    assert_match(/invalid transition/, a.errors.to_a.first)
 
     a.allow_special = true
     assert a.valid?, "Errors: #{a.errors.to_a}"

data/test/test_helper.rb

@@ -1,4 +1,6 @@
 require 'minitest/autorun'
-require 'turn'
+
+require 'minitest/reporters'
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 require 'can_has_state'

metadata

@@ -1,85 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: can_has_state
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.2
 platform: ruby
 authors:
 - thomas morgan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - <
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - <
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "can_has_state is a simplified state machine gem. It relies on ActiveModel
-  and\n  should be compatible with any ActiveModel-compatible persistence layer."
+description: |-
+  can_has_state is a simplified state machine gem. It relies on ActiveModel and
+    should be compatible with any ActiveModel-compatible persistence layer.
 email:
 - tm@iprog.com
 executables: []
@@ -92,6 +73,7 @@ files:
 - lib/can_has_state.rb
 - lib/can_has_state/definition.rb
 - lib/can_has_state/dirty_helper.rb
+- lib/can_has_state/locale/en.yml
 - lib/can_has_state/machine.rb
 - lib/can_has_state/railtie.rb
 - lib/can_has_state/version.rb
@@ -101,24 +83,23 @@ files:
 homepage: https://github.com/zarqman/can_has_state
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Super simple state machine for ActiveModel
 test_files: