tramway-core 1.17.6.1 → 1.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d406acc40d7905296b2257e659b8f5135d8b3caeb3accb877e092a3e1d4b43d6
-  data.tar.gz: 3b08362b8b0e3ab614df712ff887c59202e002ae7d894c6712d5007b4b10bbb2
+  metadata.gz: 444dff1263e8b8edbbdf21db2c4a07dd4bf3d1b5daa92b9bfce797e109a1c386
+  data.tar.gz: 77a4af707f2feb4e25b5d337752210fbde734f4415203c3fbcac66c716f466b4
 SHA512:
-  metadata.gz: c680f805536cb1b02f53d8919ef685b3d4d591d2bc68d2679021b72d96fba9c1ffdb9926dc9c108874d73ed5b1de0eb72161d6b7caf5f9972d83dc1a0bb5b5e6
-  data.tar.gz: 51b5f3715c11f83bed392d62f678ed60262cc848d0f4e34941c2693071ffe150821a293cf653195407565aeaf291b844d9086d27771b92a61c77d265e939b261
+  metadata.gz: 866c0a022d0583b30fee275c587f54a1890f21200a0369c38e29dd06b7539b9414ed04bc40dc367c0db9c6c889e34b9ddca19158ced7bbaa921e41c92e7160b2
+  data.tar.gz: 68701c75520dca9e137a81c6b8f926bbf5b7955eef9ef4d08ebb51b9fda10e92be6f87089024d55bb60a540dec9d522d3ab25b0b28441a92577fffddb60d3d50

data/README.md

@@ -157,7 +157,7 @@ copy_to_clipboard "some_id" # some_id is HTML id of element. Content of this ele
 #### 1. Generate model that you to use. We create Organization, for example
 
 ```shell
-rails g model organization name:text public_name:text tagline:text address:text phone:text coordinates:point, state: text # remember! State field is required, if you use tramway-admin
+rails g model organization name:text public_name:text tagline:text address:text phone:text coordinates:point, state: text, favicon:text # remember! State field is required, if you use tramway-admin
 rails db:migrate
 ```
 

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

@@ -19,9 +19,9 @@ module Tramway::Core::InputsHelper
                            options: options.merge(
                              as: :select,
                              label_method: ->(obj) { "#{obj.class.model_name.human} | #{obj.name}" },
-                             value_method: lambda do |obj|
+                             value_method: lambda { |obj|
                                "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"
-                             end
+                             }
                            )
   end
 
@@ -62,19 +62,29 @@ module Tramway::Core::InputsHelper
     }.merge options
   end
 
-  def else_params(**options)
-    {
-      as: options[:type],
-      label: false,
-      input_html: {
-        name: "#{options[:object]}[#{options[:property]}]",
-        id: "#{options[:object]}_#{options[:property]}",
-        value: build_else_value(options[:form_object], options[:property], options[:value])
-      }
-    }.merge options[: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 build_else_value(form_object, property, value)
-    form_object.send(property) ? form_object.model.send(property) : value
+  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/models/tramway/core/application_record.rb

@@ -42,6 +42,15 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     def search_by(*attributes, **associations)
       pg_search_scope :full_text_search, against: attributes, associated_against: associations
     end
+
+    def uploader(attribute_name, uploader_name, **options)
+      mount_uploader attribute_name, "#{uploader_name.to_s.camelize}Uploader".constantize
+      @versions = options[:versions] if uploader_name == :photo
+    end
+
+    def photo_versions
+      @versions
+    end
   end
 
   # FIXME: detect inhertited locales

data/app/uploaders/application_uploader.rb

@@ -6,6 +6,7 @@ class ApplicationUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    "system/uploads/#{model.class.model_name.to_s.underscore}/#{mounted_as}/#{model.id}"
+    directory_id = (model.reload && model.try(:uuid)) || model.id
+    "system/uploads/#{model.class.model_name.to_s.underscore}/#{mounted_as}/#{directory_id}"
   end
 end

data/app/uploaders/photo_uploader.rb

@@ -20,29 +20,14 @@ class PhotoUploader < ApplicationUploader
     super && width.present? && height.present?
   end
 
-  version :medium do
+  version :medium, if: :medium_version_is_needed? do
     process resize_to_fill: [400, 400]
   end
 
-  version :small do
+  version :small, if: :small_version_is_needed? do
     process resize_to_fill: [100, 100]
   end
 
-  # FIXME: move to tramway-landing uploader
-  version :card do
-    process resize_to_fill: [400, 400, 'North']
-  end
-
-  # FIXME: move to tramway-landing uploader
-  version :horizontal do
-    process resize_to_fill: [800, 350, 'North']
-  end
-
-  # FIXME: move to tramway-landing uploader
-  version :mini do
-    process resize_to_limit: [300, nil]
-  end
-
   attr_reader :width, :height
 
   before :cache, :capture_size
@@ -58,4 +43,16 @@ class PhotoUploader < ApplicationUploader
       @width, @height = `identify -format "%wx %h" #{file.path}`.split(/x/).map(&:to_i)
     end
   end
+
+  def medium_version_is_needed?(_new_file)
+    version_is_needed? :medium
+  end
+
+  def small_version_is_needed?(_new_file)
+    version_is_needed? :small
+  end
+
+  def version_is_needed?(version)
+    model.class.photo_versions.include? version
+  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/lib/tramway/core/application.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 class Tramway::Core::Application
-  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email, :main_image, :favicon
+  attr_accessor :name, :url, :model_class, :title, :tagline, :found_date, :phone, :email, :main_image, :favicon,
+    :short_description
 
   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.6.1'
+    VERSION = '1.17.9'
   end
 end

data/lib/yaml/errors.yml

@@ -35,6 +35,6 @@ tramway:
       attributes:
         method_is_reserved_word: "Method `%{attribute_name}` is reserved word. Please, create or delegate method in %{class_name} with another name."
       title:
-        please_implement_title: "Please, implement `title` method in a %{class_name} or %{object_class}"
+        please_implement_title: "Please, implement `title` method in a %{class_name} or delegate it from %{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.6.1
+  version: 1.17.9
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited