tramway-core 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f210d16378e75f559af9d82c4d91e7773ac4d41eeefd1517566d7de58065d54c
-  data.tar.gz: 053a94a32d41e4e18297d51d798f29ff4f56ba7a3b19fb9ee4ad63cb623b74b8
+  metadata.gz: 9480538773d03ccc2e175fc274664c80886860d76f957ae267baed4efaec104f
+  data.tar.gz: c1a1a28165932bafe348b06bb048e4166a3bc3aef7610e9a241fa3f7b7805fad
 SHA512:
-  metadata.gz: b5a41fe68961d1911fbc688af0e8e1b4c3b18f5e1113b8a694225a7df067c621b16bce2ed8ca0978c8a2a27488463a113a633287e813e24f7323c1c7fc3e3a2a
-  data.tar.gz: 284ba15ae8efd8b6f271db77b7acda396a33c6d90e3b7d2188d0c9200dc934210bfcbf7e9e3f3fe810a08e925230548c6ce4678133d3789fb46f603a59c03365
+  metadata.gz: 2712bbde78b0520facab711c6a5b2479a017cf492e23c0cba002490eb1109834e132b473aae6042fb581c41a660100c80c052f877fbd64ae1f0ce31b803f81c8
+  data.tar.gz: 29eed81461d08e45b35343d5930fa17e4be411fa84c9fd09a2653cba83bef0e242fe6508d56d506476990ba5989741e1ecdc636534f0adcd2b32fa4fc6a2d829

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

@@ -49,7 +49,9 @@ class Tramway::Core::ApplicationDecorator
         hash.merge! attribute[0] => I18n.l(attribute[1])
       elsif value.class.superclass == ApplicationUploader
         tags = content_tag(:div) do
-          concat image_tag value.small.url if value.url.match(/jpg|JPG|png|PNG$/)
+          if value.url.match(/jpg|JPG|png|PNG$/)
+            concat image_tag value.try(:small) ? value.small.url : value.url
+          end
           concat link_to(fa_icon(:download), value.url, class: 'btn btn-success')
         end
         hash.merge! attribute[0] => tags

data/app/uploaders/file_uploader.rb

@@ -1,6 +1,4 @@
 class FileUploader < ApplicationUploader
-  include ImageSizes
-
   def extension_white_list
     %w(pdf doc docx xls csv xlsx jpg)
   end

data/app/uploaders/photo_uploader.rb

@@ -13,7 +13,13 @@ class PhotoUploader < ApplicationUploader
     end
   end
 
-  include ImageSizes
+  version :medium do
+    process :resize_to_fill => [400, 400]
+  end
+
+  version :small do
+    process :resize_to_fill => [100, 100]
+  end
 
   # FIXME move to tramway-landing uploader
   version :card do

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -227,7 +227,6 @@ files:
 - app/uploaders/application_uploader.rb
 - app/uploaders/file_uploader.rb
 - app/uploaders/image_defaults.rb
-- app/uploaders/image_sizes.rb
 - app/uploaders/photo_uploader.rb
 - app/views/tramway/core/shared/_messages.html.haml
 - config/locales/ru/dates.yml

data/app/uploaders/image_sizes.rb

@@ -1,13 +0,0 @@
-module ImageSizes
-  extend ActiveSupport::Concern
-
-  included do
-    version :medium do
-      process :resize_to_fill => [400, 400]
-    end
-
-    version :small do
-      process :resize_to_fill => [100, 100]
-    end
-  end
-end