statesman-multi_state 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3c268ec08674602979078f78430d66eb824ab50a039e9e504336c6fe6ff81f
-  data.tar.gz: edbda12f05e4ca3ac0244135d4d6ac503ff62a1579d49ae3141b7c1081b9faa6
+  metadata.gz: 4341220f127a7664fa7f0f3457a58d8901284dedf43bec6b8f8fd8b7d18b52fe
+  data.tar.gz: e5ac0fe8d9f6de6cacc2bb4c9b89ddc7e9e1800920bc660dc169eb8507cc5ff8
 SHA512:
-  metadata.gz: c7425a27748bf3be1353edac40e65688e7688040f2378f283d768da40ef640b34261c946470bd6503b09cb47ed8ff2185437f077935a53263add3ea003acc0d1
-  data.tar.gz: 3811acac1ad6767f49dfe1c4c0a6176271a9ef4d3d77ffcce5854d30a0877d4efb690983d2cf04c5f098e6150e7ed835653c694f0052a181b03f816a03cb9c59
+  metadata.gz: 2acbbdb9b3af2837f225a870fe483f16eeadd80a127a902da0180b62f9950e9ff8a641cf02296e2b71e12534485cfc65264ff910a5896c6d232359a2d15667af
+  data.tar.gz: 75da67f863766eb592e297a411dcced1cbc08c8f2df4215909ccb21f87e946a68e145b8dea9273b2a8b7113ae39a005a2a70d8821310b34c4a12fbcfcc97ce5c

data/lib/statesman/multi_state/active_record_macro.rb

@@ -59,7 +59,8 @@ module Statesman
             end
 
             def #{virtual_attribute_name}
-              super() || #{field_name}_current_state
+              value = read_attribute("#{virtual_attribute_name}")
+              value.nil? ? #{field_name}_current_state : value
             end
 
             def #{field_name}_current_state_human
@@ -68,6 +69,26 @@ module Statesman
             end
           CODE
 
+          # Define a public reader so form helpers, serializers, and other
+          # callers that use `public_send(field_name)` work. Guard against
+          # clobbering an existing column reader or user-defined method with
+          # the same name as `field_name`.
+          table_name_available = name.present? || (instance_variable_defined?(:@table_name) && @table_name.present?)
+          has_column_reader = if respond_to?(:column_names) && table_name_available &&
+                                 respond_to?(:table_exists?) && table_exists?
+                                column_names.include?(field_name.to_s)
+                              else
+                                false
+                              end
+
+          unless method_defined?(field_name) || private_method_defined?(field_name) || has_column_reader
+            generated_association_methods.class_eval <<~READER, __FILE__, __LINE__ + 1
+              def #{field_name}
+                #{field_name}_current_state
+              end
+            READER
+          end
+
           include(const_set("#{field_name}#{SecureRandom.hex(4)}_mod".classify, Module.new).tap do |mod|
             mod.module_eval do
               extend ActiveSupport::Concern
@@ -86,8 +107,18 @@ module Statesman
               class_eval <<~METHOD, __FILE__, __LINE__ + 1
                 def save_with_state(**options)
                   @registered_callbacks ||= []
-                  if #{virtual_attribute_name}_changed? && #{field_name}_can_transition_to?(#{virtual_attribute_name})
-                    @registered_callbacks << -> { #{field_name}_transition_to(#{virtual_attribute_name}, **options) }
+                  if #{virtual_attribute_name}.to_s != #{field_name}_current_state.to_s
+                    if #{field_name}_can_transition_to?(#{virtual_attribute_name})
+                      @registered_callbacks << -> { #{field_name}_transition_to(#{virtual_attribute_name}, **options) }
+                    else
+                      errors.add(
+                        :#{field_name},
+                        :invalid_transition,
+                        current_state: #{field_name}_current_state_human,
+                        target_state: I18n.t(#{virtual_attribute_name}, scope: "statesman.#{field_name}_#{base_klass.underscore}", default: #{virtual_attribute_name}.to_s)
+                      )
+                      return false
+                    end
                   end
 
                   if defined?(super)

data/lib/statesman/multi_state/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      invalid_transition: "cannot transition from %{current_state} to %{target_state}"

data/lib/statesman/multi_state/railtie.rb

@@ -14,6 +14,10 @@ module Statesman
           ActiveRecord::Reflection.singleton_class.prepend(Statesman::MultiState::Reflection::ReflectionExtension)
         end
       end
+
+      initializer 'statesman.multi_state.i18n' do |app|
+        app.config.i18n.load_path += Dir[File.expand_path('locales/*.yml', __dir__)]
+      end
     end
   end
 end

data/lib/statesman/multi_state/version.rb

@@ -2,6 +2,6 @@
 
 module Statesman
   module MultiState
-    VERSION = '0.2.9'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statesman-multi_state
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Chedli Bourguiba
@@ -51,6 +51,7 @@ files:
 - lib/statesman/adapters/custom_active_record_queries.rb
 - lib/statesman/multi_state.rb
 - lib/statesman/multi_state/active_record_macro.rb
+- lib/statesman/multi_state/locales/en.yml
 - lib/statesman/multi_state/railtie.rb
 - lib/statesman/multi_state/reflection.rb
 - lib/statesman/multi_state/version.rb