tramway-core 1.16 → 1.16.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65406e59a86c298559e164d9e16a55b62f83b20ecba159b86b682aa9af037bc
-  data.tar.gz: 7a4177835f457e7b5c48f59c0980965c3c05052d75d3f52b2c1f7a9a4f270ca9
+  metadata.gz: 43002acf65a91407b1d149325e917c6b6e35296b9a56a6f3f6183f97e25d264a
+  data.tar.gz: 6df6dc5a6d61303f92ab8fcd949a5495c42a762b73ef35e848338600d25f9141
 SHA512:
-  metadata.gz: 480f307ce1de6c9202e5a9d42539df4f34b8374037c5d643ab61592374f592fddeb63890eb094e61ee6c667660088121feb0158bf7b374c605d3a3236ac4bf77
-  data.tar.gz: 5e96737dabbb4aace66cc0123ea1d59c0b7cd11aad65ce544153213394c359accd6544d6f3515dbbd4a98b5ec7d5639e4a2c208b79d3f452639630b5591ac919
+  metadata.gz: 8fbedfbc412d573935a63c98ed8dae98d2f1c7b42b6549df1f72d774edce4520bb510dbd6fcf592efb897d5723f1095e4c31c824ee560ec20cf475885f515124
+  data.tar.gz: 3366f0507b64d89f498786f63dbdb4e606125f9b5f2a3d66c893065ee77986c8b0025b22aaf76677aadc75ea2999e8ce6fead5c6275cf7807fab633e6db9c3f4

data/README.md

@@ -12,6 +12,7 @@ tramway-core - это ядро проекта [tramway](https://github.com/ulmic
 ```ruby
 gem 'tramway-core'
 gem 'audited'
+gem 'clipboard-rails'
 ```
 
 ```shell
@@ -81,6 +82,31 @@ def field_type
 end
 ```
 
+## Other helpers
+
+### 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)
+
+#### Install
+
+```ruby
+include ::Tramway::Core::CopyToClipboardHelper
+```
+
+#### How to use it
+
+It will show you in the view in bootstrap styles with font-awesome `copy` icon.
+
+Something like this:
+
+![copy_to_clipboard_button](https://raw.githubusercontent.com/ulmic/tramway-dev/develop/tramway-core/docs/copy_to_clipboard_button.png)
+
+```ruby
+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
+```
+
+
 # Базовые классы
 
 * ApplicationDecorator - Базовый класс декоратора. В него по умолчанию включены `ActionView::Helpers` и `ActionView::Context` и `FontAwesome5` (версия гема FontAwesome, которая поддерживает 5 версию шрифта). `FontAwesome` считается в `Tramway` основным шрифтом для иконок.

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

@@ -1,9 +1,10 @@
 #= require jquery
 #= require jquery_ujs
-#= require popper
+#= require bootstrap
 #= require bootstrap-datepicker-1.8.0
 #= require bootstrap-datepicker-1.8.0.ru.min
 #= require font_awesome5
+#= require clipboard
 #= require_tree .
 
 window.i18n_locale = (locale) ->
@@ -28,3 +29,5 @@ $(document).ready ->
       anchor = $(this).data('anchor')
       unless $(anchor).offset() == undefined
         $(window).scrollTop $(anchor).offset().top
+
+  clipboard = new Clipboard '.clipboard-btn'

data/app/controllers/tramway/core/application_controller.rb

@@ -11,9 +11,7 @@ module Tramway
       end
 
       def load_extensions
-        if defined? ::Tramway::Extensions
-          ::Tramway::Extensions.load
-        end
+        ::Tramway::Extensions.load if defined? ::Tramway::Extensions
       end
     end
   end

data/app/decorators/tramway/core/application_decorator.rb

@@ -6,6 +6,7 @@ class Tramway::Core::ApplicationDecorator
   include ActionView::Helpers
   include ActionView::Context
   include ::FontAwesome5::Rails::IconHelper
+  include ::Tramway::Core::CopyToClipboardHelper
 
   def initialize(object)
     @object = object

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

@@ -15,11 +15,11 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
 
   def image_view(original, thumb: nil, filename: nil)
     if original.present?
-      thumb ||= original.small
-      filename ||= original.path.split('/').last
-      src_thumb = if thumb.is_a?(CarrierWave::Uploader::Base)
+      thumb ||= original.is_a?(CarrierWave::Uploader::Base) ? original.small : nil
+      filename ||= original.is_a?(CarrierWave::Uploader::Base) ? original.path&.split('/')&.last : nil
+      src_thumb = if thumb&.is_a?(CarrierWave::Uploader::Base)
                     thumb.url
-                  elsif thumb.match(%r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$})
+                  elsif thumb&.match(%r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$})
                     "data:image/jpeg;base64,#{thumb}"
                   else
                     thumb
@@ -33,12 +33,12 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
                      end
       content_tag(:div) do
         begin
-          concat image_tag src_thumb
+          concat image_tag src_thumb || src_original
         rescue NoMethodError => e
           error = Tramway::Error.new plugin: :core, method: :image_view, message: "You should mount PhotoUploader to your model. Just add `mount_uploader \#{attribute_name}, PhotoUploader` to your model. #{e.message}"
           raise error.message
         end
-        concat link_to(fa_icon(:download), src_original, class: 'btn btn-success', download: filename)
+        concat link_to(fa_icon(:download), src_original, class: 'btn btn-success', download: filename) if filename
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module Tramway
+  module Core
+    module CopyToClipboardHelper
+      def copy_to_clipboard(id)
+        button_tag class: 'btn btn-info clipboard-btn',
+          data: { clipboard_action: 'copy', clipboard_target: "##{id}" },
+          style: 'margin-left: 15px' do
+            fa_icon 'copy'
+          end
+      end
+    end
+  end
+end

data/app/models/tramway/core/application_record.rb

@@ -19,11 +19,15 @@ module Tramway
       end
 
       scope :active, -> { where state: :active }
-      scope :created_by_user, -> (user_id) { joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id) }
-      scope :admin_scope, -> (_arg) { all }
+      scope :created_by_user, ->(user_id) { joins(:audits).where('audits.action = \'create\' AND audits.user_id = ?', user_id) }
+      scope :admin_scope, ->(_arg) { all }
 
       include ::PgSearch::Model
 
+      def creator
+        audits.where(action: :create).first.user
+      end
+
       # FIXME: detect inhertited locales
       class << self
         def human_attribute_name(attribute_name, *_args)

data/app/uploaders/file_uploader.rb

@@ -2,6 +2,6 @@
 
 class FileUploader < ApplicationUploader
   def extension_white_list
-    %w[pdf doc docx xls csv xlsx jpg]
+    %w[pdf doc docx xls csv xlsx jpg svg png jpeg gif]
   end
 end

data/lib/tramway/collections/helper.rb

@@ -4,7 +4,7 @@ module Tramway
   module Collections
     module Helper
       def collection_list_by(name:)
-        begin 
+        begin
           require name # needed to load class name with collection
         rescue LoadError
           raise "No such file #{name}. You should create file in the `lib/#{name}.rb` or elsewhere you want"

data/lib/tramway/core.rb

@@ -23,11 +23,11 @@ module Tramway
         if @application&.model_class.present?
           begin
             @application.model_class.first
-          rescue
+          rescue StandardError
             nil
           end
         else
-          @application 
+          @application
         end
       end
 

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.16'
+    VERSION = '1.16.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: '1.16'
+  version: 1.16.1.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.4
+- !ruby/object:Gem::Dependency
+  name: clipboard-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: enumerize
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +360,7 @@ files:
 - app/forms/tramway/core/extendable_form.rb
 - app/forms/tramway/core/extended_application_form.rb
 - app/forms/tramway/core/form_creator.rb
+- app/helpers/tramway/core/copy_to_clipboard_helper.rb
 - app/helpers/tramway/core/title_helper.rb
 - app/inputs/date_picker_input.rb
 - app/models/tramway/core/application_record.rb