tramway-core 2.0.1.2 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7fbeb0c0bde1816d9b7bb0a1c19ac6e3c4c4dceb82f5ab6191fab43da73f7b5
-  data.tar.gz: 1206e596cc17c747d4d43925bc332d0c5da414c7cd052fd3fec0a73e492af803
+  metadata.gz: 452854a6e69a3dc5fccfd7d05cdcc7f48c3f23a68b6a4914da99872d53d59f18
+  data.tar.gz: 611afba4d6da1ce7b1b49f282a23b1bf96d0d8c4b95ce6a70849a01cf7ffb4ca
 SHA512:
-  metadata.gz: ab7daad1eb8677e55d87e2cff37336809bf94753ddfe8773fa11ae6785675b3bda02f99d033117c30d3c93dbc4eb212db52915fae4f0fe2f2ef1b5bafecddd09
-  data.tar.gz: 0db2b8d103a5136a41f2019ec99cb7731e4bafdb7215bdfc6d5efc1c7060ab2f98e53c10a81eadd55b46ef572036dd934de52c4dddf3dcfb20c406e915b4a4fd
+  metadata.gz: 1cd0d672d4ec97bb430b718f012c2cd14166ea99e5d1b776bbc9addbe64737d763ee4aa5b929a48ea01693a7c37ec7abafbdbdd1dc186154e4fa7d2328cd1749
+  data.tar.gz: 92f7a4b44ef879b3a7bdbc7b2ddeb6755a987ff47f90a8479d52c8b409dd2a158d2a95af6879c5a1da28e2eae37cc78dfa9e8b5eee0a9c24f27b3194e40e3ec7

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

@@ -27,6 +27,17 @@ class Tramway::Core::ApplicationDecorator
     )
   end
 
+  def render(view, **locals)
+    view_name = view.split('/').map.with_index do |dir, index|
+      if index == view.split('/').length - 1
+        "_#{dir}"
+      else
+        dir
+      end
+    end.join('/')
+    Haml::Engine.new(File.read"#{Rails.root}/app/views/#{view_name}.html.haml").render(self, locals)
+  end
+
   delegate :id, to: :object
   delegate :human_state_name, to: :object
 

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,16 +8,6 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   extend ::Enumerize
   include ::AASM
 
-  aasm column: :state do
-    state :active, initial: true
-    state :removed
-
-    event :remove do
-      transitions from: :active, to: :removed
-    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)
   }

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.1.2'
+    VERSION = '3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1.2
+  version: '3.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-25 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