neofiles 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e96aa097e34ac97047248c698a3aeb9b64bc9ab
-  data.tar.gz: 66851a10940c7c14edd2eef83354815c857328e2
+  metadata.gz: 000a738365e7b626c34bc40b447836f062e2c5b3
+  data.tar.gz: 28187e344683d1a16cd3c9ddea1ad4569f0fba3c
 SHA512:
-  metadata.gz: d1d781c8139d2f9618f10a5b32f13b195053c722e3a3c5c4b38068870a780ecffe10dc801f63f73f26d6b532c96bd7f6273e350f8ba4f97d30c992aa9f197825
-  data.tar.gz: 348b856a3802607b95ab7f0df75b1ed4ed2270e1c82965969134417d3cbf03dd49f6cd99a7ddb6925a64fc2c1a021dcf841824efaad085dc5c0c99eb741aa373
+  metadata.gz: 806acf4cd5ded5efd0b716df22b9c2b81a338e08892bbe24aee47d958db39a0a12d512c919f858f0bd45e317a63e98c5be8ac6c06501dc452d8c32eec62c5227
+  data.tar.gz: 8b29970f16a7bfb674f0bfb678a806fb4cd07ecded43b289ad01ae22ad748efea05f7431505165ef8538bfbab896ebf797fdbb81d1acd64e928bed6eacb3a97d

data/app/controllers/neofiles/admin_controller.rb

@@ -33,6 +33,7 @@ class Neofiles::AdminController < ApplicationController
   #   request[:disabled]      - only show file, not allow anything to be edited (default '0')
   #   request[:multiple]      - allow uploading of multiple files at once (default '0')
   #   request[:with_desc]     - show short file description (default '0')
+  #   request[:no_wm]         - disable adding a watermark  (default '0')
   #
   # Parameters clear_remove & append_create are used to organize Albums — technically a collection of single files.
   #
@@ -54,6 +55,7 @@ class Neofiles::AdminController < ApplicationController
     @disabled       = request[:disabled].present? && request[:disabled] != '0'
     @multiple       = request[:multiple].present? && request[:multiple] != '0'
     @with_desc      = request[:with_desc].present? && request[:with_desc] != '0'
+    @no_wm          = request[:no_wm].present? && request[:no_wm] != '0'
     @error        ||= ''
 
     if fake_request
@@ -87,6 +89,7 @@ class Neofiles::AdminController < ApplicationController
       file_class = Neofiles::File.class_by_file_object(uploaded_file)
       file = file_class.new do |f|
         f.description = data[:description].presence || old_file.try(:description)
+        f.no_wm = data[:no_wm].present? && data[:no_wm] != '0'
         f.file = uploaded_file
       end
 

data/app/controllers/neofiles/images_controller.rb

@@ -62,7 +62,7 @@ class Neofiles::ImagesController < ActionController::Metal
       resize_image convert, width, height, crop_requested, need_resize_without_crop if resizing
 
       unless nowm?(image_file)
-        wm_width, wm_height = Neofiles::resized_image_dimensions image_file, width, height, params
+        wm_width, wm_height = resizing ? Neofiles::resized_image_dimensions(image_file, width, height, params) : [image_file.width, image_file.height]
         add_watermark convert, image, wm_width, wm_height if wm_width && wm_height
       end
 

data/app/views/neofiles/admin/_file_compact.html.haml

@@ -29,11 +29,11 @@
           - file_options << "#{file.dimensions.join('×').html_safe} px"
         - file_options << "#{number_to_human_size file.length, precision: 0}"
         %p= file_options.join(', ')
-        
+
         - if file.owner_type.present? || file.owner_id.present?
           %p #{t 'neofiles.views.owner'}: #{file.owner_type}#{file.owner_id}
 
-        - if file.respond_to? :no_wm
+        - if file.respond_to?(:no_wm) && !no_wm
           %p.checkbox
             - uniq_name = "#{widget_id}_no_wm"
             %label(for=uniq_name)
@@ -72,6 +72,8 @@
   = hidden_field_tag 'neofiles[append_create]', file          ? 0 : (append_create ? 1 : 0),  common_options
   = hidden_field_tag 'neofiles[multiple]',      multiple      ? 1 : 0,                        common_options
   = hidden_field_tag 'neofiles[with_desc]',     with_desc     ? 1 : 0,                        common_options
+  - if no_wm
+    = hidden_field_tag 'neofiles[no_wm]', 1, common_options
 
   = file_field_tag 'neofiles[file][]', id: nil, class: 'neofiles-image-compact-file', disabled: disabled, multiple: multiple && !file
 
@@ -81,5 +83,5 @@
   });
 
 - if append_create and file
-  = render partial: 'file_compact', locals: {file: nil, input_name: input_name, widget_id: widget_id + '_ap', clean_remove: clean_remove, append_create: true, error: nil, disabled: disabled, multiple: multiple, with_desc: with_desc}
+  = render partial: 'file_compact', locals: {file: nil, input_name: input_name, widget_id: widget_id + '_ap', clean_remove: clean_remove, append_create: true, error: nil, disabled: disabled, multiple: multiple, with_desc: with_desc, no_wm: no_wm}
 

data/app/views/neofiles/admin/file_compact.html.haml

@@ -1 +1 @@
-= render partial: 'file_compact', locals: {file: @file, widget_id: @widget_id, input_name: @input_name, error: @error, clean_remove: @clean_remove, append_create: @append_create, disabled: @disabled, multiple: @multiple, with_desc: @with_desc}
+= render partial: 'file_compact', locals: {file: @file, widget_id: @widget_id, input_name: @input_name, error: @error, clean_remove: @clean_remove, append_create: @append_create, disabled: @disabled, multiple: @multiple, with_desc: @with_desc, no_wm: @no_wm}

data/lib/neofiles/version.rb

@@ -1,3 +1,3 @@
 module Neofiles
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neofiles
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Konanykhin Ilya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails