tramway-core 1.14.4 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 403640e1fa3e37979b6c8c2dc99479f9d19707dd3706773f16efbb4ccc3feaa3
-  data.tar.gz: 0c907e27554fef7d6e10695cdc2f400164b35254e593bd0399a0f48d2d95f2b4
+  metadata.gz: 7eb4509dfeb6ce3f2888cd0edab48363be0821f984c3f7ca614138ee30c7ef01
+  data.tar.gz: 06ef07b3c37f855fc77212fb3bce6b8a9c9f5b34a816d2e70fac735461590e16
 SHA512:
-  metadata.gz: fd26c611cffc17ff0797b73c6404fd8cd0c3a6db61ea5e91f96e916ec93e827a801c180876bf3b529dd205a81dbc6754c604571f1931297ad385fe1140e921eb
-  data.tar.gz: e99eeb1790216da4b8d15836238c89f79afc602a58ced2a332ab9661aa4778d54eaf4710ecdd89794539e196005afdeebca64a0cee469d23e615442922c6bb28
+  metadata.gz: 75ee6b972932c54bf05fd7da9f72b893c4fd3bf18bfcc7127d7c7f1979b7abd152b2da1ac023774367a8604ebe762c43704a2755d05a423e6b7ccf8df29b554d
+  data.tar.gz: 6f5869d70c2209ef1c8e96c8b96fb420383f90ab663ebde8199b123e59cd19501d1007b2e9914ba6cf6a4e149384a63d8ec460da9bebe46991ca99096d62e558

data/README.md

@@ -27,6 +27,11 @@ Tramway::Core.initialize_application name: "Your application's name"
 Tramway::Core.initialize_application model_class: ::Tramway::Conference::Unity # example was taken from tramway-conference gem
 ```
 
+*config/initializers/assets.rb*
+```ruby
+Rails.application.config.assets.precompile += %w( *.jpg *.png *.js )
+```
+
 # Базовые классы
 
 * ApplicationDecorator - Базовый класс декоратора. В него по умолчанию включены `ActionView::Helpers` и `ActionView::Context` и `FontAwesome5` (версия гема FontAwesome, которая поддерживает 5 версию шрифта). `FontAwesome` считается в `Tramway` основным шрифтом для иконок.

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

@@ -3,6 +3,11 @@
 module Tramway
   module Core
     class ApplicationController < ActionController::Base
+      before_action :application
+
+      def application
+        @application = ::Tramway::Core.application_object
+      end
     end
   end
 end

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

@@ -13,17 +13,33 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
     object.send "human_#{attribute_name}_name"
   end
 
-  def image_view(value)
-    content_tag(:div) do
-      begin
-        if value.url.match(/jpg|JPG|png|PNG$/)
-          concat image_tag value.try(:small) ? value.small.url : value.url
+  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.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}===))$})
+                    "data:image/jpeg;base64,#{thumb}"
+                  else
+                    thumb
+                  end
+      src_original = if original.is_a?(CarrierWave::Uploader::Base)
+                       original.url
+                     elsif original.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,#{original}"
+                     else
+                       original
+                     end
+      content_tag(:div) do
+        begin
+          concat image_tag src_thumb
+        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
-      rescue NoMethodError => e
-        error = Tramway::Error.new plugin: :core, method: :image_view, message: e.name == :url ? 'You should mount PhotoUploader to your model. Just add `mount_uploader #{attribute_name}, PhotoUploader` to your model' : e.message
-        raise error.message
+        concat link_to(fa_icon(:download), src_original, class: 'btn btn-success', download: filename)
       end
-      concat link_to(fa_icon(:download), value.url, class: 'btn btn-success')
     end
   end
 

data/lib/tramway/collections/helper.rb

@@ -4,9 +4,13 @@ module Tramway
   module Collections
     module Helper
       def collection_list_by(name:)
-        require name # needed to load class name with collection
+        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"
+        end
         unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)
-          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`"
+          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`. You should reload your server after creating this collection."
         end
 
         name.camelize.constantize.list

data/lib/tramway/core.rb

@@ -20,7 +20,7 @@ module Tramway
       end
 
       def application_object
-        @application.model_class.present? ? @application.model_class.first : @application 
+        @application&.model_class.present? ? @application.model_class.first : @application 
       end
 
       attr_reader :application

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.4'
+    VERSION = '1.14.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.14.4
+  version: 1.14.6
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -90,22 +90,22 @@ 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
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -144,22 +144,22 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -206,22 +206,22 @@ dependencies:
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core for all Tramway Rails Engines