tramway-core 1.13.1.1 → 1.14.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98fc3b4eb72607b71692a66f9984842cc63cd135f7c498090b5a89ec22d25648
-  data.tar.gz: 955159d6eb34fc36e753a3aba3167846a788a7ce37e9e5d3d657fb542c0d6312
+  metadata.gz: 8e37bc7fd023ce8768a173d48b50575ac71538cb27078c8cabf2d4aaf996c53c
+  data.tar.gz: 253c5c1543f25b34905341bdc11d9a31e84737cf11a2c1e547c5f0c3d9d16cb6
 SHA512:
-  metadata.gz: 8901bf8f3c13d43b4bc750dfef901e079bc351eae922674883066ffffaca448c7ba5c3913ef96bf7caed2f52d1872358780295d3dd46c07178f758b6e5ab35b5
-  data.tar.gz: ceb839ae0aa3d97d75a0e7c98c212bd8502ad21f8f411d20871bce24f608fd7818d67284ed271a0ffa22515d8c47b0403422f9aa0aa559b0b66f9e174c0cf2c5
+  metadata.gz: 2bb111d0932442985c8a93edd2e3c0acfdeef417565d032560f895584e8efb783c9f3a1323688f8680a29a0cf95485c658e2029b4b0e78f10c7f536374484f20
+  data.tar.gz: fd7a7cdcc2b47374e1c1405b1278219ba4e7e17fc0209bf22895339d24c619d2156a5af641c16b5423ad0ed0ae1ea95f738d1c669938e1015d251d5205aaca27

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rspec/core/rake_task'
- 
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = Dir.glob('spec/**/*_spec.rb')
   t.rspec_opts = '--format documentation'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Core
     class ApplicationController < ActionController::Base

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

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 class Tramway::Core::ApplicationDecoratedCollection < Array
   def initialize(array, original_array)
     @original_array = original_array
     super(array)
   end
 
-  def original_array
-    @original_array
-  end
+  attr_reader :original_array
 
   delegate :total_pages, to: :original_array
   delegate :total_count, to: :original_array

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/error'
 
 class Tramway::Core::ApplicationDecorator
@@ -14,7 +16,7 @@ class Tramway::Core::ApplicationDecorator
   end
 
   def title
-    error = Tramway::Error.new(plugin: :core, method: :title, message: ("Please, implement `title` method in a #{self.class} or #{object.class}"))
+    error = Tramway::Error.new(plugin: :core, method: :title, message: "Please, implement `title` method in a #{self.class} or #{object.class}")
     raise error.message
   end
 
@@ -56,7 +58,7 @@ class Tramway::Core::ApplicationDecorator
                        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]
@@ -74,7 +76,7 @@ class Tramway::Core::ApplicationDecorator
     end
 
     def model_class
-      self.to_s.sub(/Decorator$/, '').constantize
+      to_s.sub(/Decorator$/, '').constantize
     end
 
     def model_name
@@ -92,7 +94,8 @@ class Tramway::Core::ApplicationDecorator
       error = Tramway::Error.new(
         plugin: :core,
         method: :link,
-        message: ("Method `link` uses `file` attribute of the decorated object. If decorated object doesn't contain `file`, you shouldn't use `link` method."))
+        message: "Method `link` uses `file` attribute of the decorated object. If decorated object doesn't contain `file`, you shouldn't use `link` method."
+      )
       raise error.message
     end
   end
@@ -111,7 +114,7 @@ class Tramway::Core::ApplicationDecorator
 
   include Tramway::Core::Concerns::AttributesDecoratorHelper
 
-  RESERVED_WORDS = [ 'fields' ]
+  RESERVED_WORDS = ['fields'].freeze
 
   def attributes
     object.attributes.reduce({}) do |hash, attribute|
@@ -119,13 +122,14 @@ class Tramway::Core::ApplicationDecorator
         error = Tramway::Error.new(
           plugin: :core,
           method: :attributes,
-          message: ("Method `#{attribute[0]}` is reserved word. Please, create or delegate method in #{self.class.name} with another name."))
+          message: "Method `#{attribute[0]}` is reserved word. Please, create or delegate method in #{self.class.name} with another name."
+        )
         raise error.message
       end
       value = try(attribute[0]) ? send(attribute[0]) : object.send(attribute[0])
       if attribute[0].to_s.in? object.class.state_machines.keys.map(&:to_s)
         hash.merge! attribute[0] => state_machine_view(object, attribute[0])
-      elsif value.class.in? [ ActiveSupport::TimeWithZone, DateTime, Time ]
+      elsif value.class.in? [ActiveSupport::TimeWithZone, DateTime, Time]
         hash.merge! attribute[0] => datetime_view(attribute[1])
       elsif value.class.superclass == ApplicationUploader
         hash.merge! attribute[0] => image_view(object.send(attribute[0]))
@@ -142,11 +146,8 @@ class Tramway::Core::ApplicationDecorator
   end
 
   protected
-  
-  def object
-    @object
-  end
 
-  def association_class_name
-  end
-end 
+  attr_reader :object
+
+  def association_class_name; end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Core::Concerns::AttributesDecoratorHelper
   def date_view(value)
     I18n.l value.to_date if value

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Tramway::Core
   class ApplicationForm < ::Reform::Form
     def initialize(object = nil)
-      object = self.class.model_class.new unless object
+      object ||= self.class.model_class.new
       super(object).tap do
         @@model_class = object.class
         @@enumerized_attributes = object.class.try :enumerized_attributes
@@ -27,12 +29,23 @@ module Tramway::Core
         delegating object
       end
     end
-    
+
     def submit(params)
       if params
-        save if validate params
+        if validate params
+          save 
+        else
+          association_error = false
+          @@associations.each do |association|
+            if errors.details[association] == [{ error: :blank }]
+              model.send("#{association}=", send(association))
+              association_error = true
+            end
+          end
+          association_error && save
+        end
       else
-        error = Tramway::Error.new(plugin: :core, method: :submit, message: ('ApplicationForm::Params should not be nil'))
+        error = Tramway::Error.new(plugin: :core, method: :submit, message: 'ApplicationForm::Params should not be nil')
         raise error.message
       end
     end
@@ -46,13 +59,19 @@ module Tramway::Core
     end
 
     def properties
-      @form_properties || []
+      return @form_properties if @form_properties
+      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
+      else
+        []
+      end
     end
 
     def build_errors; end
 
     def delegating(object)
-      methods = [:to_key, :errors]
+      methods = %i[to_key errors]
       methods.each do |method|
         self.class.send(:define_method, method) do
           object.send method
@@ -96,7 +115,7 @@ module Tramway::Core
       def full_class_name_association(association_name)
         full_class_name_associations[association_name]
       end
-      
+
       def enumerized_attributes
         @@enumerized_attributes
       end
@@ -109,11 +128,11 @@ module Tramway::Core
         if defined?(@@model_class) && @@model_class
           @@model_class
         else
-          model_class_name ||= self.name.to_s.sub(/Form$/, '')
+          model_class_name ||= name.to_s.sub(/Form$/, '')
           begin
             @@model_class = model_class_name.constantize
-          rescue
-            error = Tramway::Error.new(plugin: :core, method: :model_class, message: ("There is not model class name for #{self.name}. Should be #{model_class_name} or you can use another class to initialize form object or just initialize form with object."))
+          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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Core::ExtendableForm
   class << self
     def new(name, simple_properties: {}, **more_properties)
@@ -9,12 +11,10 @@ class Tramway::Core::ExtendableForm
 
           define_method 'submit' do |params|
             model.values ||= {}
-            extended_params = params.except(*simple_properties.keys)
+            extended_params = params.except(*simple_properties.keys).except(*jsonb_ignored_properties(more_properties))
             params.each do |key, value|
               method_name = "#{key}="
-              if respond_to?(method_name)
-                send method_name, value
-              end
+              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]
@@ -23,11 +23,8 @@ class Tramway::Core::ExtendableForm
           end
 
           define_method 'properties' do
-            hash = simple_properties.reduce({}) do |h, property|
-              unless model.class.state_machines.keys.include?(property[0])
-                h.merge! property[0] => property[1]
-              end
-              h
+            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] => {
@@ -37,22 +34,40 @@ class Tramway::Core::ExtendableForm
           end
 
           more_properties.each do |property|
-            define_method property[0] do 
+            define_method property[0] do
               model.values[property[0]] if model.values
             end
 
-            if property[1][:validates].present?
+            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|
-                  validator_object = "#{pair[0].camelize}Validator".constantize.new({ attributes: :not_blank })
+                  validator_object = "#{pair[0].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.#{property[0]}.#{pair[0]}", { value: value })
+                      I18n.t("activerecord.errors.models.#{model.class.name.underscore}.attributes.#{property[0]}.#{pair[0]}", value: value)
                   end
                 end
               end
             end
           end
+
+          define_method :jsonb_ignored_properties do |properties|
+            properties.map do |property|
+              if property[1][:object].field_type == 'file'
+                property[0].to_s
+              end
+            end.compact
+          end
         end)
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Core::ExtendedApplicationForm < Tramway::Core::ApplicationForm
   class << self
     def properties(*args)
@@ -9,11 +11,11 @@ class Tramway::Core::ExtendedApplicationForm < Tramway::Core::ApplicationForm
 
   def initialize(model)
     @@extendable_properties.each do |prop|
-      unless model.respond_to? prop
-        model.class.define_method prop do
-        end
-        model.class.define_method "#{prop}=" do |value|
-        end
+      next if model.respond_to? prop
+
+      model.class.define_method prop do
+      end
+      model.class.define_method "#{prop}=" do |value|
       end
     end
     super

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Core::FormCreator
   def self.create_form_class
     raise 'Please, implement `create_form_class` for your class'

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

@@ -1,12 +1,14 @@
+# 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}" 
+          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 may be you don\'t have any records of application model'))
+          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 may be you don\'t have any records of application model')
           raise error.message
         end
       end

data/app/inputs/date_picker_input.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class DatePickerInput < SimpleForm::Inputs::StringInput
 end

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

@@ -1,6 +1,6 @@
-if defined?(CarrierWave::Mount)
-  require 'carrierwave/orm/activerecord'
-end
+# frozen_string_literal: true
+
+require 'carrierwave/orm/activerecord' if defined?(CarrierWave::Mount)
 
 module Tramway
   module Core
@@ -22,10 +22,10 @@ module Tramway
 
       include ::PgSearch
 
-      # FIXME detect inhertited locales
+      # FIXME: detect inhertited locales
       class << self
-        def human_attribute_name(attribute_name, *args)
-          excepted_attributes = %w( created_at updated_at state )
+        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
@@ -38,7 +38,7 @@ module Tramway
         end
       end
 
-      # FIXME detect inhertited locales
+      # FIXME: detect inhertited locales
       def human_state_name
         I18n.t "activerecord.state_machines.tramway/core/application_record.state.states.#{state}"
       end

data/app/uploaders/application_uploader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'carrierwave'
 
 class ApplicationUploader < CarrierWave::Uploader::Base

data/app/uploaders/file_uploader.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class FileUploader < ApplicationUploader
   def extension_white_list
-    %w(pdf doc docx xls csv xlsx jpg)
+    %w[pdf doc docx xls csv xlsx jpg]
   end
 end

data/app/uploaders/image_defaults.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 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
-    %w(jpg jpeg gif png)
+    %w[jpg jpeg gif png]
   end
 end

data/app/uploaders/photo_uploader.rb

@@ -1,37 +1,39 @@
+# frozen_string_literal: true
+
 class PhotoUploader < ApplicationUploader
   include ImageDefaults
 
   def default_url
-    ActionController::Base.helpers.asset_path("images/default_photo.png")
+    ActionController::Base.helpers.asset_path('images/default_photo.png')
   end
 
   def url
     if file.present? && File.exist?(file.file)
-      file.file.match(/\/system\/uploads\/.*/).to_s
+      file.file.match(%r{/system/uploads/.*}).to_s
     else
-      "/assets/tramway/core/mona_lisa_from_prado_square.jpg"
+      '/assets/tramway/core/mona_lisa_from_prado_square.jpg'
     end
   end
 
   version :medium do
-    process :resize_to_fill => [400, 400]
+    process resize_to_fill: [400, 400]
   end
 
   version :small do
-    process :resize_to_fill => [100, 100]
+    process resize_to_fill: [100, 100]
   end
 
-  # FIXME move to tramway-landing uploader
+  # FIXME: move to tramway-landing uploader
   version :card do
     process resize_to_fill: [400, 400, 'North']
   end
 
-  # FIXME move to tramway-landing uploader
+  # FIXME: move to tramway-landing uploader
   version :horizontal do
     process resize_to_fill: [800, 350, 'North']
   end
 
-  # FIXME move to tramway-landing uploader
+  # FIXME: move to tramway-landing uploader
   version :mini do
     process resize_to_limit: [300, nil]
   end
@@ -43,7 +45,7 @@ class PhotoUploader < ApplicationUploader
   def capture_size(file)
     if version_name.blank?
       if file.path.nil?
-        img = ::MiniMagick::Image::read(file.file)
+        img = ::MiniMagick::Image.read(file.file)
         @width = img[:width]
         @height = img[:height]
       else

data/app/views/tramway/core/shared/_input_extended.html.haml

@@ -1,22 +1,14 @@
 - value = defined?(value).present? ? value : ''
 - case field.field_type
-- when 'text', 'string', 'numeric', 'date_picker'
-  - if value.present?
-    = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]", value: value }
-  - else
-    = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+- when 'text', 'string', 'numeric', 'date_picker', 'file'
+  = render 'tramway/core/shared/input_extended_types/simple', value: value, field: field, class_name: class_name, f: f
 - when 'select'
-  - parsed_json = field.options.is_a?(Hash) ? field.options : (JSON.parse(field.options) unless field.options == '')
-  - if parsed_json&.dig('collection', 'name')
-    - if value.present?
-      = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
-    - else
-      = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
-  - else
-    - if value.present?
-      = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
-    - else
-      = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+  = render 'tramway/core/shared/input_extended_types/select', value: value, field: field, class_name: class_name, f: f
+- when 'yes_no'
+  = render 'tramway/core/shared/input_extended_types/yes_no', value: value, field: field, class_name: class_name, f: f
+- when 'checkbox'
+  = render 'tramway/core/shared/input_extended_types/checkbox', value: value, field: field, class_name: class_name, f: f
+
 - if params[:errors].present? && params[:errors][field.title]&.first
   .alert.alert-danger
     = params[:errors][field.title]&.first

data/app/views/tramway/core/shared/input_extended_types/_checkbox.html.haml

@@ -0,0 +1 @@
+= f.input field.title.to_sym, as: :boolean, input_html: { class: class_name, id: "#{class_name}_#{field.title.to_sym}", name: "#{class_name}[#{field.title}]" }, checked_value: value == field.title.to_sym

data/app/views/tramway/core/shared/input_extended_types/_select.html.haml

@@ -0,0 +1,16 @@
+- parsed_json = field.options.is_a?(Hash) ? field.options : (JSON.parse(field.options) unless field.options == '')
+- if parsed_json&.dig('collection', 'name')
+  - if value.present?
+    = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+  - else
+    = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+- elsif parsed_json&.dig('collection', 'array')
+  - if value.present?
+    = f.input field.title.to_sym, as: :select, collection: parsed_json.dig('collection', 'array'), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+  - else
+    = f.input field.title.to_sym, as: :select, collection: parsed_json.dig('collection', 'array'), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+- else
+  - if value.present?
+    = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+  - else
+    = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }

data/app/views/tramway/core/shared/input_extended_types/_simple.html.haml

@@ -0,0 +1,4 @@
+- if value.present?
+  = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]", value: value }
+- else
+  = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }

data/app/views/tramway/core/shared/input_extended_types/_yes_no.html.haml

@@ -0,0 +1,4 @@
+- if value.present?
+  = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+- else
+  = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }

data/config/initializers/assets.rb

@@ -1 +1,3 @@
-Rails.application.config.assets.precompile += %w( vendor/assets/javascripts/* vendor/assets/stylesheets/* )
+# frozen_string_literal: true
+
+Rails.application.config.assets.precompile += %w[vendor/assets/javascripts/* vendor/assets/stylesheets/*]

data/config/initializers/carrierwave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport.on_load :active_record do
   require 'audited'
 end

data/config/initializers/plurals.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 {
-  ru: { 
+  ru: {
     i18n: {
       plural: {
-        keys: [:zero, :one, :few, :many],
-        rule: lambda do |n| 
+        keys: %i[zero one few many],
+        rule: lambda do |n|
           if n == 0
             :zero
           elsif n % 10 == 1 && n % 100 != 11
@@ -16,8 +18,8 @@
             # 0, 5-20, 25-30, 35-40...
             :many
           end
-        end 
-      } 
-    } 
-  } 
+        end
+      }
+    }
+  }
 }

data/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Tramway::Core::Engine.routes.draw do
 end

data/lib/string.rb

@@ -1,12 +1,14 @@
-require "active_support/inflector/methods"
+# frozen_string_literal: true
+
+require 'active_support/inflector/methods'
 
 class String
   def pluralize(count = nil, locale = :en)
     if locale == :ru
       case count
       when :many
-        I18n.t("cases.#{}")
-      end      
+        I18n.t('cases.')
+      end
     else
       locale = count if count.is_a? Symbol
       count == 1 ? dup : ActiveSupport::Inflector.pluralize(self, locale)

data/lib/tasks/tramway/core_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :tramway_core do
 #   # Task goes here

data/lib/tramway/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   class Collection
     class << self

data/lib/tramway/collections/helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Tramway
   module Collections
     module Helper
       def collection_list_by(name:)
         require name # needed to load class name with collection
         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`" 
+          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`"
         end
 
         name.camelize.constantize.list

data/lib/tramway/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/core/engine'
 require 'tramway/collection'
 require 'tramway/collections/helper'
@@ -17,18 +19,15 @@ module Tramway
         end
       end
 
-      def application
-        @application
-      end
+      attr_reader :application
     end
   end
 end
 
-# HACK FIXME
+# HACK: FIXME
 
 module ActiveModel
   class Errors
-    def merge!(*args)
-    end
+    def merge!(*args); end
   end
 end

data/lib/tramway/core/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Core::Application
   attr_accessor :name, :url, :model_class, :title, :tagline, :found_date
 

data/lib/tramway/core/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/core/generators/install_generator'
 require 'tramway/core/application'
 require 'simple_form'

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Tramway
   module Core
     module Generators
       class InstallGenerator < ::Rails::Generators::Base
-        source_root File.expand_path('../templates', __FILE__)
+        source_root File.expand_path('templates', __dir__)
 
         def run_other_generators
           generate 'audited:install'

data/lib/tramway/core/generators/templates/initializers/simple_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 SimpleForm.setup do |config|
   config.wrappers :default, class: :input,
                             hint_class: :field_with_hint, error_class: :field_with_errors do |b|

data/lib/tramway/core/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway
   module Core
-    VERSION = '1.13.1.1'
+    VERSION = '1.14.1.2'
   end
 end

data/lib/tramway/error.rb

@@ -1,4 +1,6 @@
-class Tramway::Error < Exception
+# frozen_string_literal: true
+
+class Tramway::Error < RuntimeError
   def initialize(*args, plugin: nil, method: nil, message: nil)
     @properties ||= {}
     @properties[:plugin] = plugin

data/lib/tramway/helpers/class_name_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::ClassNameHelpers
   def model_class_name(class_name)
     class_name.constantize

data/lib/validators/presence_validator.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 class PresenceValidator
-  def initialize(attributes)
-  end
+  def initialize(attributes); end
 
   def valid?(value)
     value.present?

metadata

@@ -1,157 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.13.1.1
+  version: 1.14.1.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: reform-rails
+  name: audited
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
-  name: enumerize
+  name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: enumerize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.7
-- !ruby/object:Gem::Dependency
-  name: bootstrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: audited
+  name: font_awesome5_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -173,27 +141,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: font_awesome5_rails
+  name: pg_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +175,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,49 +189,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: reform-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+- !ruby/object:Gem::Dependency
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
 - !ruby/object:Gem::Dependency
-  name: reform
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.7
 - !ruby/object:Gem::Dependency
-  name: pg_search
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +271,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +285,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,7 +299,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -353,6 +347,10 @@ files:
 - app/uploaders/photo_uploader.rb
 - app/views/tramway/core/shared/_input_extended.html.haml
 - app/views/tramway/core/shared/_messages.html.haml
+- app/views/tramway/core/shared/input_extended_types/_checkbox.html.haml
+- app/views/tramway/core/shared/input_extended_types/_select.html.haml
+- app/views/tramway/core/shared/input_extended_types/_simple.html.haml
+- app/views/tramway/core/shared/input_extended_types/_yes_no.html.haml
 - config/initializers/assets.rb
 - config/initializers/carrierwave.rb
 - config/initializers/plurals.rb