tramway-core 1.18.3.3 → 1.18.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf506df0d33b4bb514fb338de95dfce0296dd921c5156fee49b427896516a67
-  data.tar.gz: e13a9a940fc2f2fa54d0e9a450003f469cb357e99b0f86549f0e8f34df8a694c
+  metadata.gz: d6cfb3174c3fd183a2fed510756d21cf1057704a37d0321972e6a22efe6c5520
+  data.tar.gz: 5b198f9d8033d27f17eba26c260b1c3b0300067d44f1bc621f251f65d054c84b
 SHA512:
-  metadata.gz: 400e256729e362e04970979425fa31650a4741034671d7ecf37e11770e76698423d166c220ffd852d2bd43238e7584c10e3bfd62e81f9d1f138c03aa62094c2f
-  data.tar.gz: a6946fbee6c8a47b8f3098c2c96e21b75e389c511b68c36ce846ed8914ddd9d8a0dc7d0d8a2cc1632391e4d4efb370d37bc8deda8185abee27b30ddda2043e7c
+  metadata.gz: dad0b1593ae99e4428b1e35bfb55089203035290bfd3b328a2e339d9a6be1e1ed3af7ad8cc3626931ea2154a300b48eafb431e559aade167366ce30bdefb1ef6
+  data.tar.gz: 41d2def3e83a4676d87dd1792a4a749586889fd716f02aeb75c6a909c2423d12733a984622896e31f64898e08e718c24b8f118f3674f773548188d0d627d5c8c

data/README.md

@@ -1,4 +1,4 @@
-# Tramway::Core
+# Tramway::Core ![Ruby](https://github.com/Purple-Magic/tramway-core/workflows/Tests/badge.svg) ![Ruby](https://github.com/Purple-Magic/tramway-core/workflows/Rubocop/badge.svg) [![Gem Version](https://badge.fury.io/rb/tramway-core.svg)](https://badge.fury.io/rb/tramway-core)
 
 *If you need translation of this Readme, please message us kalashnikov@ulmic.ru. We'll translate for you and post to this page*
 

data/app/assets/javascripts/tramway/core/application.js

@@ -1,12 +1,14 @@
+// require popper FIXME should be optional requiring
 //= require jquery
 //= require jquery_ujs
 //= require jquery3
+//= require popper
 // require popper FIXME should be optional requiring
 //= require bootstrap
 //= require bootstrap-datepicker-1.8.0
 //= require bootstrap-datepicker-1.8.0.ru.min
 //= require font_awesome5
-//= require clipboard
+// require clipboard FIXME should be optional requiring
 //= require_tree .
 
 window.i18n_locale = function(locale) {

data/app/decorators/tramway/core/attributes/view_helper.rb

@@ -15,8 +15,10 @@ module Tramway::Core::Attributes::ViewHelper
   def view_by_value(object, value, attribute)
     if value.class.in? [ActiveSupport::TimeWithZone, DateTime, Time]
       datetime_view(attribute[1])
-    elsif value.class.superclass == ApplicationUploader
+    elsif value.class == PhotoUploader
       image_view(object.send(attribute[0]))
+    elsif value.class == FileUploader
+      file_view(object.send(attribute[0]))
     elsif value.is_a? Enumerize::Value
       enumerize_view(value)
     else

data/app/decorators/tramway/core/concerns/attributes_decorator_helper.rb

@@ -25,6 +25,17 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
     end
   end
 
+  def file_view(original, filename: nil)
+    return unless original.present?
+
+    filename ||= build_filename(original)
+    content_tag(:div) do
+      concat filename
+      concat ' '
+      concat download_button(filename: filename, original: original) if filename
+    end
+  end
+
   def enumerize_view(value)
     value.text
   end
@@ -65,6 +76,10 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
         message: e.message, attribute_name: attribute_name
       )
     end
-    concat link_to(fa_icon(:download), src_original(original), class: 'btn btn-success', download: filename) if filename
+    concat download_button(filename: filename, original: original) if filename
+  end
+
+  def download_button(filename:, original:)
+    link_to(fa_icon(:download), src_original(original), class: 'btn btn-success', download: filename)
   end
 end

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

@@ -61,12 +61,16 @@ class Tramway::Core::ApplicationForm
         options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
           a.name == association.to_sym
         end.first&.options
+        add_polymorphic_association hash, association, options
+      end
+    end
 
-        if options&.dig(:polymorphic)
-          hash.merge! association => @@model_class.send("#{association}_type").values
-        elsif options
-          hash.merge!(association => (options[:class_name] || association.to_s.camelize).constantize)
-        end
+    def add_polymorphic_association(hash, association, options)
+      if options&.dig(:polymorphic)
+        hash.merge association => @@model_class.send("#{association}_type").values
+      elsif options
+        hash.merge(association => (options[:class_name] || association.to_s.camelize).constantize)
+      else
         hash
       end
     end

data/lib/tramway/core/generators.rb

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

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.3.3'
+    VERSION = '1.18.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.3.3
+  version: 1.18.5.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited