tramway-core 4.1.3 → 4.1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c84e09b4acb7d9593eea58e775c5df69cd5ab2c441bf65f3a1e42667bad071d
-  data.tar.gz: e80ee805784db8ab7b545025060a41650e0b30d8e3d02e32953346d6da1ad955
+  metadata.gz: 153521a03d19b366091c152c6ae00ae8aed672b056a33ab45e4ab2ee2c50f401
+  data.tar.gz: d90e8463f246895e6b0304b5d6be32e7985c6e13a4957f4c54ef90aa6e18531c
 SHA512:
-  metadata.gz: 8ca4dfb010df866f974e45165428505763c9840194e70bd2f4e0a49e9bb015f5e56aa592d3444109c78994423a6562064481e4c26fa755b9b39d842e73745643
-  data.tar.gz: 85f72f24a12cf2a62860dc5636e91a67e230962da4c08828d644a8e509a7f20ea54293fd30de10e2fb3cf4d6d4298887636cb5c8028bcd6cff47c441adcb45d7
+  metadata.gz: cedafd11ac58eb5b35de79fb235c5ebf5b2deb0257c3cd30c6b843fe7f38e353671d28bf72a7eb2f41f6fb5f33f65dbf9d8524da56a57dc41ee4565b7cf90487
+  data.tar.gz: 7b4398329d6ab326176434bed3bc30b5a274261331efd586380b0b7c1984c4c054fd057b0038511456bb8d22eeec8b6e6d1306c60f0e12a0c0b76649fcf65fae

data/README.md

@@ -1,4 +1,4 @@
-# ![tramway-ico](https://raw.githubusercontent.com/kalashnikovisme/kalashnikovisme/master/%D1%82%D1%80%D1%8D%D0%BC%D0%B2%D1%8D%D0%B9%D0%B1%D0%B5%D0%B7%D1%84%D0%BE%D0%BD%D0%B0-min.png) Tramway::Core ![Ruby](https://github.com/Purple-Magic/tramway-core/workflows/Tests/badge.svg) ![Ruby](https://github.com/Purple-Magic/tramway-core/workflows/Rubocop/badge.svg) [![Gem Version](https://badge.fury.io/rb/tramway-core.svg)](https://badge.fury.io/rb/tramway-core)
+# ![tramway-ico](https://raw.githubusercontent.com/kalashnikovisme/kalashnikovisme/master/%D1%82%D1%80%D1%8D%D0%BC%D0%B2%D1%8D%D0%B9%D0%B1%D0%B5%D0%B7%D1%84%D0%BE%D0%BD%D0%B0-min.png) Tramway::Core [![Tests](https://github.com/Purple-Magic/tramway-core/actions/workflows/tests.yml/badge.svg)](https://github.com/Purple-Magic/tramway-core/actions/workflows/tests.yml) [![Rubocop](https://github.com/Purple-Magic/tramway-core/actions/workflows/rubocop.yml/badge.svg)](https://github.com/Purple-Magic/tramway-core/actions/workflows/rubocop.yml) [![Gem Version](https://badge.fury.io/rb/tramway-core.svg)](https://badge.fury.io/rb/tramway-core)
 
 *If you need translation of this Readme, please message us kalashnikov@ulmic.ru. We'll translate for you and post to this page*
 

data/app/controllers/tramway/core/application_controller.rb

@@ -5,9 +5,9 @@ class Tramway::Core::ApplicationController < ActionController::Base
   before_action :load_extensions
 
   def application
-    if ::Tramway::Core.application
-      @application ||= Tramway::Core.application&.model_class&.first || Tramway::Core.application
-    end
+    return unless ::Tramway::Core.application
+
+    @application ||= Tramway::Core.application&.model_class&.first || Tramway::Core.application
   end
 
   def load_extensions

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

@@ -36,7 +36,7 @@ class Tramway::Core::ApplicationDecorator
         dir
       end
     end.join('/')
-    Haml::Engine.new(File.read"#{Rails.root}/app/views/#{view_name}.html.haml").render(self, locals)
+    Haml::Engine.new(File.read("#{Rails.root}/app/views/#{view_name}.html.haml")).render(self, locals)
   end
 
   def listed_state_machines
@@ -44,30 +44,16 @@ class Tramway::Core::ApplicationDecorator
   end
 
   delegate :id, to: :object
-  delegate :human_state_name, to: :object
 
   class << self
     include ::Tramway::Core::Associations::ClassHelper
     include ::Tramway::Core::Delegating::ClassHelper
-
-    def collections
-      [:all]
-    end
-
-    def list_attributes
-      []
-    end
-
-    def show_attributes
-      []
-    end
-
-    def show_associations
-      []
-    end
+    include ::Tramway::Core::Default::ValuesHelper
 
     def decorate(object_or_array)
-      if object_or_array.class.superclass == ActiveRecord::Relation || object_or_array.class.to_s.include?('ActiveRecord_AssociationRelation')
+      is_activerecord_relation = object_or_array.class.superclass == ActiveRecord::Relation
+      is_activerecord_association_relation = object_or_array.class.to_s.include?('ActiveRecord_AssociationRelation')
+      if is_activerecord_relation || is_activerecord_association_relation
         decorated_array = object_or_array.map do |obj|
           new obj
         end
@@ -84,10 +70,6 @@ class Tramway::Core::ApplicationDecorator
     def model_name
       model_class.try(:model_name)
     end
-
-    def list_filters
-      {}
-    end
   end
 
   def link
@@ -99,10 +81,7 @@ class Tramway::Core::ApplicationDecorator
   end
 
   def additional_buttons
-    {
-      show: [],
-      index: []
-    }
+    { show: [], index: [] }
   end
 
   def public_path; end
@@ -133,10 +112,6 @@ class Tramway::Core::ApplicationDecorator
     end
   end
 
-  def yes_no(boolean_attr)
-    boolean_attr.to_s == 'true' ? I18n.t('helpers.yes') : I18n.t('helpers.no')
-  end
-
   protected
 
   attr_reader :object

data/app/decorators/tramway/core/concerns/attributes_decorator_helper.rb

@@ -10,8 +10,9 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
   end
 
   def state_machine_view(object, attribute_name)
-    I18n.t("state_machines.#{object.class.model_name.to_s.underscore}.#{attribute_name}.states.#{object.send(attribute_name)}")
-  rescue
+    state = object.send(attribute_name)
+    I18n.t("state_machines.#{object.class.model_name.to_s.underscore}.#{attribute_name}.states.#{state}")
+  rescue StandardError
     object.aasm.human_state
   end
 
@@ -88,4 +89,8 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
   def download_button(filename:, original:)
     link_to(fa_icon(:download), src_original(original), class: 'btn btn-success', download: filename)
   end
+
+  def yes_no(boolean_attr)
+    boolean_attr.to_s == 'true' ? I18n.t('helpers.yes') : I18n.t('helpers.no')
+  end
 end

data/app/decorators/tramway/core/default/values_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Tramway::Core::Default::ValuesHelper
+  def collections
+    [:all]
+  end
+
+  def list_attributes
+    []
+  end
+
+  def show_attributes
+    []
+  end
+
+  def show_associations
+    []
+  end
+
+  def list_filters
+    {}
+  end
+end

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

@@ -3,7 +3,7 @@
 module Tramway::Core::ApplicationForms::AssociationObjectHelpers
   def define_association_method(association, class_name)
     if class_name.is_a? Array
-      define_polymorphic_association association, class_name
+      define_polymorphic_association association
     else
       self.class.send(:define_method, "#{association}=") do |value|
         model.send "#{association}_id=", value
@@ -12,19 +12,25 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
     end
   end
 
-  def define_polymorphic_association(association, _class_name)
+  def define_polymorphic_association(association)
     self.class.send(:define_method, "#{association}=") do |value|
       if value.present?
-        association_class = value.split('_')[0..-2].join('_').camelize
-        association_class = association_class.constantize if association_class.is_a? String 
-        if association_class.nil?
+        if association_class(value).nil?
           Tramway::Error.raise_error :tramway, :core, :application_form, :initialize, :polymorphic_class_is_nil,
             association_name: association
         else
-          model.send "#{association}=", association_class.find(value.split('_')[-1])
-          send "#{association}_type=", association_class.to_s
+          model.send "#{association}=", association_class(value).find(value.split('_')[-1])
+          send "#{association}_type=", association_class(value).to_s
         end
       end
     end
   end
+
+  private
+
+  def association_class(value)
+    association_class_object = value.split('_')[0..-2].join('_').camelize
+    association_class_object = association_class_object.constantize if association_class_object.is_a? String
+    association_class_object
+  end
 end

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

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Tramway::Core::ApplicationForms::Frontend
   def react_component(on = false)
     @react_component = on
   end
 
-  def is_react_component?
+  def react_component?
     @react_component ||= false
+    @react_component
   end
 end

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

@@ -18,11 +18,9 @@ module Tramway::Core::ApplicationForms::SubmitHelper
   rescue ArgumentError => e
     Tramway::Error.raise_error :tramway, :core, :application_form, :save, :argument_error, message: e.message
   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
-    else
-      raise e
-    end
+    raise e unless 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
   end
 end

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

@@ -7,7 +7,9 @@ module Tramway::Core::Inputs::AssociationsHelper
     check_valid_association full_class_name_association
     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.sort_by do |association|
+      association.name || "#{association.class.name} ##{association.id}"
+    end
   end
 
   def build_value_for_association(form_object, property, value)

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

@@ -14,10 +14,8 @@ module Tramway::Core::Inputs::PolymorphicAssociationsHelper
   def build_value_for_polymorphic_association(form_object, property, value)
     if form_object.send(property).present?
       "#{form_object.send(property).class.to_s.underscore}_#{form_object.send(property).id}"
-    else
-      if value[:type].present? && value[:id].present? 
-        "#{value[:type]&.underscore}_#{value[:id]}"
-      end
+    elsif value[:type].present? && value[:id].present?
+      "#{value[:type]&.underscore}_#{value[:id]}"
     end
   end
 

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

@@ -11,9 +11,9 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   scope :created_by_user, lambda { |user_id|
     joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id)
   }
-  scope :admin_scope, -> (_arg) { all }
+  scope :admin_scope, ->(_arg) { all }
 
-  # FIXME remove this after testing soft-deletion
+  # FIXME: remove this after testing soft-deletion
   aasm column: :state do
     state :active, initial: true
     state :removed
@@ -42,7 +42,10 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     end
 
     def search_by(*attributes, **associations)
-      pg_search_scope :full_text_search, against: attributes, associated_against: associations, using: [:tsearch, :trigram]
+      pg_search_scope :full_text_search,
+        against: attributes,
+        associated_against: associations,
+        using: %i[tsearch trigram]
     end
 
     def uploader(attribute_name, uploader_name, **options)

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '4.1.3'
+    VERSION = '4.1.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.3.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aasm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: audited
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +335,7 @@ files:
 - app/decorators/tramway/core/attributes/view_helper.rb
 - app/decorators/tramway/core/concerns/attributes_decorator_helper.rb
 - app/decorators/tramway/core/concerns/table_builder.rb
+- app/decorators/tramway/core/default/values_helper.rb
 - app/decorators/tramway/core/delegating/class_helper.rb
 - app/forms/tramway/core/application_form.rb
 - app/forms/tramway/core/application_forms/association_class_helpers.rb