neofiles 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 270d63f7c55f16dd7bc9899c7fe4f0c0ced9fbd3
-  data.tar.gz: af060e4083f09b0493566075f3ea34d6d17f225b
+SHA256:
+  metadata.gz: c990b0639f2c8783d0c511266ecc7bc5df9eaff856f171c08b33648a372ba8c0
+  data.tar.gz: 77177e83d421a156bf2e62e67ee408df101d3db971ce41df8b5053fa6a91a2c5
 SHA512:
-  metadata.gz: 4bca497d608747f6f563cf6421a816251157b9d4736ae88d021cd5f5718fcb7139288d2127e1cb328cf3045c06b5caf40634b83f79b088e7455496134de9b5a6
-  data.tar.gz: 33a681aedf0cb58571f7cb97ca9fe90e3d51dc4e100adbd117d16f37640edca738f5ff75a30132d1fe0b5df36f6d49428028e18e0206488af3cf4cf67b8f814e
+  metadata.gz: c58b69ec97b11ef6957470b49e229c89af3c26c286bd9161daec5ee05e77d2067541de311dc09135be62b394f7772860868323f04e3b3d758bbbd81b18958d51
+  data.tar.gz: 3357f8319fa3db3df89ca947968c24a59cd74b1e4d03ea938b73369932617c6ab6881bb6c56ab90e68c3e1523bd73611ae4221dbde33084965fcecd4c8ec3604

data/README.md

@@ -403,6 +403,17 @@ 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

@@ -107,7 +107,8 @@ class Neofiles::AdminController < ApplicationController
 
     result = []
     file_objects.each_with_index do |file, i|
-      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'))
+      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'))
     end
 
     if result.empty?

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

@@ -2,6 +2,7 @@
 # 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
@@ -81,15 +82,23 @@ class Neofiles::DataStore::AmazonS3
   end
 
   def client
-    @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
-        )
-    )
+    @client ||= Aws::S3::Client.new(client_params)
   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,6 +2,11 @@
 - 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 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}
+
+
 - classes = []
 - classes << 'neofiles-image-compact-empty' unless file
 - classes << 'neofiles-image-compact-with-description' if file && with_desc
@@ -53,11 +58,11 @@
       - popover_template = capture do
         .popover.neofiles-image-compact-description-popover(role="tooltip")
           .arrow
-          %h3.popover-title
-          .popover-content
+          %h3.popover-title.popover-header
+          .popover-content.popover-body
 
       .neofiles-image-compact-description
-        %a.neofiles-image-compact-description-handle(href="#" data-empty=empty_desc data-toggle="popover" data-trigger="click" data-placement="bottom" data-html="true" data-animation="false" data-title="#{t 'neofiles.views.description'}" data-content=description_form data-template=popover_template){class: ('neofiles-image-compact-description-empty' unless desc)}= desc || empty_desc
+        %a.neofiles-image-compact-description-handle(href="#" data-empty=empty_desc data-toggle="popover" data-trigger="click" data-placement="bottom" data-html="true" data-animation="false" data-title="#{t 'neofiles.views.description'}" data-content="#{description_form}" data-template="#{popover_template}" data-container="##{widget_id}"){class: ('neofiles-image-compact-description-empty' unless desc)}= desc || empty_desc
 
   %span.neofiles-image-compact-upload-icon
     %i.icon-upload.glyphicon.glyphicon-upload
@@ -82,6 +87,7 @@
       $("##{widget_id}").image();
   });
 
-- 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}
+- 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}
 

data/lib/neofiles/engine.rb

@@ -16,6 +16,8 @@ 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'

data/lib/neofiles/version.rb

@@ -1,3 +1,3 @@
 module Neofiles
-  VERSION = '2.0.2'
+  VERSION = '2.1.1'
 end

data/lib/neofiles.rb

@@ -57,6 +57,19 @@ 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)
 
   rescue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neofiles
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Konanykhin Ilya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,7 +155,7 @@ homepage: http://neoweb.kz
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,9 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Serves and manages files & images.
 test_files: []