tramway-core 1.18.3.1 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54caa49641af517f7999adde3d7f7f757b528456b0d1a7e999de0af99419b08a
-  data.tar.gz: 1ebba7d8790d3dfd465dfd3dbe4f9118bb235f09b3daed23d4914a442f673aa4
+  metadata.gz: cd7c92b51cc68200779758562f6b9e2e8749d996344d9b9b4b6352e18e18c468
+  data.tar.gz: 07a2755db29397428160c07ccec045c28b5f56bf9dbea3a73fc8c9ebd7655b2f
 SHA512:
-  metadata.gz: 9e5e6af1ec6aaed1a8abca8347ccdfcc871e753e520a4b39fbaf24f1b30fa44a723e876c5c3cb25f9426d5411a311fc3e4399f33b3f1aa0a156c3234049bfa31
-  data.tar.gz: d38c5cdaaedf73eeb3eadbae99405852afd4aecb50e6c4b406b4e8e0ea9903c59644b9b1c558eb66623a49e82e4279b0241ad957fbe2443385ef9199e3db3907
+  metadata.gz: d934a4a8c7400a8733ce57c7a6001ba1f09d3ca3cf87656db86e8dfcaf16a7efe4f8309414dac496a11cc0a0887ebb1b97acb431aec68b4210ab889aa7ed79ee
+  data.tar.gz: 160d50747704912eba0a31035c3137fe9f48cbb5705d3823404bc97607adf31a8b8ff6c0abd100725b84fd9573811b14ef9d56b7c9a8a68495d7cd69c2955747

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*
 
@@ -177,7 +177,23 @@ Something like this:
 copy_to_clipboard "some_id" # some_id is HTML id of element. Content of this element will be copied to the clipboard after pressing the button
 ```
 
-## How to create model that will be an Application Model for the Tramway
+# Every Tramway application need initialized @application object (or if you create Tramway plugin, it should be @application_engine object).
+
+You don't need to initialize this object yourself, just configurate application with Tramway. You have **2** options of this:
+
+## Option 1. If you want to change @application object just in the code base.
+
+```shell
+rails g tramway:core:application
+```
+
+*config/initializers/tramway.rb*
+
+```ruby
+Tramway::Core.initialize_application name: :your_application_name
+```
+
+## Option 2. If you want to change @application object from admin panel. How to create model that will be an Application Model for the Tramway
 
 #### 1. Generate model that you to use. We create Organization, for example
 
@@ -196,7 +212,7 @@ Tramway::Core.initialize_application model_class: Organization
 
 ```ruby
 rails c
-Organization.create! public_name: 'Tramway', name: :organization, tagline: 'Tramway is not buggy, LOL!'
+Organization.create! public_name: 'Tramway', name: :organization, tagline: 'Tramway is not buggy, LOL!', main_image: 'https://raw.githubusercontent.com/ulmic/tramway-dev/develop/logo.png'
 ```
 
 #### 4. Add model to singleton to the `tramway-admin` admin panel to be able to change its data

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

@@ -1,12 +1,12 @@
 //= 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.1'
+    VERSION = '1.18.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.3.1
+  version: 1.18.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -119,22 +119,16 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement