tramway-core 2.0.2.1 → 3.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eab2fe64b7148e89539783a82876fcff041a9adbd774f51706187452daab8ef
-  data.tar.gz: 704e8f7e10469666a0e1e8ff364d2e9bd105528135ae8ccf302e837709a77659
+  metadata.gz: 529b5f8a64a008d6bf7d0d06323887ef33d5437e87fa0ed740687b1cb6751400
+  data.tar.gz: 83fa2ee3b66c07d3473d6298007267e0faaa37404bc75fe486518358fcb7d1f1
 SHA512:
-  metadata.gz: 8546cdba03df7377b68e7d656be70a6713aba499766451323100c737ad2391eb05a413f0d3ad99c59d05b5b7dc92a709470f8155896517e57b27886800a05aa2
-  data.tar.gz: d0c25fe140826c010bb039850c1236b0ff20d6d77c39d9186873c4b90a76b8aee48a9fd250b4793d98de9c00181f2835c5f9a86dc0507b239f4deff02c9a15c6
+  metadata.gz: 2a30c44169bc75fff6ed5244a8fa498cd4ee206c43e7240e23982f581aacdb6ab80c370cdaec839f119c956003acfd84f9b3b19c1b9fc73ca20100dfcdbc387b
+  data.tar.gz: 9f754f5466c6fd0e0deb2b66ee84909f1162bee38f7d7e4a6217d73eef95cb98ed2471ce3a37adb680415f8c96b4ef5980c67f13ea1c510181ebf00a64ffe02f

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/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/app/views/tramway/core/shared/_input.html.haml

@@ -16,7 +16,8 @@
   - when :polymorphic_association
     = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
   - else
-    = form.input property, **simple_params(**input_params.merge(type: type))
+    - options = input_params[:options] || {}
+    = form.input property, **simple_params(**input_params.merge(type: type)).merge(options)
 - else
   - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
   = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '2.0.2.1'
+    VERSION = '3.0.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2.1
+  version: 3.0.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-01-10 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.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines