can_has_state 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f5ac5880eb7dde62694993ffa17483b6178f7a8
-  data.tar.gz: 642ffbb9ac33405c47ff5abb0ecbc85d1cc68869
+SHA256:
+  metadata.gz: a3b45a0fd9887bd419ffa6fc89e6a7a566878fbfc8c60f4c34c3e5717659087c
+  data.tar.gz: 57b418edcb7d1403b7e57b5fb1f5665e3cf8fc4b2e68612d56c17627ff16cece
 SHA512:
-  metadata.gz: 175d46b7e64d3f0ce1a041d1bd4d1f308b3a4bc49080cbf1818044e0be883760a693c051637146af59dc30d3aff97d7e883ff35632285334e4222cb2c8c9e114
-  data.tar.gz: db19b6e893d808e79f810ad032711837073199fc2367454eb9e2b876005a263fdc44a50a43a2e84e91c0f5ec608e3906b914c3b4c129a1f28db88bef3fd81faa
+  metadata.gz: 9bbdc97653a0d9087808667b1a26c28f7e2a6f8a2088f315bebad7da575ef31f2cb73e62858cf77875c562496a185e9668984f272c8e2de422cc16de272b86ce
+  data.tar.gz: b69e6e85fc0937e3a9437f747d590ed9f532677b6004f15946c3f2fae6573728a530ada4d1827e15777b4f3a4063d941a5170f9bc83f9070246a6ca39000a3ad

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 thomas morgan
+Copyright 2012-2021 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

@@ -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/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/locale/es.yml

@@ -0,0 +1,5 @@
+es:
+  errors:
+    messages:
+      invalid_state: "no está en un estado conocido"
+      invalid_transition: "tiene una transición no válida de %{from} a %{to}"

data/lib/can_has_state/machine.rb

@@ -71,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
@@ -83,17 +87,17 @@ 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
 

data/lib/can_has_state/version.rb

@@ -1,3 +1,3 @@
 module CanHasState
-  VERSION = '0.4.0'
+  VERSION = '0.6.0'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_state
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - thomas morgan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,40 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        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: '6'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +73,8 @@ 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/locale/es.yml
 - lib/can_has_state/machine.rb
 - lib/can_has_state/railtie.rb
 - lib/can_has_state/version.rb
@@ -100,9 +82,10 @@ files:
 - test/can_has_state_test.rb
 - test/test_helper.rb
 homepage: https://github.com/zarqman/can_has_state
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Super simple state machine for ActiveModel
 test_files: