tramway-core 1.18.6 → 2.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6099966ec764bed33f2ff047144f9bde9057da2740626df9dd7070658ea54b8a
-  data.tar.gz: 95215f84be2eed817f5a6d4741aadb8d68d9a66de216be52c994e0eabca50cf7
+  metadata.gz: 8cb5f162d7f0c25e14716d625868a33da89c697af2ec591d7f7979a1be186ec3
+  data.tar.gz: '09d897ed92f6a1231178781b82bcf2b670887287f04e1d73404750db13ce44a2'
 SHA512:
-  metadata.gz: 8259a4092c24557aeb828575a7966634ae8a707beac890737fdf5630735e534193c3820a0c14a27dec54d0daf1b2a210266f881ce12631364782fa8298e233dc
-  data.tar.gz: b41e199f893ec054da4d5d1e9716d841acea37e155d6019792b9eb4009c651ad84b33231eaccc8643975ec800e7eca6276744cc32a31c628b11c27a0b5de2dd9
+  metadata.gz: 91fa7227004fdd8703de213ac2bdef4d82235389cc807da5ebce079e31549d00543fc01693405bc20784817e2e7ce2e4d4ea36ec8be7451c9244c1979d2e5bfb
+  data.tar.gz: d8ebf4899596a26019744c1a93070aa8229d160bec462ea9951e37dfc2faecd57e861fbef4f5bfe2989c133a9b3b8e2cb1c908f1bf794c9f95e538f3dd418581

data/app/decorators/tramway/core/attributes/view_helper.rb

@@ -9,7 +9,7 @@ module Tramway::Core::Attributes::ViewHelper
   end
 
   def state_machine?(object, attribute_name)
-    attribute_name.to_s.in? object.class.state_machines.keys.map(&:to_s)
+    attribute_name.to_s.in? object.class.state_machines_names.map(&:to_s)
   end
 
   def view_by_value(object, value, attribute)

data/app/decorators/tramway/core/concerns/attributes_decorator_helper.rb

@@ -10,7 +10,9 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
   end
 
   def state_machine_view(object, attribute_name)
-    object.send "human_#{attribute_name}_name"
+    I18n.t("state_machines.#{object.class.model_name.to_s.underscore}.#{attribute_name}.states.#{object.send(attribute_name)}")
+  rescue
+    object.aasm.human_state
   end
 
   BASE64_REGEXP = %r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|

data/app/forms/tramway/core/application_forms/submit_helper.rb

@@ -18,7 +18,11 @@ module Tramway::Core::ApplicationForms::SubmitHelper
   rescue ArgumentError => e
     Tramway::Error.raise_error :tramway, :core, :application_form, :save, :argument_error, message: e.message
   rescue StandardError => e
-    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :looks_like_you_have_method,
-      method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
+    if e.try :name
+      Tramway::Error.raise_error :tramway, :core, :application_form, :save, :looks_like_you_have_method,
+        method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
+    else
+      raise e
+    end
   end
 end

data/app/forms/tramway/core/extendable_forms_helpers/properties_helper.rb

@@ -4,7 +4,7 @@ module Tramway::Core::ExtendableFormsHelpers::PropertiesHelper
   def define_properties_method(simple_properties, more_properties)
     define_method 'properties' do
       hash = simple_properties.each_with_object({}) do |property, h|
-        h.merge! property[0] => property[1] unless model.class.state_machines.keys.include?(property[0])
+        h.merge! property[0] => property[1] unless model.class.state_machines_names.include?(property[0])
       end
       more_properties.reduce(hash) do |h, property|
         h.merge! property[0] => {

data/app/helpers/tramway/core/title_helper.rb

@@ -2,6 +2,7 @@
 
 module Tramway::Core::TitleHelper
   def title(page_title = default_title)
+    @application ||= Tramway::Core.application&.model_class&.first || Tramway::Core.application
     if @application.present?
       title_text = "#{page_title} | #{@application.try(:title) || @application.public_name}"
       content_for(:title) { title_text }

data/app/models/tramway/core/application_record.rb

@@ -6,13 +6,14 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
   audited
   extend ::Enumerize
+  include ::AASM
 
-  state_machine :state, initial: :active do
-    state :active
+  aasm column: :state do
+    state :active, initial: true
     state :removed
 
     event :remove do
-      transition active: :removed
+      transitions from: :active, to: :removed
     end
   end
 
@@ -57,6 +58,10 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     def file_extensions
       @extensions
     end
+
+    def state_machines_names
+      AASM::StateMachineStore.fetch(self).machine_names
+    end
   end
 
   # FIXME: detect inhertited locales

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.6'
+    VERSION = '2.0.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.6
+  version: 2.0.0.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited