tramway-core 1.17.2.1 → 1.17.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c3cd63ade145dc9d56b1ed79122789322b6956273157b8d81a65ee8b9107af
-  data.tar.gz: 36e9210fe35bd7e33d218b786354b71a2ad1a316cb33252345a3ae5b49a5b6b3
+  metadata.gz: 3c612a0122da3218a86e61b973beff51f378e14352fd424489130039694f82f8
+  data.tar.gz: 07d47a9b6e995469f7b500e34b21f705cc24ce1e4aede1e946ace36f5ddebb28
 SHA512:
-  metadata.gz: 6f95be747fa6d661b575968a76053a0cee7092460d1ae919aa055f4db7a18b1fa9810a1bd76d5c2af4f667b379a836c95461e7c7060ef9f1aeb16a8f5bfe9515
-  data.tar.gz: a2e82ebb362b3d275aa4bec8e16c49ad6946dd36af98fb9dc5b09251a0b54178ce8115a5e1fe2cff8b121b99f06ed4d4f4579ee9317cb4cc64f85e19e91a69ca
+  metadata.gz: 8b275c112e32864152637a34c283677de289fc2fb5e79123fd15f149656e0d3741c1b7768e06d441004927e4fe5db0f4af2a744a55e6fdc58fe210227e1b7ce7
+  data.tar.gz: 350ace536d11005778f241370a3179f5f51f9078d8822ca4e80955aeb0ffb93edbafc64e55d9635d0cba4e4cc4ef8b3fd6f3aa205a7171542b25e6500c82d281

data/README.md

@@ -203,8 +203,10 @@ Tramway::Admin.set_singleton_models Organization, project: :organization # now y
 * models - часто используемые в моделях слова
 * state_machines - локализация состояний
 
-## Contributing
-Contribution directions go here.
+## Contributors
+
+* [Pavel Kalashnikov](https://github.com/kalashnikovisme)
+* [moshinaan](https://github.com/moshinaan)
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

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

@@ -65,7 +65,6 @@ class Tramway::Core::ApplicationDecorator
     end
   end
 
-
   def link
     if object.try :file
       object.file.url

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

@@ -25,6 +25,7 @@ module Tramway::Core::Associations::ClassHelper
       decorate_association association_name
     end
   end
+
   def define_main_association_method(association_name, decorator)
     define_method association_name do
       association = object.class.reflect_on_association(association_name)

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

@@ -6,7 +6,7 @@ module Tramway::Core::Associations::ObjectHelper
       object.send(association.name).class
     else
       unless association.options[:class_name]
-        error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`")
+        error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: "Please, specify `#{association.name}` association class_name in #{object.class} model. For example: `has_many :#{association.name}, class_name: '#{association.name.to_s.singularize.camelize}'`")
         raise error.message
       end
       association.options[:class_name]

data/app/decorators/tramway/core/delegating/class_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Core::Delegating::ClassHelper
   def delegate_attributes(*attributes)
     attributes.each do |attr|

data/app/forms/tramway/core/application_form.rb

@@ -1,179 +1,116 @@
 # frozen_string_literal: true
 
-module Tramway::Core
-  class ApplicationForm < ::Reform::Form
-    def initialize(object = nil)
-      object ||= self.class.model_class.new
-      super(object).tap do
-        @@model_class = object.class
-        @@enumerized_attributes = object.class.try :enumerized_attributes
-        @@associations ||= []
-
-        self.class.full_class_name_associations.each do |association, class_name|
-          if class_name.is_a? Array
-            self.class.send(:define_method, "#{association}=") do |value|
-              association_class = value.split('_')[0..-2].join('_').camelize
-              association_class = association_class.constantize if association_class.is_a? String
-              if association_class.nil?
-                raise Tramway::Error.new(plugin: :core, method: :initialize, message: 'Polymorphic association class is nil. Maybe, you should write `assocation #{association_name}` after `properties #{association_name}_id, #{association_name}_type`')
-              else
-                super association_class.find value.split('_')[-1]
-                send "#{association}_type=", association_class.to_s
-              end
-            end
-          else
-            self.class.send(:define_method, "#{association}=") do |value|
-              super class_name.find value
-            end
-          end
-        end
-
-        delegating object
+class Tramway::Core::ApplicationForm < ::Reform::Form
+  include Tramway::Core::ApplicationForms::AssociationObjectHelpers
+  include Tramway::Core::ApplicationForms::ConstantObjectActions
+  include Tramway::Core::ApplicationForms::PropertiesObjectHelper
+
+  def initialize(object = nil)
+    object ||= self.class.model_class.new
+    super(object).tap do
+      @@model_class = object.class
+      @@enumerized_attributes = object.class.try :enumerized_attributes
+      @@associations ||= []
+
+      self.class.full_class_name_associations&.each do |association, class_name|
+        define_association_method association, class_name
       end
-    end
 
-    def submit(params)
-      if params
-        if validate params
-          begin
-            save
-          rescue StandardError => e
-            error = Tramway::Error.new(plugin: :core, method: :submit, message: "Looks like you have method `#{e.name.to_s.gsub('=', '')}` in #{@@model_class}. You should rename it or rename property in #{self.class}")
-            raise error.message
-          end
-        else
-          @@associations.each do |association|
-            if errors.details[association] == [{ error: :blank }]
-              model.send("#{association}=", send(association))
-            end
-          end
-        end
-      else
-        error = Tramway::Error.new(plugin: :core, method: :submit, message: 'ApplicationForm::Params should not be nil')
-        raise error.message
-      end
+      delegating object
     end
+  end
 
-    def model_name
-      @@model_class.model_name
+  def submit(params)
+    if params
+      validate(params) ? save : collecting_associations_errors
+    else
+      Tramway::Error.raise_error(:tramway, :core, :application_form, :submit, :params_should_not_be_nil)
     end
+  end
 
-    def associations
-      @@associations
-    end
+  def model_name
+    @@model_class.model_name
+  end
 
-    def form_properties(**args)
-      @form_properties = args
-    end
+  class << self
+    include Tramway::Core::ApplicationForms::ConstantClassActions
 
-    def form_properties_additional(**args)
-      @form_properties_additional = args
-    end
+    delegate :defined_enums, to: :model_class
 
-    def properties
-      return @form_properties if @form_properties
+    def association(property)
+      properties property
+      @@associations = ((defined?(@@associations) && @@associations) || []) + [property]
+    end
 
-      yaml_config_file_path = Rails.root.join('app', 'forms', "#{self.class.name.underscore}.yml")
-      if File.exist? yaml_config_file_path
-        @form_properties = YAML.load_file(yaml_config_file_path).deep_symbolize_keys
-        @form_properties.deep_merge! @form_properties_additional if @form_properties_additional
-        @form_properties
-      else
-        []
-      end
+    def associations(*properties)
+      properties.each { |property| association property }
     end
 
-    def build_errors; end
+    def full_class_name_associations
+      @@associations&.reduce({}) do |hash, association|
+        options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
+          a.name == association.to_sym
+        end.first&.options
 
-    def delegating(object)
-      methods = %i[to_key errors]
-      methods.each do |method|
-        self.class.send(:define_method, method) do
-          object.send method
+        if options&.dig(:polymorphic)
+          hash.merge! association => @@model_class.send("#{association}_type").values
+        elsif options.present?
+          hash.merge!(association => (options[:class_name] || association.to_s.camelize).constantize)
         end
+        hash
       end
     end
 
-    def attributes
-      properties.reduce({}) do |hash, property|
-        hash.merge! property.first => model.values[property.first.to_s]
-      end
+    def full_class_name_association(association_name)
+      full_class_name_associations[association_name]
     end
 
-    class << self
-      delegate :defined_enums, to: :model_class
-
-      def association(property)
-        properties property
-        @@associations ||= []
-        @@associations << property
-      end
+    def reflect_on_association(*args)
+      @@model_class.reflect_on_association(*args)
+    end
 
-      def associations(*properties)
-        properties.each do |property|
-          association property
-        end
-      end
+    def enumerized_attributes
+      @@enumerized_attributes
+    end
 
-      def full_class_name_associations
-        @@associations&.reduce({}) do |hash, association|
-          options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
-            a.name == association.to_sym
-          end.first&.options
-
-          if options
-            if options[:polymorphic]
-              hash.merge! association => @@model_class.send("#{association}_type").values
-            else
-              class_name = options[:class_name] || association.to_s.camelize
-              hash.merge!(association => class_name.constantize)
-            end
-          end
-          hash
+    def model_class
+      if defined?(@@model_class) && @@model_class
+        @@model_class
+      else
+        model_class_name ||= name.to_s.sub(/Form$/, '')
+        begin
+          @@model_class = model_class_name.constantize
+        rescue StandardError
+          Tramway::Error.raise_error :tramway, :core, :application_form, :model_class, :there_is_not_model_class,
+            name: name, model_class_name: model_class_name
         end
       end
+    end
 
-      def full_class_name_association(association_name)
-        full_class_name_associations[association_name]
-      end
-
-      def enumerized_attributes
-        @@enumerized_attributes
-      end
-
-      def reflect_on_association(*args)
-        @@model_class.reflect_on_association(*args)
-      end
-
-      def model_class
-        if defined?(@@model_class) && @@model_class
-          @@model_class
-        else
-          model_class_name ||= name.to_s.sub(/Form$/, '')
-          begin
-            @@model_class = model_class_name.constantize
-          rescue StandardError
-            error = Tramway::Error.new(plugin: :core, method: :model_class, message: "There is not model class name for #{name}. Should be #{model_class_name} or you can use another class to initialize form object or just initialize form with object.")
-            raise error.message
-          end
-        end
-      end
+    def model_class=(name)
+      @@model_class = name
+    end
 
-      def model_class=(name)
-        @@model_class = name
+    def validates(attribute, **options)
+      if !defined?(@@model_class) || @@model_class.nil?
+        Tramway::Error.raise_error(:tramway, :core, :application_form, :validates, :you_need_to_set_model_class)
       end
+      @@model_class.validates attribute, **options
+    end
+  end
 
-      def validation_group_class
-        ActiveModel
-      end
+  private
 
-      def validates(attribute, **options)
-        if !defined?(@@model_class) || @@model_class.nil?
-          error = Tramway::Error.new(plugin: :core, method: :validates, message: 'You need to set `model_class` name while using validations. Just write `self.model_class = YOUR_MODEL_NAME` in the class area.')
-          raise error.message
-        end
-        @@model_class.validates attribute, **options
-      end
+  def collecting_associations_errors
+    @@associations.each do |association|
+      model.send("#{association}=", send(association)) if errors.details[association] == [{ error: :blank }]
     end
   end
+
+  def save
+    super
+  rescue StandardError => e
+    Tramway::Error.raise_error :tramway, :core, :application_form, :submit, :looks_like_you_have_method,
+      method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
+  end
 end

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

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

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::ConstantClassActions
+  def validation_group_class
+    ActiveModel
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::ConstantObjectActions
+  def delegating(object)
+    %i[to_key errors].each { |method| self.class.send(:define_method, method) { object.send method } }
+  end
+
+  def build_errors; end
+
+  def attributes
+    properties.reduce({}) { |hash, property| hash.merge! property.first => model.values[property.first.to_s] }
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::PropertiesObjectHelper
+  def form_properties(**args)
+    @form_properties = args
+  end
+
+  def form_properties_additional(**args)
+    @form_properties_additional = args
+  end
+
+  def properties
+    return @form_properties if @form_properties
+
+    yaml_config_file_path = Rails.root.join('app', 'forms', "#{self.class.name.underscore}.yml")
+
+    return [] unless File.exist? yaml_config_file_path
+
+    @form_properties = YAML.load_file(yaml_config_file_path).deep_symbolize_keys
+    @form_properties.deep_merge! @form_properties_additional if @form_properties_additional
+    @form_properties
+  end
+end

data/app/forms/tramway/core/extendable_form.rb

@@ -2,80 +2,13 @@
 
 class Tramway::Core::ExtendableForm
   class << self
+    include Tramway::Core::ExtendableFormsHelpers::ClassBuilder
+
     def new(name, simple_properties: {}, **more_properties)
       if Object.const_defined? name
         name.constantize
       else
-        Object.const_set(name, Class.new(::Tramway::Core::ApplicationForm) do
-          properties(*simple_properties.keys) if simple_properties.keys.any?
-
-          define_method 'submit' do |params|
-            model.values ||= {}
-            extended_params = params.except(*simple_properties.keys).except(*jsonb_ignored_properties(more_properties))
-            params.each do |key, value|
-              method_name = "#{key}="
-              send method_name, value if respond_to?(method_name)
-            end
-            model.values = extended_params.permit!.to_h.reduce(model.values) do |hash, pair|
-              hash.merge! pair[0] => pair[1]
-            end
-            super(params) && model.errors.empty?
-          end
-
-          define_method 'properties' do
-            hash = simple_properties.each_with_object({}) do |property, h|
-              h.merge! property[0] => property[1] unless model.class.state_machines.keys.include?(property[0])
-            end
-            more_properties.reduce(hash) do |h, property|
-              h.merge! property[0] => {
-                extended_form_property: property[1][:object]
-              }
-            end
-          end
-
-          more_properties.each do |property|
-            define_method property[0] do
-              model.values[property[0]] if model.values
-            end
-
-            case property[1][:object].field_type
-            when 'file'
-              field = property[1][:object]
-              define_method "#{property[0]}=" do |value|
-                file_instance = property[1][:association_model].find_or_create_by "#{model.class.name.underscore}_id" => model.id, "#{field.class.name.underscore}_id" => field.id
-                file_instance.file = value
-                file_instance.save!
-              end
-            else
-              next unless property[1][:validates].present?
-
-              define_method "#{property[0]}=" do |value|
-                property[1][:validates].each do |pair|
-                  case pair[0].to_s
-                  when 'presence'
-                    validator_object = "#{pair[0].to_s.camelize}Validator".constantize.new(attributes: :not_blank)
-                    if pair[1] == 'true' && !validator_object.send(:valid?, value)
-                      model.errors.add property[0],
-                        I18n.t("activerecord.errors.models.#{model.class.name.underscore}.attributes.default.#{pair[0]}", value: value)
-                    end
-                  when 'inclusion'
-                    in_array = pair[1][:in]
-                    unless value.in? in_array
-                      model.errors.add property[0],
-                        I18n.t("activerecord.errors.models.#{model.class.name.underscore}.attributes.default.#{pair[0]}", value: value)
-                    end
-                  end
-                end
-              end
-            end
-          end
-
-          define_method :jsonb_ignored_properties do |properties|
-            properties.map do |property|
-              property[0].to_s if property[1][:object].field_type == 'file'
-            end.compact
-          end
-        end)
+        build_form_class name, simple_properties, more_properties
       end
     end
   end

data/app/forms/tramway/core/extendable_forms_helpers/class_builder.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::ClassBuilder
+  def build_form_class(name, simple_properties, more_properties)
+    Object.const_set(name, Class.new(::Tramway::Core::ApplicationForm) do
+      properties(*simple_properties.keys) if simple_properties.keys.any?
+
+      include Tramway::Core::ExtendableFormsHelpers::Submit::ObjectHelpers
+      include Tramway::Core::ExtendableFormsHelpers::Validators
+      extend Tramway::Core::ExtendableFormsHelpers::Submit::ClassHelpers
+      extend Tramway::Core::ExtendableFormsHelpers::PropertiesHelper
+      extend Tramway::Core::ExtendableFormsHelpers::MorePropertiesHelper
+      extend Tramway::Core::ExtendableFormsHelpers::IgnoredPropertiesHelper
+
+      define_submit_method simple_properties, more_properties
+      define_properties_method simple_properties, more_properties
+      define_ignored_properties_method
+
+      more_properties.each do |property|
+        define_property_method property[0]
+
+        case property[1][:object].field_type
+        when 'file'
+          field = property[1][:object]
+          define_file_property_assignment_method property field
+        else
+          next unless property[1][:validates].present?
+
+          define_assignment_method property
+        end
+      end
+    end)
+  end
+end

data/app/forms/tramway/core/extendable_forms_helpers/ignored_properties_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::IgnoredPropertiesHelper
+  def define_ignored_properties_method
+    define_method :jsonb_ignored_properties do |properties|
+      properties.map do |property|
+        property[0].to_s if property[1][:object].field_type == 'file'
+      end.compact
+    end
+  end
+end

data/app/forms/tramway/core/extendable_forms_helpers/more_properties_helper.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::MorePropertiesHelper
+  def define_property_method(property_name)
+    define_method property_name do
+      model.values[property_name] if model.values
+    end
+  end
+
+  def define_assignment_method(property)
+    define_method "#{property[0]}=" do |value|
+      property[1][:validates].each do |pair|
+        make_validates property[0], pair, value
+      end
+    end
+  end
+
+  def define_file_property_assignment_method(property, field)
+    define_method "#{property[0]}=" do |value|
+      file_instance = property[1][:association_model].find_or_create_by(
+        "#{model.class.name.underscore}_id" => model.id, "#{field.class.name.underscore}_id" => field.id
+      )
+      file_instance.file = value
+      file_instance.save!
+    end
+  end
+end

data/app/forms/tramway/core/extendable_forms_helpers/properties_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::PropertiesHelper
+  def define_properties_method(simple_properties, more_properties)
+    define_method 'properties' do
+      hash = simple_properties.each_with_object({}) do |property, h|
+        h.merge! property[0] => property[1] unless model.class.state_machines.keys.include?(property[0])
+      end
+      more_properties.reduce(hash) do |h, property|
+        h.merge! property[0] => {
+          extended_form_property: property[1][:object]
+        }
+      end
+    end
+  end
+end

data/app/forms/tramway/core/extendable_forms_helpers/submit/class_helpers.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::Submit::ClassHelpers
+  def define_submit_method(simple_properties, more_properties)
+    define_method 'submit' do |params|
+      model.values ||= {}
+      extended_params = extended(simple_properties, more_properties, params)
+      params.each do |key, value|
+        method_name = "#{key}="
+        send method_name, value if respond_to?(method_name)
+      end
+      model.values = extended_params.reduce(model.values) do |hash, pair|
+        hash.merge! pair[0] => pair[1]
+      end
+      super(params) && model.errors.empty?
+    end
+  end
+end

data/app/forms/tramway/core/extendable_forms_helpers/submit/object_helpers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::Submit::ObjectHelpers
+  def extended(simple_properties, more_properties, params)
+    params.except(*simple_properties.keys).except(*jsonb_ignored_properties(more_properties)).permit!.to_h
+  end
+end

data/app/forms/tramway/core/extendable_forms_helpers/validators.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ExtendableFormsHelpers::Validators
+  def make_validates(property_name, validation, value)
+    case validation[0].to_s
+    when 'presence'
+      presence_validator property_name, validation, value
+    when 'inclusion'
+      inclusion_validator property_name, validation, value
+    end
+  end
+
+  def presence_validator(property_name, validation, value)
+    validator_object = PresenceValidator.new(attributes: :not_blank)
+    return if validation[1] == 'false'
+    return if validation[1] == 'true' && validator_object.send(:valid?, value)
+
+    model.errors.add(
+      property_name,
+      I18n.t(
+        "activerecord.errors.models.#{model.class.name.underscore}.attributes.default.#{validation[0]}",
+        value: value
+      )
+    )
+  end
+
+  def inclusion_validator(property_name, validation, value)
+    in_array = validation[1][:in]
+
+    return if value.in? in_array
+
+    model.errors.add(
+      property_name,
+      I18n.t(
+        "activerecord.errors.models.#{model.class.name.underscore}.attributes.default.#{validation[0]}",
+        value: value
+      )
+    )
+  end
+end

data/app/helpers/tramway/core/copy_to_clipboard_helper.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-module Tramway
-  module Core
-    module CopyToClipboardHelper
-      def copy_to_clipboard(id)
-        button_tag class: 'btn btn-info clipboard-btn',
-                   data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
-                   style: 'margin-left: 15px' do
-          fa_icon 'copy'
-        end
-      end
+module Tramway::Core::CopyToClipboardHelper
+  def copy_to_clipboard(id)
+    button_tag class: 'btn btn-info clipboard-btn',
+               data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
+               style: 'margin-left: 15px' do
+      fa_icon 'copy'
     end
   end
 end

data/app/helpers/tramway/core/title_helper.rb

@@ -1,29 +1,24 @@
 # frozen_string_literal: true
 
-module Tramway
-  module Core
-    module TitleHelper
-      def title(page_title = default_title)
-        if @application.present?
-          title_text = "#{page_title} | #{@application.try(:title) || @application.public_name}"
-          content_for(:title) { title_text }
-        else
-          error = Tramway::Error.new(plugin: :core, method: :title, message: 'You should set Tramway::Core::Application class using `::Tramway::Core.initialize_application model_class: #{model_class_name}` in config/initializers/tramway.rb OR maybe you don\'t have any records of application model')
-          raise error.message
-        end
-      end
+module Tramway::Core::TitleHelper
+  def title(page_title = default_title)
+    if @application.present?
+      title_text = "#{page_title} | #{@application.try(:title) || @application.public_name}"
+      content_for(:title) { title_text }
+    else
+      Tramway::Error.raise_error(:tramway, :core, :title_helper, :title, :you_should_set_tramway_core_application)
+    end
+  end
 
-      def default_title
-        t('.title')
-      end
+  def default_title
+    t('.title')
+  end
 
-      def page_title(action, model_name)
-        if I18n.locale == :ru
-          t("helpers.actions.#{action}") + ' ' + genitive(model_name)
-        else
-          t("helpers.actions.#{action}") + ' ' + model_name.model_name.human.downcase
-        end
-      end
+  def page_title(action, model_name)
+    if I18n.locale == :ru
+      t("helpers.actions.#{action}") + ' ' + genitive(model_name)
+    else
+      t("helpers.actions.#{action}") + ' ' + model_name.model_name.human.downcase
     end
   end
 end

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

@@ -2,52 +2,50 @@
 
 require 'carrierwave/orm/activerecord' if defined?(CarrierWave::Mount)
 
-module Tramway
-  module Core
-    class ApplicationRecord < ActiveRecord::Base
-      self.abstract_class = true
-      audited
-      extend ::Enumerize
-
-      state_machine :state, initial: :active do
-        state :active
-        state :removed
-
-        event :remove do
-          transition active: :remove
-        end
-      end
+class Tramway::Core::ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+  audited
+  extend ::Enumerize
 
-      scope :active, -> { where state: :active }
-      scope :created_by_user, ->(user_id) { joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id) }
-      scope :admin_scope, ->(_arg) { all }
+  state_machine :state, initial: :active do
+    state :active
+    state :removed
 
-      include ::PgSearch::Model
+    event :remove do
+      transition active: :remove
+    end
+  end
 
-      def creator
-        audits.where(action: :create).first.user
-      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 }
 
-      # FIXME: detect inhertited locales
-      class << self
-        def human_attribute_name(attribute_name, *_args)
-          excepted_attributes = %w[created_at updated_at state]
-          if attribute_name.to_s.in? excepted_attributes
-            I18n.t "activerecord.attributes.tramway/core/application_record.#{attribute_name}"
-          else
-            super attribute_name
-          end
-        end
-
-        def search_by(*attributes, **associations)
-          pg_search_scope :full_text_search, against: attributes, associated_against: associations
-        end
-      end
+  include ::PgSearch::Model
 
-      # FIXME: detect inhertited locales
-      def human_state_name
-        I18n.t "activerecord.state_machines.tramway/core/application_record.state.states.#{state}"
+  def creator
+    audits.where(action: :create).first.user
+  end
+
+  # FIXME: detect inhertited locales
+  class << self
+    def human_attribute_name(attribute_name, *_args)
+      excepted_attributes = %w[created_at updated_at state]
+      if attribute_name.to_s.in? excepted_attributes
+        I18n.t "activerecord.attributes.tramway/core/application_record.#{attribute_name}"
+      else
+        super attribute_name
       end
     end
+
+    def search_by(*attributes, **associations)
+      pg_search_scope :full_text_search, against: attributes, associated_against: associations
+    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/uploaders/image_defaults.rb

@@ -4,7 +4,8 @@ module ImageDefaults
   include CarrierWave::MiniMagick
 
   def default_url
-    "/images/fallback/#{model.class.model_name.to_s.underscore}/" << [mounted_as, version_name].compact.join('_') << '.gif'
+    "/images/fallback/#{model.class.model_name.to_s.underscore}/" <<
+      [mounted_as, version_name].compact.join('_') << '.gif'
   end
 
   def extension_white_list

data/app/uploaders/photo_uploader.rb

@@ -44,14 +44,14 @@ class PhotoUploader < ApplicationUploader
   before :cache, :capture_size
 
   def capture_size(file)
-    if version_name.blank?
-      if file.path.nil?
-        img = ::MiniMagick::Image.read(file.file)
-        @width = img[:width]
-        @height = img[:height]
-      else
-        @width, @height = `identify -format "%wx %h" #{file.path}`.split(/x/).map(&:to_i)
-      end
+    return unless version_name.blank?
+
+    if file.path.nil?
+      img = ::MiniMagick::Image.read(file.file)
+      @width = img[:width]
+      @height = img[:height]
+    else
+      @width, @height = `identify -format "%wx %h" #{file.path}`.split(/x/).map(&:to_i)
     end
   end
 end

data/config/initializers/plurals.rb

@@ -6,7 +6,7 @@
       plural: {
         keys: %i[zero one few many],
         rule: lambda do |n|
-          if n == 0
+          if n.zero?
             :zero
           elsif n % 10 == 1 && n % 100 != 11
             # 1, 21, 31, 41, 51, 61...
@@ -14,7 +14,7 @@
           elsif [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100)
             # 2-4, 22-24, 32-34...
             :few
-          elsif n % 10 == 0 || ![5, 6, 7, 8, 9].include?(n % 10) || ![11, 12, 13, 14].include?(n % 100)
+          elsif n % 10.zero? || ![5, 6, 7, 8, 9].include?(n % 10) || ![11, 12, 13, 14].include?(n % 100)
             # 0, 5-20, 25-30, 35-40...
             :many
           end

data/lib/tramway/collection.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-module Tramway
-  class Collection
-    class << self
-      def list
-        raise 'Please add collection to list method'
-      end
+class Tramway::Collection
+  class << self
+    def list
+      raise 'Please add collection to list method'
     end
   end
 end

data/lib/tramway/collections.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Tramway::Collections
+end

data/lib/tramway/collections/helper.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
 
-module Tramway
-  module Collections
-    module Helper
-      def collection_list_by(name:)
-        begin
-          require name # needed to load class name with collection
-        rescue LoadError
-          raise "No such file #{name}. You should create file in the `lib/#{name}.rb` or elsewhere you want"
-        end
-        unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)
-          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`. You should reload your server after creating this collection."
-        end
+require 'tramway/collections'
 
-        name.camelize.constantize.list
-      end
+module Tramway::Collections::Helper
+  def collection_list_by(name:)
+    begin
+      require name # needed to load class name with collection
+    rescue LoadError
+      raise "No such file #{name}. You should create file in the `lib/#{name}.rb` or elsewhere you want"
     end
+    unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)
+      ::Tramway::Error.raise_error(
+        :tramway, :collections, :helper, :collection_list_by, :there_no_such_collection,
+        name_camelize: name.camelize
+      )
+    end
+
+    name.camelize.constantize.list
   end
 end

data/lib/tramway/core.rb

@@ -9,37 +9,33 @@ require 'reform'
 require 'pg_search'
 require 'validators/presence_validator'
 
-module Tramway
-  module Core
-    class << self
-      def initialize_application(**options)
-        @application ||= Tramway::Core::Application.new
-        options.each do |attr, value|
-          @application.send "#{attr}=", value
-        end
+module Tramway::Core
+  class << self
+    def initialize_application(**options)
+      @application ||= Tramway::Core::Application.new
+      options.each do |attr, value|
+        @application.send "#{attr}=", value
       end
+    end
 
-      def application_object
-        if @application&.model_class.present?
-          begin
-            @application.model_class.first
-          rescue StandardError
-            nil
-          end
-        else
-          @application
+    def application_object
+      if @application&.model_class.present?
+        begin
+          @application.model_class.first
+        rescue StandardError
+          nil
         end
+      else
+        @application
       end
-
-      attr_reader :application
     end
+
+    attr_reader :application
   end
 end
 
 # HACK: FIXME
 
-module ActiveModel
-  class Errors
-    def merge!(*args); end
-  end
+class ActiveModel::Errors
+  def merge!(*args); end
 end

data/lib/tramway/core/engine.rb

@@ -5,14 +5,10 @@ require 'tramway/core/application'
 require 'simple_form'
 require 'enumerize'
 
-module Tramway
-  module Core
-    class Engine < ::Rails::Engine
-      isolate_namespace Tramway::Core
+class Tramway::Core::Engine < ::Rails::Engine
+  isolate_namespace Tramway::Core
 
-      config.before_initialize do
-        config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
-      end
-    end
+  config.before_initialize do
+    config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
   end
 end

data/lib/tramway/core/generators.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Tramway::Core::Generators
+end

data/lib/tramway/core/generators/install_generator.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
+require 'tramway/core/generators'
 
-module Tramway
-  module Core
-    module Generators
-      class InstallGenerator < ::Rails::Generators::Base
-        source_root File.expand_path('templates', __dir__)
+class Tramway::Core::Generators::InstallGenerator < ::Rails::Generators::Base
+  source_root File.expand_path('templates', __dir__)
 
-        def run_other_generators
-          generate 'audited:install'
-        end
+  def run_other_generators
+    generate 'audited:install'
+  end
 
-        def self.next_migration_number(path)
-          next_migration_number = current_migration_number(path) + 1
-          ActiveRecord::Migration.next_migration_number next_migration_number
-        end
+  def self.next_migration_number(path)
+    next_migration_number = current_migration_number(path) + 1
+    ActiveRecord::Migration.next_migration_number next_migration_number
+  end
 
-        def copy_initializer
-          copy_file "/#{File.dirname __dir__}/generators/templates/initializers/simple_form.rb", 'config/initializers/simple_form.rb'
-          copy_file "/#{File.dirname __dir__}/generators/templates/initializers/simple_form_bootstrap.rb", 'config/initializers/simple_form_bootstrap.rb'
-        end
-      end
+  def copy_initializer
+    simple_form_files = %w[simple_form simple_form_bootstrap]
+    simple_form_files.each do |file|
+      copy_file(
+        "/#{File.dirname __dir__}/generators/templates/initializers/#{file}.rb",
+        "config/initializers/#{file}.rb"
+      )
     end
   end
 end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.2.1'
+    VERSION = '1.17.2.2'
   end
 end

data/lib/tramway/error.rb

@@ -2,7 +2,7 @@
 
 class Tramway::Error < RuntimeError
   def initialize(*args, plugin: nil, method: nil, message: nil)
-    @properties ||= {}
+    @properties = {}
     @properties[:plugin] = plugin
     @properties[:method] = method
     @properties[:message] = message
@@ -16,4 +16,15 @@ class Tramway::Error < RuntimeError
   def properties
     @properties ||= {}
   end
+
+  class << self
+    def raise_error(*coordinates, **options)
+      @errors ||= YAML.load_file('..', '..', 'yaml', 'errors.yml').with_indifferent_access
+      error = @errors.dig(*coordinates)
+      options.each do |pair|
+        error.gsub!("%{#{pair[0]}}", pair[1])
+      end
+      raise error
+    end
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.2.1
+  version: 1.17.2.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
+- moshiaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -360,7 +361,18 @@ files:
 - app/decorators/tramway/core/concerns/attributes_decorator_helper.rb
 - app/decorators/tramway/core/delegating/class_helper.rb
 - app/forms/tramway/core/application_form.rb
+- app/forms/tramway/core/application_forms/association_object_helpers.rb
+- app/forms/tramway/core/application_forms/constant_class_actions.rb
+- app/forms/tramway/core/application_forms/constant_object_actions.rb
+- app/forms/tramway/core/application_forms/properties_object_helper.rb
 - app/forms/tramway/core/extendable_form.rb
+- app/forms/tramway/core/extendable_forms_helpers/class_builder.rb
+- app/forms/tramway/core/extendable_forms_helpers/ignored_properties_helper.rb
+- app/forms/tramway/core/extendable_forms_helpers/more_properties_helper.rb
+- app/forms/tramway/core/extendable_forms_helpers/properties_helper.rb
+- app/forms/tramway/core/extendable_forms_helpers/submit/class_helpers.rb
+- app/forms/tramway/core/extendable_forms_helpers/submit/object_helpers.rb
+- app/forms/tramway/core/extendable_forms_helpers/validators.rb
 - app/forms/tramway/core/extended_application_form.rb
 - app/forms/tramway/core/form_creator.rb
 - app/helpers/tramway/core/copy_to_clipboard_helper.rb
@@ -397,10 +409,12 @@ files:
 - lib/string.rb
 - lib/tasks/tramway/core_tasks.rake
 - lib/tramway/collection.rb
+- lib/tramway/collections.rb
 - lib/tramway/collections/helper.rb
 - lib/tramway/core.rb
 - lib/tramway/core/application.rb
 - lib/tramway/core/engine.rb
+- lib/tramway/core/generators.rb
 - lib/tramway/core/generators/install_generator.rb
 - lib/tramway/core/generators/templates/initializers/simple_form.rb
 - lib/tramway/core/generators/templates/initializers/simple_form_bootstrap.rb
@@ -408,7 +422,7 @@ files:
 - lib/tramway/error.rb
 - lib/tramway/helpers/class_name_helpers.rb
 - lib/validators/presence_validator.rb
-homepage: https://github.com/kalashnikovisme/tramway-core
+homepage: https://github.com/purple-magic/tramway-core
 licenses:
 - MIT
 metadata: {}