tramway-core 1.17.2.3 → 1.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e25693262017e7eb7b500db8ed733e26ed5c841f4e5eca94b036f422114c8f8e
-  data.tar.gz: 9cc1274352800f545610e01d2c02485c3ef2837bd2d413041818462682496e04
+  metadata.gz: b6297a0252cf6856f995abf0de3e37b9376453d5df79a40e8ccb0dae8f75e06a
+  data.tar.gz: 7e9ec3266141fa021103ee9f4263c49aeedfad149c8188b635f97653aee258eb
 SHA512:
-  metadata.gz: 796e723d4c64a741d72b2d25a769e1344d895805dda3ba55da9c6f4161252a416ade82f2439217599a60605c6d29e6292be4b165a56f0c26343eeeba6ca9ce85
-  data.tar.gz: 9991a6ecf790a5ce4ed3b0064d3cc2392336359bcf095416b91a9ee6d152e19d1487826ab9a85d7c1df4913a426375128955c602b1501ff5b273319ca49db211
+  metadata.gz: 9cbf09a9abc0f90d6cbd59751960cbb40820309857035a5b5ec6412ff02bbfa4d91c15ac625a2bae005de13d8b043f48b10e2e7f48c6bf31bbdf5448b3412cae
+  data.tar.gz: fb4ac5cba33590b6bee01a9e16bc96af19c12157ba103510f3d6761ba1777baf911af1b061ed29614fc97de013345a10d8f78611923fa0fa32b3982d48e8ba36

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

@@ -11,4 +11,8 @@ class Tramway::Core::ApplicationController < ActionController::Base
   def load_extensions
     ::Tramway::Extensions.load if defined? ::Tramway::Extensions
   end
+
+  def model_class
+    params[:model].constantize
+  end
 end

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

@@ -5,6 +5,8 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
   include Tramway::Core::ApplicationForms::ConstantObjectActions
   include Tramway::Core::ApplicationForms::PropertiesObjectHelper
 
+  attr_accessor :submit_message
+
   def initialize(object = nil)
     object ||= self.class.model_class.new
     super(object).tap do
@@ -32,6 +34,18 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
     @@model_class.model_name
   end
 
+  def associations
+    @@associations
+  end
+
+  def to_model
+    self
+  end
+
+  def persisted?
+    model.id.nil?
+  end
+
   class << self
     include Tramway::Core::ApplicationForms::ConstantClassActions
 

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

@@ -1,10 +1,6 @@
 # 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

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

@@ -8,6 +8,13 @@ module Tramway::Core::ApplicationForms::ConstantObjectActions
   def build_errors; end
 
   def attributes
-    properties.reduce({}) { |hash, property| hash.merge! property.first => model.values[property.first.to_s] }
+    properties.reduce({}) do |hash, property|
+      value = if model.respond_to? :values
+                model.values[property.first.to_s]
+              else
+                model.send(property.first.to_s)
+              end
+      hash.merge! property.first => value
+    end
   end
 end

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

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

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

@@ -0,0 +1,93 @@
+# 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
+
+    {
+      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
+  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
+    {
+      as: :select,
+      label: false,
+      input_html: {
+        name: "#{object}[#{property}]",
+        id: "#{object}_#{property}",
+        value: builded_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
+  end
+
+  def value_from_params(model_class:, property:, type:)
+    case type
+    when :polymorphic_association, 'polymorphic_association'
+      {
+        id: params.dig(model_class.to_s.underscore, property.to_s),
+        type: params.dig(model_class.to_s.underscore, "#{property}_type")
+      }
+    else
+      params.dig(model_class.to_s.underscore, property.to_s)
+    end
+  end
+
+  def default_params(property:, object:, form_object:, value:, options: {})
+    {
+      label: false,
+      input_html: {
+        name: "#{object}[#{property}]",
+        id: "#{object}_#{property}",
+        value: (form_object.send(property) || form_object.model.send(property) || value)
+      },
+      selected: (form_object.model.send(property) || value)
+    }.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
+  end
+end

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

@@ -0,0 +1,25 @@
+- model_class = defined?(record) ? record.model : model_class
+- form_object = defined?(record) ? record : instance_variable_get("@#{object}_form")
+- input_params = { property: property, object: object, form_object: form_object, value: value }
+- if !type.class.in?([ Symbol, String ]) && type[:input_options]
+  - input_params.merge!(options: type[:input_options])
+  - 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
+  - case type
+  - when :default
+    = form.input property, **default_params(**input_params)
+  - when :association
+    = form.association property, **association_params(**input_params)
+  - 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))
+- 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
+
+- if params[:errors].present? && params[:errors][property]&.first
+  .alert.alert-danger
+    = params[:errors][property]&.first

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
+  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email, :main_image
 
   def public_name
     name.to_s.gsub('_', ' ').camelize

data/lib/tramway/core/generators.rb

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

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.2.3'
+    VERSION = '1.17.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.2.3
+  version: 1.17.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -376,7 +376,9 @@ files:
 - 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/application_helper.rb
 - app/helpers/tramway/core/copy_to_clipboard_helper.rb
+- app/helpers/tramway/core/inputs_helper.rb
 - app/helpers/tramway/core/title_helper.rb
 - app/inputs/date_picker_input.rb
 - app/models/tramway/core/application_record.rb
@@ -385,6 +387,7 @@ files:
 - app/uploaders/image_defaults.rb
 - app/uploaders/photo_uploader.rb
 - app/views/tramway/core/404.haml
+- app/views/tramway/core/shared/_input.html.haml
 - 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