tramway-core 1.17.2.5 → 1.17.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1fd2dbf4e83157c214af26cda3f420c2262424d412e0be024370276a376c9f1
-  data.tar.gz: 0d7183e4be0137e326e4c65e01af71c3d9d43a8085245dceb67d5903332a616e
+  metadata.gz: de93e7e3470ae4475e2562917ada23727724ed9f5d3a9e8629bb79abdc9abba3
+  data.tar.gz: 6eb2a75350e87dfcc01c80da40090ac4c14a7ef4d6d713a1e1ec6ad6fba36e8f
 SHA512:
-  metadata.gz: a757831c656315d7fe43f5b76a0fff363170d55b2042a1f520bda007c57605f93f36a808e6f82d82b0f7aa94f523c12b552efae501fc076165f2bc88bf4ea94f
-  data.tar.gz: ca9475b9bfaa9bd0c80fdfd14d502dbec4e30712d6c2260e9ac6b8607d16851d4eac117e795301d102c3a73d07fa802a3ff57e9c8f78e125e52dce13493a8269
+  metadata.gz: 70846eaa98acc8df08009b4c5b0ee6e954c885e87342eaa17f0cbce2cb4fa25f78a51604b234170ee0502c33195e74095a5a27b14565cf04ae6612630896092a
+  data.tar.gz: 020e281d3e91424d0af2ccf2e4f8554b2f1295b399433f7ce5238fe181d1d1fb4ec999773bd408a57af12e7386d5bd39211bc15d32e1562b3dc1d0de61e124cd

data/README.md

@@ -132,7 +132,7 @@ end
 
 ### CopyToClipboardHelper
 
-[app/helpers/tramway/core/copy_to_clipboard_helper.rb](https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/app/helpers/tramway/core/copy_to_clipboard_helper.rb)
+[app/helpers/tramway/core/copy_to_clipboard_helper.rb] (https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/app/helpers/tramway/core/copy_to_clipboard_helper.rb)
 
 #### Install
 

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
@@ -36,6 +38,14 @@ 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
 
@@ -86,7 +96,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
@@ -113,8 +123,10 @@ class Tramway::Core::ApplicationForm < ::Reform::Form
 
   def save
     super
+  rescue ArgumentError => e
+    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, :submit, :looks_like_you_have_method,
-      method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
+    Tramway::Error.raise_error :tramway, :core, :application_form, :save, :looks_like_you_have_method,
+                               method_name: e.name.to_s.gsub('=', ''), model_class: @@model_class, class_name: self.class
   end
 end

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

@@ -17,7 +17,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/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/uploaders/photo_uploader.rb

@@ -16,6 +16,10 @@ class PhotoUploader < ApplicationUploader
     end
   end
 
+  def present?
+    super && width.present? && height.present?
+  end
+
   version :medium do
     process resize_to_fill: [400, 400]
   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/version.rb

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

data/lib/yaml/errors.yml

@@ -13,8 +13,10 @@ tramway:
       validates:
         you_need_to_set_model_class: 'You need to set `model_class` name while using validations. Just write `self.model_class = YOUR_MODEL_NAME` in the class area.'
       submit:
-        looks_like_you_have_method: "Looks like you have method `%{method_name}` in %{model_class}. You should rename it or rename property in %{class_name}"
         params_should_not_be_nil: "ApplicationForm::Params should not be nil"
+      save:
+        looks_like_you_have_method: "Looks like you have method `%{method_name}` in %{model_class}. You should rename it or rename property in %{class_name}"
+        argument_error: "We have ArgumentError with message: %{message}"
       model_class: 
         there_is_not_model_class: "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."
     concerns:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.17.2.5
+  version: 1.17.4.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-04-01 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