tramway-core 1.14.4 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 403640e1fa3e37979b6c8c2dc99479f9d19707dd3706773f16efbb4ccc3feaa3
-  data.tar.gz: 0c907e27554fef7d6e10695cdc2f400164b35254e593bd0399a0f48d2d95f2b4
+  metadata.gz: b65174daeb01a84e249d54218cda5782a2a811b3de9b027a01291e1dc61ad20a
+  data.tar.gz: 42bb77211fd5c15238b2d55896d70e6c42c56f50301cb6caac0e2f559d491335
 SHA512:
-  metadata.gz: fd26c611cffc17ff0797b73c6404fd8cd0c3a6db61ea5e91f96e916ec93e827a801c180876bf3b529dd205a81dbc6754c604571f1931297ad385fe1140e921eb
-  data.tar.gz: e99eeb1790216da4b8d15836238c89f79afc602a58ced2a332ab9661aa4778d54eaf4710ecdd89794539e196005afdeebca64a0cee469d23e615442922c6bb28
+  metadata.gz: e80de2735463dac7212ec4dfbe7680df39762a28826a0030db3d7f986779c127b0baf0af2bfe76139d53a19ac9bfa34b26b46b79cc98e3d72c79c204c92e1b53
+  data.tar.gz: d661179b6d89969e08991b5da3c3ef43cc1cc23658ab0f5ac112d5b52fd1bb9609c0921aac04cba671d202571c9f50bb8c30a130b9c5b96307465c31616239d9

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

@@ -13,17 +13,31 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
     object.send "human_#{attribute_name}_name"
   end
 
-  def image_view(value)
+  def image_view(original:, thumb: nil, filename: nil)
+    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
-        if value.url.match(/jpg|JPG|png|PNG$/)
-          concat image_tag value.try(:small) ? value.small.url : value.url
-        end
+        concat image_tag src_thumb
       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
+        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), value.url, class: 'btn btn-success')
+      concat link_to(fa_icon(:download), src_original, class: 'btn btn-success', download: filename)
     end
   end
 

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.14.4'
+    VERSION = '1.14.5'
   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.5
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-09 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