tramway-core 3.0 → 3.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452854a6e69a3dc5fccfd7d05cdcc7f48c3f23a68b6a4914da99872d53d59f18
-  data.tar.gz: 611afba4d6da1ce7b1b49f282a23b1bf96d0d8c4b95ce6a70849a01cf7ffb4ca
+  metadata.gz: 2b99587fbe190053316f4d481dc7746599a74a11875ead37b4e3ac3836d6fd56
+  data.tar.gz: 4d41fa71e1107c838188fae3a2e7910fee5faf7015e24d716305181ee19bb6eb
 SHA512:
-  metadata.gz: 1cd0d672d4ec97bb430b718f012c2cd14166ea99e5d1b776bbc9addbe64737d763ee4aa5b929a48ea01693a7c37ec7abafbdbdd1dc186154e4fa7d2328cd1749
-  data.tar.gz: 92f7a4b44ef879b3a7bdbc7b2ddeb6755a987ff47f90a8479d52c8b409dd2a158d2a95af6879c5a1da28e2eae37cc78dfa9e8b5eee0a9c24f27b3194e40e3ec7
+  metadata.gz: a251c2005d7b60b6b9e9bf4e14fea41d9a161975ba29be43d1749ccefcc0e992069ccaab52608209ba4d7f325e2e3144fcd0c912bb61031a29da2ce742cffdf4
+  data.tar.gz: 6ced496aa25871420199747b46d30c9c1289813b08d76aec995da10eace435adc1fe344491f4563dde407d35b9a2f739c10369b9406738fefd6233edccc37c0a

data/app/decorators/tramway/core/application_decorator.rb

@@ -62,7 +62,7 @@ class Tramway::Core::ApplicationDecorator
     end
 
     def decorate(object_or_array)
-      if object_or_array.class.superclass == ActiveRecord::Relation
+      if object_or_array.class.superclass == ActiveRecord::Relation || object_or_array.class.to_s.include?('ActiveRecord_AssociationRelation')
         decorated_array = object_or_array.map do |obj|
           new obj
         end

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

@@ -20,7 +20,7 @@ module Tramway::Core::ApplicationForms::SubmitHelper
   rescue StandardError => e
     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
+        method_name: e.name.to_s.gsub('=', ''), model_class: model.class, class_name: self.class
     else
       raise e
     end

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

@@ -5,6 +5,13 @@ module Tramway::Core::InputsHelper
   include Tramway::Core::Inputs::PolymorphicAssociationsHelper
 
   def association_params(form_object:, property:, value:, object:, options: {})
+    full_class_name_association = form_object.class.full_class_name_association(property)
+
+    if full_class_name_association.to_s == 'Tramway::User::User'
+      user = defined?(current_user) ? current_user : current_admin
+      value = user.id
+    end
+
     build_input_attributes(object: object, property: property, options: options,
                            value: build_value_for_association(form_object, property, value),
                            collection: build_collection_for_association(form_object, property),

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

@@ -13,6 +13,17 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   }
   scope :admin_scope, -> (_arg) { all }
 
+  # FIXME remove this after testing soft-deletion
+  aasm column: :state do
+    state :active, initial: true
+    state :removed
+
+    event :remove do
+      transitions from: :active, to: :removed
+    end
+  end
+
+
   include ::PgSearch::Model
 
   def creator
@@ -23,7 +34,7 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   # FIXME: detect inhertited locales
   class << self
     def human_attribute_name(attribute_name, *_args)
-      excepted_attributes = %w[created_at updated_at state]
+      excepted_attributes = %w[created_at updated_at]
       if attribute_name.to_s.in? excepted_attributes
         I18n.t "activerecord.attributes.tramway/core/application_record.#{attribute_name}"
       else
@@ -53,9 +64,4 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
       AASM::StateMachineStore.fetch(self).machine_names
     end
   end
-
-  # FIXME: detect inhertited locales
-  def human_state_name
-    I18n.t "activerecord.state_machines.tramway/core/application_record.state.states.#{state}"
-  end
 end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '3.0'
+    VERSION = '3.0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: 3.0.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited