tramway-core 1.17.4.2 → 1.17.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de93e7e3470ae4475e2562917ada23727724ed9f5d3a9e8629bb79abdc9abba3
-  data.tar.gz: 6eb2a75350e87dfcc01c80da40090ac4c14a7ef4d6d713a1e1ec6ad6fba36e8f
+  metadata.gz: ace598a77cdbc2c4227978563ee8e51f86751e38114e19322e1a4dae06185d41
+  data.tar.gz: a5f1e7e9a031f55a34427ac989dd81d504c71c7835c6c729c3871e5b6d49e829
 SHA512:
-  metadata.gz: 70846eaa98acc8df08009b4c5b0ee6e954c885e87342eaa17f0cbce2cb4fa25f78a51604b234170ee0502c33195e74095a5a27b14565cf04ae6612630896092a
-  data.tar.gz: 020e281d3e91424d0af2ccf2e4f8554b2f1295b399433f7ce5238fe181d1d1fb4ec999773bd408a57af12e7386d5bd39211bc15d32e1562b3dc1d0de61e124cd
+  metadata.gz: 7bd0649874a75ba26c56c6babf43ac53599feeee708f07b16259cdfe4b69f51a2537669ec01749457d9df8ab77646c57c0da6902197bcc01899efead8cf89ca5
+  data.tar.gz: bd713b69cabb604ad37404bb73daf1f046cf13833ff4e2442fc0ba34c570695fc169da7074380bb972cc5026e52d7f21d7a0289b2df5bf1bfe4be6116807209e

data/README.md

@@ -203,10 +203,36 @@ Tramway::Admin.set_singleton_models Organization, project: :organization # now y
 * models - часто используемые в моделях слова
 * state_machines - локализация состояний
 
-## Contributors
+## Contribution
+
+### Contributors
 
 * [Pavel Kalashnikov](https://github.com/kalashnikovisme)
 * [moshinaan](https://github.com/moshinaan)
 
+### Workflow
+
+#### If you don't have access to push gem to rubygems then
+
+Just create PR to develop branch
+
+#### If you have access to push gem to rubygems then
+
+* Create PR to develop branch
+* After merging PR you should create new release via git-flow this way
+
+```shell
+git release start (version which you upgraded in lib/tramway-core/version.rb file)
+git release finish (version which you upgraded in lib/tramway-core/version.rb file)
+git push origin develop
+git push origin master
+```
+
+* Then push new version of the gem
+
+```shell
+rm -rf *.gem && gem build $(basename "$PWD").gemspec && gem push *.gem
+```
+
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

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

@@ -4,6 +4,7 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
   include Tramway::Core::ApplicationForms::AssociationObjectHelpers
   include Tramway::Core::ApplicationForms::ConstantObjectActions
   include Tramway::Core::ApplicationForms::PropertiesObjectHelper
+  include Tramway::Core::ApplicationForms::ObjectHelpers
 
   attr_accessor :submit_message
 
@@ -38,14 +39,6 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
     @@associations
   end
 
-  def to_model
-    self
-  end
-
-  def persisted?
-    model.id.nil?
-  end
-
   class << self
     include Tramway::Core::ApplicationForms::ConstantClassActions
 
@@ -96,7 +89,7 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
           @@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
+            name: name, model_class_name: model_class_name
         end
       end
     end
@@ -127,6 +120,6 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
     Tramway::Error.raise_error :tramway, :core, :application_form, :save, :argument_error, message: e.message
   rescue StandardError => e
     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
+      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

@@ -6,6 +6,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
       define_polymorphic_association association, class_name
     else
       self.class.send(:define_method, "#{association}=") do |value|
+        model.send "#{association}_id=", value
         super class_name.find value
       end
     end
@@ -17,7 +18,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
       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
+          association_name: association
       else
         super association_class.find value.split('_')[-1]
         send "#{association}_type=", association_class.to_s

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Tramway::Core::ApplicationForms::ObjectHelpers
+  def to_model
+    self
+  end
+
+  def persisted?
+    model.id.nil?
+  end
+end

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

@@ -22,7 +22,7 @@ module Tramway::Core::ExtendableFormsHelpers::ClassBuilder
         case property[1][:object].field_type
         when 'file'
           field = property[1][:object]
-          define_file_property_assignment_method property field
+          define_file_property_assignment_method property, field
         else
           next unless property[1][:validates].present?
 

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Tramway::Core::Inputs::AssociationsHelper
+  def build_collection_for_association(form_object, property)
+    full_class_name_association = form_object.class.full_class_name_association(property)
+    check_valid_association full_class_name_association
+    full_class_name_association.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
+      decorator_class(full_class_name_association).decorate obj
+    end.sort_by(&:name)
+  end
+
+  def build_value_for_association(form_object, property, value)
+    form_object.send(property) || form_object.model.send("#{property}_id") || value
+  end
+
+  def check_valid_association(full_class_name_association)
+    unless full_class_name_association
+      Tramway::Error.raise_error(
+        :tramway, :core, :inputs_helpers, :association_params, :defined_with_property_method, property: property
+      )
+    end
+    return unless full_class_name_association.is_a? Array
+
+    Tramway::Error.raise_error(
+      :tramway, :core, :inputs_helpers, :association_params, :used_polymorphic_association, property: property
+    )
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Tramway::Core::Inputs::PolymorphicAssociationsHelper
+  def build_collection_for_polymorphic_association(form_object, property)
+    object_names = full_class_names(form_object, property).map do |class_name|
+      class_name.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
+        decorator_class(class_name).decorate obj
+      end
+    end.flatten
+    object_names.sort_by { |obj| obj.name.to_s }
+  end
+
+  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
+      "#{value[:type]&.underscore}_#{value[:id]}"
+    end
+  end
+
+  def full_class_names(form_object, property)
+    form_object.model.class.send("#{property}_type").values.map(&:constantize)
+  end
+end

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

@@ -1,58 +1,41 @@
 # frozen_string_literal: true
 
 module Tramway::Core::InputsHelper
-  def association_params(form_object:, property:, value:, object:, options: {})
-    full_class_name_association = form_object.class.full_class_name_association(property)
-    unless full_class_name_association
-      raise "It seems you've defined association attributes with `property` method. Please, use `association` method. `association :#{property}`"
-    end
-    if full_class_name_association.is_a? Array
-      raise "It seems you've used `association` input type in the Form. Please, use `polymorphic_association` type. `#{property}: :polymorphic_association`"
-    end
+  include Tramway::Core::Inputs::AssociationsHelper
+  include Tramway::Core::Inputs::PolymorphicAssociationsHelper
 
-    {
-      label: false,
-      input_html: {
-        name: "#{object}[#{property}]",
-        id: "#{object}_#{property}",
-        value: (form_object.send(property) || form_object.model.send("#{property}_id") || value)
-      },
-      selected: (form_object.model.send("#{property}_id") || value),
-      collection: full_class_name_association.active.map do |obj|
-        decorator_class(full_class_name_association).decorate obj
-      end.sort_by(&:name)
-    }.merge options
+  def association_params(form_object:, property:, value:, object:, options: {})
+    build_input_attributes(object: object, property: property, options: options,
+                           value: build_value_for_association(form_object, property, value),
+                           collection: build_collection_for_association(form_object, property),
+                           selected: form_object.model.send("#{property}_id") || value)
   end
 
   def polymorphic_association_params(object:, form_object:, property:, value:, options: {})
-    full_class_names = form_object.model.class.send("#{property}_type").values.map &:constantize
-    collection = full_class_names.map do |class_name|
-      class_name.active.map do |obj|
-        decorator_class(class_name).decorate obj
-      end
-    end.flatten.sort_by { |obj| obj.name.to_s }
-    builded_value = if form_object.send(property).present?
-                      "#{form_object.send(property).class.to_s.underscore}_#{form_object.send(property).id}"
-                    else
-                      "#{value[:type]&.underscore}_#{value[:id]}"
-                    end
+    build_input_attributes object: object, property: property,
+                           selected: build_value_for_polymorphic_association(form_object, property, value),
+                           value: build_value_for_polymorphic_association(form_object, property, value),
+                           collection: build_collection_for_polymorphic_association(form_object, property),
+                           options: options.merge(
+                             as: :select,
+                             label_method: ->(obj) { "#{obj.class.model_name.human} | #{obj.name}" },
+                             value_method: lambda { |obj|
+                               "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"
+                             }
+                           )
+  end
+
+  def build_input_attributes(**options)
     {
-      as: :select,
       label: false,
       input_html: {
-        name: "#{object}[#{property}]",
-        id: "#{object}_#{property}",
-        value: builded_value
+        name: "#{options[:object]}[#{options[:property]}]",
+        id: "#{options[:object]}_#{options[:property]}",
+        value: options[:value]
       },
-      selected: builded_value,
-      collection: collection,
-      label_method: lambda do |obj|
-        "#{obj.class.model_name.human} | #{obj.name}"
-      end,
-      value_method: lambda do |obj|
-        "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"
-      end
-    }.merge options
+      selected: options[:selected],
+      collection: options[:collection]
+    }.merge options[:options]
   end
 
   def value_from_params(model_class:, property:, type:)
@@ -79,15 +62,29 @@ module Tramway::Core::InputsHelper
     }.merge options
   end
 
-  def else_params(property:, object:, type:, form_object:, value:, options: {})
-    {
-      as: type,
-      label: false,
-      input_html: {
-        name: "#{object}[#{property}]",
-        id: "#{object}_#{property}",
-        value: (form_object.send(property) || form_object.model.send(property) || value)
-      }
-    }.merge options
+  def simple_params(**options)
+    builded_options = { as: options[:type], label: false,
+                        input_html: {
+                          name: "#{options[:object]}[#{options[:property]}]",
+                          id: "#{options[:object]}_#{options[:property]}",
+                          value: build_simple_value(
+                            *options.values_at(:form_object, :property, :value),
+                            options.dig(:options, :input_html, :value)
+                          )
+                        } }
+    merge_with_user_options builded_options, options
+  end
+
+  def build_simple_value(form_object, property, value, input_html_value)
+    value_to_add = input_html_value || value
+    value_to_add || form_object.send(property)
+  end
+
+  def merge_with_user_options(builded_options, options)
+    if options[:options].present?
+      options[:options].dig(:input_html)&.delete(:value)
+      builded_options.merge!(options) || {}
+    end
+    builded_options
   end
 end

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

@@ -6,7 +6,8 @@
   - type = type[:type]
 - if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
   - type = type.to_sym
-  = form.label form_object.model.class.human_attribute_name property
+  - unless type == :hidden
+    = form.label form_object.model.class.human_attribute_name property
   - case type
   - when :default
     = form.input property, **default_params(**input_params)
@@ -15,7 +16,7 @@
   - when :polymorphic_association
     = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
   - else
-    = form.input property, **else_params(**input_params.merge(type: type))
+    = form.input property, **simple_params(**input_params.merge(type: type))
 - else
   - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
   = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form

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

@@ -1,4 +1,4 @@
-- parsed_json = field.options.is_a?(Hash) ? field.options : (JSON.parse(field.options) unless field.options == '')
+- parsed_json = field.options&.is_a?(Hash) ? field.options : (JSON.parse(field.options) if field.options.present?)
 - 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, required: field.required

data/lib/tramway/core/application.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Tramway::Core::Application
-  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email, :main_image
+  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email, :main_image, :favicon
 
   def public_name
     name.to_s.gsub('_', ' ').camelize

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.4.2'
+    VERSION = '1.17.7.1'
   end
 end

data/lib/yaml/errors.yml

@@ -4,6 +4,10 @@ tramway:
       collection_list_by:
         there_no_such_collection: "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."
   core:
+    input_helper:
+      association_params:
+        defined_with_property_method: "It seems you've defined association attributes with `property` method. Please, use `association` method. `association :%{property}`"
+        use_polymorphic_association: "It seems you've used `association` input type in the Form. Please, use `polymorphic_association` type. `%{property}: :polymorphic_association`"
     title_helper:
       title:
         you_should_set_tramway_core_application: "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"
@@ -34,4 +38,3 @@ tramway:
         please_implement_title: "Please, implement `title` method in a %{class_name} or %{object_class}"
       link:
         method_link_uses_file_attribute: "Method `link` uses `file` attribute of the decorated object. If decorated object doesn't contain `file`, you shouldn't use `link` method."
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.4.2
+  version: 1.17.7.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -365,6 +365,7 @@ files:
 - 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/object_helpers.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
@@ -378,6 +379,8 @@ files:
 - app/forms/tramway/core/form_creator.rb
 - app/helpers/tramway/core/application_helper.rb
 - app/helpers/tramway/core/copy_to_clipboard_helper.rb
+- app/helpers/tramway/core/inputs/associations_helper.rb
+- app/helpers/tramway/core/inputs/polymorphic_associations_helper.rb
 - app/helpers/tramway/core/inputs_helper.rb
 - app/helpers/tramway/core/title_helper.rb
 - app/inputs/date_picker_input.rb