tramway-core 1.17.7 → 1.17.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eefb734f64738208d5ebff801e31274167b6a7332001243b24e0612435e2b16
-  data.tar.gz: 2d26b33208ea81fb18c347d96e7dc7aecf95e4786121dbc9c834dc4e4f17309f
+  metadata.gz: 0d8a307c16b02463c022b9f145452524200abc08aec25f72a0abf57d389c2495
+  data.tar.gz: 886e56668981f2f0623ab5b84d4219e88e8c762cd4e7ef426d8782b1a579cfef
 SHA512:
-  metadata.gz: bac5a81a3324c4ce8de46df25a375aceaf7b80acbc1a3cc6f56752db1c8d8fb6c464c268b3c7160e13a24eb116d9ca4a93f1a0ae38f71de344e95152ca69131a
-  data.tar.gz: 8c1b83417ffdcbcd7c3ed79d5d2312d00357d5d48fe26ef4a351168ac0577f9dd3989df440c15707dad688c67204fd6bc7f5f9bac029fe1d96d04ad5da4a6a19
+  metadata.gz: 252e6926182c9f443a75cc9075804f4075ba7224ef888d2399ac910b1d00435cd92209bb367607da4a60cb7ff8d740388accdb02de45d878b44a8a9ef2ac5769
+  data.tar.gz: d01a72a18c43dfdcd3cf53d710a8f8e4a87db3d5a24d9480c4009993b58cfdb9a5ad36a740f521c8558b00e397597a7bf4fbee052deabe10ce6b6c5f1fe4f2a2

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
 
@@ -63,27 +63,28 @@ module Tramway::Core::InputsHelper
   end
 
   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)
-        )
-      }
-    }
+    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
-
-  def build_simple_value(form_object, property, value, input_html_value)
-    value_to_add = input_html_value ? input_html_value : value
-    value_to_add || form_object.send(property)
-  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/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.7'
+    VERSION = '1.17.9.1'
   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.7
+  version: 1.17.9.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited