tramway-core 1.18.6.1 → 2.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcec7a54da967449a26369b3ee63f3e34549ae6c8c3b35ee30666775e0cb1349
-  data.tar.gz: b1800609dd690a7debda3f703b039199171030ddf435267e5fe134bc37350183
+  metadata.gz: c979b311b87c5092521ece9d85af2b7f926eaaf9c5c2e3ed95988e79aaf8236a
+  data.tar.gz: 9ef4edc25ac5f405334c09ab72b72b3fa196b544ad37cf369213e971c91e5432
 SHA512:
-  metadata.gz: aedac89398e1d91650190e03ab6a0c06fbcbc25299dd5ea0177f76ed4745213db4699ff47b1ab4b55238e1b6e0f1185c5543e1149ff1d9ff5c44cfe7d4750fba
-  data.tar.gz: 7e48a45eb55ad505bcf12517c2846cee14121fd294fc012c4102c5226d2dfefbe6e868cbc1cef628e6d0e0830ed0641f4e7f49ed5a51f21f41a622ba22c553d1
+  metadata.gz: 8e35b31657316cfa10c136e5a462f6b70358a43cead00ccb68091fe5c953010be01164a1682cfa563f102b805a02a81ea9a2ba24ecbac5b49642f82a30acb369
+  data.tar.gz: '03833355b07b4ceb608941c4f3ec07d9427a638ce732b067a137cd161a41410d9384f77bc20f36a4b5f57d352a15078a3822fec7399a46f1a1117005278d0666'

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/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.1'
+    VERSION = '2.0.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.6.1
+  version: 2.0.0.4
 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