tramway-core 2.0.2.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7845e66f758435ed5b1155eb4837bcb8b365b81d97103569c35e44566a522b5
-  data.tar.gz: 34bb49a89182546eee69b931251140f7a4c6c3eacab4a62afa43f8e26e73b98d
+  metadata.gz: 1c17a0e36bdb5090350f421917e739f044af1f07f3b6a527da8656cdc0175569
+  data.tar.gz: 4067d380e669a837e960eadd8003798ca30c6cb13ee2867dd1201225ca783ca3
 SHA512:
-  metadata.gz: d2fe545f58dc1be5f68c112cebe3e919b791bc91fa04dad29902e5af05791349c0b94a18ce1b4fb262db9daec891f87745c26c0c56303a06841b7dc43df8d62e
-  data.tar.gz: 1025475958038484a6f720d044c4f4fd556685f96215b761ef76611c264522675dc5e0af5c1e6ae20b22bcbf0cec2950281e7def73e389ea643a342401d1c5db
+  metadata.gz: 626efa3f64700a7b18dce52974e7c9cf860c26e8f4dd7355024504c4e43f8adb6a2975b1a4b98495e2608d3abc50e00367dad14d9029c81023c58caeff9f182d
+  data.tar.gz: e59aeaaefa0cc3bb453a20535b3b205bf5e041166bc2ddc306389b5d0d0c4708aee7eed14dce948e5b9b667321ca25e21d58e72181d814165796f377788131c7

data/app/decorators/tramway/core/associations/object_helper.rb

@@ -30,7 +30,7 @@ module Tramway::Core::Associations::ObjectHelper
   end
 
   def associations_collection(object, association_name, decorator_class_name)
-    object.send(association_name).active.map do |association_object|
+    object.send(association_name).map do |association_object|
       decorator_class_name.decorate association_object
     end
   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/associations_helper.rb

@@ -5,7 +5,7 @@ module Tramway::Core::Inputs::AssociationsHelper
     user = defined?(current_user) ? current_user : current_admin
     full_class_name_association = form_object.class.full_class_name_association(property)
     check_valid_association full_class_name_association
-    full_class_name_association.active.send("#{user.role}_scope", user.id).map do |obj|
+    full_class_name_association.send("#{user.role}_scope", user.id).map do |obj|
       decorator_class(full_class_name_association).decorate obj
     end.sort_by(&:name)
   end

data/app/helpers/tramway/core/inputs/polymorphic_associations_helper.rb

@@ -4,7 +4,7 @@ module Tramway::Core::Inputs::PolymorphicAssociationsHelper
   def build_collection_for_polymorphic_association(form_object, property)
     user = defined?(current_user) ? current_user : current_admin
     object_names = full_class_names(form_object, property).map do |class_name|
-      class_name.active.send("#{user.role}_scope", user.id).map do |obj|
+      class_name.send("#{user.role}_scope", user.id).map do |obj|
         decorator_class(class_name).decorate obj
       end
     end.flatten

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

@@ -8,6 +8,12 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   extend ::Enumerize
   include ::AASM
 
+  scope :created_by_user, lambda { |user_id|
+    joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id)
+  }
+  scope :admin_scope, -> (_arg) { all }
+
+  # FIXME remove this after testing soft-deletion
   aasm column: :state do
     state :active, initial: true
     state :removed
@@ -17,11 +23,6 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     end
   end
 
-  scope :active, -> { where state: :active }
-  scope :created_by_user, lambda { |user_id|
-    joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id)
-  }
-  scope :admin_scope, -> (_arg) { all }
 
   include ::PgSearch::Model
 
@@ -33,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
@@ -63,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 = '2.0.2.2'
+    VERSION = '3.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2.2
+  version: 3.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -161,22 +161,22 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines