tramway-core 2.0.2 → 3.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e18ed4e3eeb4affe12c1a4006e3a1e70fe91e65b5a8062bacbfe39a8aba39fd2
-  data.tar.gz: 7f7d4d3d54f2a21c606c9b3ae7f19c3565cc8bb98a11d8723dd121397912f20e
+  metadata.gz: '092d15e8c799239a53ec76e7e5c3b6c7c9d6ac73cdf60967b2c23bb209d72fea'
+  data.tar.gz: 87647334835fafc5bf4856b7815578088d45cc3f3eee05c27d110bf5676014c4
 SHA512:
-  metadata.gz: 06f0caf4817b2caf3afea07df85e7fbeb51cc1189286a6b5b6e2da5c5e5856937df9ef877f3df359b92b04a5f3804871548f88bcd1d0cb3f5cb1f3f0f7514dba
-  data.tar.gz: f68a56e81e204ccae44b148119e98307e1e77e3b43f1f4d48ee7e84ed4e713c173c55dfd4a7b2e50c7ccbacc83cbe963e9a185addb52fed8c7265d89ce22bd63
+  metadata.gz: 9993b9a62d95af832c80c9def43d398d86ee7c4229c7340d827c1a96af79d3d74f33eba8a8800c0879807ac23bcc4a5847a9854a20efc467843f1e8e8ba2a82b
+  data.tar.gz: dcec81da1e73cd747f3c2e4aacab03eb83be6f0ec5778bdb4909e0a6a8bad8aa4493d26de1cba04d8efc7727ff4ff0744037d1d6ee2fe625819d16598733e16a

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/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
 

data/app/uploaders/ico_uploader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class IcoUploader < ApplicationUploader
-  def extension_whitelist
+  def extension_allowlist
     model.class.file_extensions || %w[ico]
   end
 end

data/app/uploaders/image_defaults.rb

@@ -8,7 +8,7 @@ module ImageDefaults
       [mounted_as, version_name].compact.join('_') << '.gif'
   end
 
-  def extension_whitelist
+  def extension_allowlist
     model.class.file_extensions || %w[jpg jpeg gif png]
   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'
+    VERSION = '3.0.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
+  version: 3.0.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-12-19 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.2.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines