lolita-file-upload 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/app/uploaders/file_uploader.rb

@@ -1,7 +1,12 @@
 class FileUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MiniMagick
     storage :file
     after :remove, :delete_empty_upstream_dirs
 
+    version :normalized do
+      process :resize_to_fit => [600,600]
+    end
+
     def timestamp
       time=if model
         model.created_at || Time.now

data/app/views/components/lolita/configuration/tab/files/_cells.html.erb

@@ -1,6 +1,7 @@
 <td style="margin-top: 3px; border-bottom: 2px solid #E1E1E1; width: 600px;font-weight: bold; color: #737373; font-size: 14px; padding: 7px 20px; vertical-align: middle;">
   <% if file.send(tab.uploader).to_s =~ /(jpg|jpeg|png|gif)$/i %>
-    <%= link_to image_tag(file.send(tab.uploader).url, :style=>"width:300px; height 160px;"), file.send(tab.uploader).url %>
+    <% url = file.send(tab.uploader).normalized.url.blank? ? file.send(tab.uploader).url : file.send(tab.uploader).normalized.url
+    <%= link_to image_tag(url, :style=>"width:300px; height 160px;"), url %>
   <% else %>
     <%= link_to file.send(tab.uploader).url, file.send(tab.uploader).url %>
   <% end %>

data/app/views/components/lolita/configuration/tab/files/_fixed_gallery.html.haml

@@ -27,7 +27,8 @@
     - files = tab.association_type == :one ? [resource.send(tab.association.name)].compact :  resource.send(tab.association.name)
     - files.each do |file|
       - if file.send(tab.uploader).to_s =~ /(jpg|jpeg|png|gif)$/i 
-        = image_tag(file.send(tab.uploader).url)
+        - url = file.send(tab.uploader).normalized.url.blank? ? file.send(tab.uploader).url : file.send(tab.uploader).normalized.url
+        = image_tag(url)
       - else
         = link_to file.send(tab.uploader).url, file.send(tab.uploader).url
   %button{:onclick=>"$('#fixed-gallery').hide();"}Aizvērt

data/lolita-file-upload.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-file-upload}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &72861840 !ruby/object:Gem::Requirement
+  requirement: &83402170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *72861840
+  version_requirements: *83402170
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &72861390 !ruby/object:Gem::Requirement
+  requirement: &83401600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *72861390
+  version_requirements: *83401600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &72861100 !ruby/object:Gem::Requirement
+  requirement: &83400670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *72861100
+  version_requirements: *83400670
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &72860730 !ruby/object:Gem::Requirement
+  requirement: &83399990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *72860730
+  version_requirements: *83399990
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72860220 !ruby/object:Gem::Requirement
+  requirement: &83399420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *72860220
+  version_requirements: *83399420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72859630 !ruby/object:Gem::Requirement
+  requirement: &83398860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *72859630
+  version_requirements: *83398860
 description: File upload gem for Lolita with with fulll integration - models, controller,
   views
 email: support@ithouse.lv
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 115590957
+      hash: -355083647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: