neofiles 1.3.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6ba1967358a294458fc392576803ec6077f407fffddb810a62306a9b1f2210c8
-  data.tar.gz: deca6eecbca33cf4cba1a10e526e1ca6f5317bccde69c2b4f0f375cc6e0fe4d2
+SHA1:
+  metadata.gz: f6c91e9f6a9903c58776d7c916f8adda41c2694d
+  data.tar.gz: df2ede8d0562a3be9d2af8b3992eb4b662f9eb68
 SHA512:
-  metadata.gz: 6563c6d3a5a9b1df3e8e83e6c8a6f6972592766b862422799fb32b08dca00408d2b268bf3958b0826fc5225272610eea894006e5fbd1b1fe54338b6e0cb4c1c2
-  data.tar.gz: a8d71310a664db68c229a295537cee6d1b9caed2178156831e5ddb20e94315ab907e815db482932c3925399e51974ed9571c28cf3812f4e5a6466140727faa17
+  metadata.gz: 9fafa7bbe4b172169631d83597b46348b8726d6a4d411ca9091b59412ee5810d5e9c249cdd30c08c1296f86107bd3e4a6550647e74d740683072bfa143011246
+  data.tar.gz: d34b9056fb7dad7faa2e1a1a94b0a90733718b4db25925b43fc9b85547ef0bc583c3ffd7a705e78f5fd7c02e9a1c76f50fb50162e49c8d1535c5aa938b09a920

data/README.md

@@ -403,17 +403,6 @@ config.neofiles.image_max_crop_height = 2000 # users can request resizing only u
 config.neofiles.watermarker = ->(image, no_watermark: false, watermark_width:, watermark_height:) do
   ...
 end
-
-# picture when added is displayed on the right or left
-# also affects the order of displaying pictures
-config.neofiles.album_append_create_side = :left
-
-# Amazon S3 settings
-config.neofiles.amazon_s3_region = 'us-east'
-config.neofiles.amazon_s3_api = 'KEY_ID'
-config.neofiles.amazon_s3_secret = 'KEY_SECRET'
-config.neofiles.amazon_s3_bucket = 'neofiles_prod'
-config.neofiles.amazon_s3_endpoint = 'https://some-s3-provider.com' # optional
 ```
 
 Roadmap, TODOs

data/app/controllers/neofiles/admin_controller.rb

@@ -9,7 +9,7 @@
 class Neofiles::AdminController < ApplicationController
 
   # TODO: remove this! it should be controlled on application side
-  skip_before_filter :verify_authenticity_token
+  skip_before_action :verify_authenticity_token
 
   # Build AJAX edit/upload form for a single file in compact way: small file thumbnail + misc buttons, like "delete",
   # "change options" etc.
@@ -107,15 +107,14 @@ class Neofiles::AdminController < ApplicationController
 
     result = []
     file_objects.each_with_index do |file, i|
-      append_create_position = Rails.application.config.neofiles.album_append_create_side == :left ? i == 0 : i == file_objects.count - 1
-      result << file_compact(data.merge(id: file.id, widget_id: "#{data[:widget_id]}_ap_#{i}", append_create: append_create_position && !old_file && data[:append_create] == '1' ? '1' : '0'))
+      result << file_compact(data.merge(id: file.id, widget_id: "#{data[:widget_id]}_ap_#{i}", append_create: i == file_objects.count - 1 && !old_file && data[:append_create] == '1' ? '1' : '0'))
     end
 
     if result.empty?
       raise ArgumentError.new(last_exception || (errors.empty? ? I18n.t('neofiles.file_not_passed') : errors.join("\n")))
     end
 
-    render text: result.join, layout: false
+    render plain: result.join, layout: false
   end
 
   # As we don't actually delete anything, this method only marks file as deleted.
@@ -129,7 +128,7 @@ class Neofiles::AdminController < ApplicationController
     file.is_deleted = true
     file.save!
 
-    return render text: '' if data[:clean_remove].present? && data[:clean_remove] != '0'
+    return render plain: '' if data[:clean_remove].present? && data[:clean_remove] != '0'
 
     redirect_to neofiles_file_compact_path(data.merge(id: nil))
   end
@@ -141,7 +140,7 @@ class Neofiles::AdminController < ApplicationController
   def file_update
     file, data = find_file_and_data
     file.update data.slice(:description, :no_wm)
-    render text: '', layout: false
+    render plain: '', layout: false
   end
 
   # Neofiles knows how to play with Redactor.js and this method persists files uploaded via this WYSIWYG editor.

data/app/controllers/neofiles/images_controller.rb

@@ -7,7 +7,6 @@ class Neofiles::ImagesController < ActionController::Metal
   class NotAdminException < Exception; end
 
   include ActionController::DataStreaming
-  include ActionController::RackDelegation
   include Neofiles::NotFound
 
   if defined?(Devise)

data/app/models/neofiles/data_store/amazon_s3.rb

@@ -2,7 +2,6 @@
 # If you want to work with amazon s3 you need set values for the following parameters in your config file
 # amazon_s3_region - the AWS region to connect to. The region is used to construct the client endpoint.
 # amazon_s3_api, amazon_s3_secret - used to set credentials statically
-# amazon_s3_endpoint - change if using another S3-compatible provider
 # bucket_name - storage name in amazon_s3. Bucket must have a name that conforms to the naming requirements for non-US Standard regions.
 # http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html
 # File will be named as id of the Neofiles::File object
@@ -82,23 +81,15 @@ class Neofiles::DataStore::AmazonS3
   end
 
   def client
-    @client ||= Aws::S3::Client.new(client_params)
+    @client ||= Aws::S3::Client.new(
+        region: Rails.application.config.neofiles.amazon_s3_region,
+        credentials: Aws::Credentials.new(
+            Rails.application.config.neofiles.amazon_s3_api,
+            Rails.application.config.neofiles.amazon_s3_secret
+        )
+    )
   rescue Aws::S3::Errors::ServiceError
     nil
   end
 
-  def client_params
-    {
-      region: Rails.application.config.neofiles.amazon_s3_region,
-      credentials: Aws::Credentials.new(
-        Rails.application.config.neofiles.amazon_s3_api,
-        Rails.application.config.neofiles.amazon_s3_secret
-      )
-    }.tap do |result|
-      if Rails.application.config.neofiles.amazon_s3_endpoint
-        result[:endpoint] = Rails.application.config.neofiles.amazon_s3_endpoint
-      end
-    end
-  end
-
 end

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

@@ -2,10 +2,6 @@
 - desc = file.try(:description).try(:to_s).try!(:strip).try!(:truncate, 15).presence
 - empty_desc = t 'neofiles.views.no_description'
 
-- if Rails.application.config.neofiles.album_append_create_side == :left
-  - if append_create && 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, no_wm: no_wm}
-
 - classes = []
 - classes << 'neofiles-image-compact-empty' unless file
 - classes << 'neofiles-image-compact-with-description' if file && with_desc
@@ -26,7 +22,7 @@
         - if file.description.present?
           %p= file.description
 
-        %p= t 'neofiles.views.created_at', local_date: l(file.created_at, format: t('neofiles.views.local_date_format'))
+        %p= raw t 'neofiles.views.created_at', local_date: l(file.created_at, format: t('neofiles.views.local_date_format'))
 
         - file_options = []
         - if file.respond_to? :dimensions
@@ -44,7 +40,7 @@
               = check_box_tag uniq_name, '1', file.no_wm, class: 'neofiles-image-compact-nowm', data: {update_url: neofiles_file_update_path}
               = t 'neofiles.views.no_wm'
 
-      %a(href="#" tabindex="0" class="neofiles-image-compact-options" data-toggle="popover" data-trigger="click" data-placement="top" data-html="true" data-animation="false" data-title="#{file.filename}" data-content=options_form)
+      %a(href="#" tabindex="0" class="neofiles-image-compact-options" data-toggle="popover" data-trigger="click" data-placement="top" data-html="true" data-animation="false" data-title="#{file.filename}" data-content="#{options_form}")
         %i.icon-wrench.glyphicon.glyphicon-wrench
 
     - if with_desc
@@ -86,6 +82,6 @@
       $("##{widget_id}").image();
   });
 
-- if Rails.application.config.neofiles.album_append_create_side == :right
-  - if append_create && 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, no_wm: no_wm}
+- 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, no_wm: no_wm}
+

data/lib/neofiles/engine.rb

@@ -16,20 +16,23 @@ module Neofiles
     config.neofiles.image_max_crop_width  = 2000 # users can request resizing only up to this width
     config.neofiles.image_max_crop_height = 2000 # users can request resizing only up to this height
 
-    config.neofiles.album_append_create_side = :right # picture when added is displayed on the right
+    # default storage
+    config.neofiles.write_data_stores = 'mongo'
+    config.neofiles.read_data_stores  = 'mongo'
 
     # default watermarker — redefine to set special watermarking logic
     # by default, watermark only images larger than 300x300 with watermark at the bottom center, taken from file
     # /app/assets/images/neofiles/watermark.png
-    config.neofiles.watermarker = ->(image, no_watermark: false, watermark_width:, watermark_height:){
-      if watermark_width < 300 || watermark_height < 300 || no_watermark
-        return image.to_blob
-      end
+    config.neofiles.watermarker = ->(convert, _image, width, height) {
+      return if width < 300 || height < 300
 
-      image.composite(MiniMagick::Image.open(Rails.root.join('app', 'assets', 'images', 'neofiles', 'watermark.png'))) do |c|
-        c.gravity 'south'
-        c.geometry '200x+0+20'
-      end.to_blob
+      wm_path = Rails.root.join('app', 'assets', 'images', 'neofiles', 'watermark.png')
+      return unless ::File.exists?(wm_path)
+
+      convert << wm_path
+      convert.gravity 'south'
+      convert.geometry '200x+0+20'
+      convert.composite
     }
   end
 end

data/lib/neofiles/version.rb

@@ -1,3 +1,3 @@
 module Neofiles
-  VERSION = '1.3.2'
+  VERSION = '2.0.0'
 end

data/lib/neofiles.rb

@@ -1,5 +1,4 @@
 require 'neofiles/engine'
-require 'aspect_ratio'
 
 module Neofiles
   # Attach Neofiles specific routes in your routes.rb file:
@@ -35,6 +34,8 @@ module Neofiles
   #   width, height   - max width and height after resize
   #   resize_options  - {crop: '1'/'0'}, @see Neofiles::ImagesController#show
   #
+  # Can call ImageMagick.
+  #
   def resized_image_dimensions(image_file, width, height, resize_options)
     # dimensions are equal to requested ones if cropping
     return width, height if crop_requested? resize_options
@@ -57,20 +58,17 @@ module Neofiles
     # image fits into requested dimensions, no resizing will occur
     return image_file_width, image_file_height if image_file_width <= width && image_file_height <= height
 
-    in_aspect   = 1.0 * image_file_width / image_file_height
-    out_aspect  = 1.0 * width / height
-
-    if in_aspect > out_aspect
-      # If image is more "flat", the output width will always be equal to the requested width,
-      # and the output height will be less than the requested height
-      height = nil
-    else
-      # If input image is more "stretched" vertically or its aspect ratio is equal to output aspect ratio,
-      # the output height will be equal to the requested height, and the output width will be less than or equal to the requested width
-      width = nil
-    end
-
-    AspectRatio.resize(image_file_width, image_file_height, width, height).map(&:to_i)
+    # ... construct request ...
+    command = MiniMagick::CommandBuilder.new(:convert)            # convert input file...
+    command.size([image_file_width, image_file_height].join 'x')  # with the given dimensions...
+    command.xc('white')                                           # and filled with whites...
+    command.resize([width, height].join 'x')                      # to fit in the given rectangle...
+    command.push('info:-')                                        # return info about the resulting file
+
+    # ... and send it to ImageMagick
+    # the result will be: xc:white XC 54x100 54x100+0+0 16-bit DirectClass 0.070u 0:00.119
+    # extract dimensions and return them as array of integers
+    MiniMagick::Image.new(nil, nil).run(command).match(/ (\d+)x(\d+) /).values_at(1, 2).map(&:to_i)
 
   rescue
     nil

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: neofiles
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Konanykhin Ilya
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-imagespec
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: aspect_ratio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: 'Library for managing files: creating & storing, linking to file owners,
   serving files from MongoDB'
 email:
@@ -155,7 +141,7 @@ homepage: http://neoweb.kz
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.12
+signing_key: 
 specification_version: 4
 summary: Serves and manages files & images.
 test_files: []