neofiles 2.0.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1c972f4b33e6b201100fdd560d8c2cfbf4750c1
-  data.tar.gz: a012aa43d9d363119f5a32281050fb0a3604c405
+SHA256:
+  metadata.gz: 2043db724bbdbcf8227ff75527303fbb3df314cd2cb915e199f8b1fe9f8f4f6f
+  data.tar.gz: dcf7b597d8456dddca82fa67f7e5d436a7fd64d5165a4a7f2378ad0ead2776a2
 SHA512:
-  metadata.gz: b20688a3559211398444b2796ffa8da7254c2aafb543155afc53f199d7a59fac718aa3e34d5ad832e6a4a301b85af87cde9a400c4dfb77bd657acb3332bd2a29
-  data.tar.gz: 7fb035546faf97836f89506ddfb572f8b7a7381e594a31ab6f89dea3029547d44ecb0fb4b38ebbeb91c47087c5b69271cd240acdef59753fb5b0911abc57134b
+  metadata.gz: 3211ac84d144c6695bdcd0e894ba7a9a297e134ad051ba445ce7fc1a336970d355590d18cb35a9102c0ff38f37f9f97bdd2c68d55fe7849280f58c73c08139f7
+  data.tar.gz: a6b508101bd201c0b01e464f05aedd7c00f8a0bcfc4cfeeb4cec490e05d103c3661068f00229d2ce8989b4652254012eacff6cc3fe5d364e067d9c5899df5ba1

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/assets/javascripts/neofiles/index.webpack.js

@@ -0,0 +1,3 @@
+import './jquery.iframe-transport';
+import './jquery.fileupload';
+import './jquery.neofiles.js';

data/app/assets/stylesheets/neofiles/neofiles.css.scss

@@ -40,7 +40,7 @@
     opacity: 1;
   }
 
-  .glyphicon {
+  .fas {
     top: 0;
   }
 
@@ -69,7 +69,7 @@
   box-shadow: 0px 2px 2px rgba(90, 50, 50, .5);
   opacity: .2;
 
-  .glyphicon {
+  .fas {
     top: 1px;
     font-size: 12px;
     line-height: 12px;
@@ -146,4 +146,4 @@ INPUT.neofiles-image-compact-file {
   &.neofiles-image-compact-with-description {
     margin-bottom: 50px;
   }
-}
+}

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
@@ -15,7 +20,7 @@
     .neofiles-image-compact-view= file.admin_compact_view self
 
     %a(href=neofiles_file_remove_path class="neofiles-image-compact-remove")
-      %i.icon-remove.glyphicon.glyphicon-remove
+      %i.icon-remove.fas.fa-times
 
     - if Neofiles.is_admin? self
       - options_form = capture do
@@ -41,7 +46,7 @@
               = 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}")
-        %i.icon-wrench.glyphicon.glyphicon-wrench
+        %i.icon-wrench.fas.fa-wrench
 
     - if with_desc
       - description_form = capture do
@@ -60,7 +65,7 @@
         %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
+    %i.icon-upload.fas.fa-arrow-circle-up
 
   - common_options = {id: nil, disabled: disabled}
   = hidden_field_tag input_name,                file.try(:id),  common_options.merge(class: 'neofiles-image-transfer-input')
@@ -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.4'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neofiles
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Konanykhin Ilya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,7 @@ files:
 - app/assets/images/neofiles/swf-thumb-100x100.png
 - app/assets/images/neofiles/watermark.png
 - app/assets/javascripts/neofiles/index.js.coffee
+- app/assets/javascripts/neofiles/index.webpack.js
 - app/assets/javascripts/neofiles/jquery.fileupload.js
 - app/assets/javascripts/neofiles/jquery.iframe-transport.js
 - app/assets/javascripts/neofiles/jquery.neofiles.js.coffee
@@ -155,7 +156,7 @@ homepage: http://neoweb.kz
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,9 +171,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: []