neofiles 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bd6bd67b5f8e69f12e4b4f5302180449877bf5c2
-  data.tar.gz: 1e80129c603885ae84c8654c0d43d361e025c239
+SHA256:
+  metadata.gz: 6ba1967358a294458fc392576803ec6077f407fffddb810a62306a9b1f2210c8
+  data.tar.gz: deca6eecbca33cf4cba1a10e526e1ca6f5317bccde69c2b4f0f375cc6e0fe4d2
 SHA512:
-  metadata.gz: 4d659abcdbcd5659e858fbe346138f04fdd33c6d4bfd6bdfdc3223e2086ba1f625583245dad8be62c7606ba5a01d91f6dfa3d6c22a8a8c4289b319a721c6f4d4
-  data.tar.gz: 897cbe909484416ff6ef6bdff3ca33ddf8feeb86f548bd3e2ef39a6cc76f522943c1cc3e8e2222393d70d77ae098631c46b90ae35b979a46ac002404d9f716e4
+  metadata.gz: 6563c6d3a5a9b1df3e8e83e6c8a6f6972592766b862422799fb32b08dca00408d2b268bf3958b0826fc5225272610eea894006e5fbd1b1fe54338b6e0cb4c1c2
+  data.tar.gz: a8d71310a664db68c229a295537cee6d1b9caed2178156831e5ddb20e94315ab907e815db482932c3925399e51974ed9571c28cf3812f4e5a6466140727faa17

data/README.md

@@ -407,6 +407,13 @@ 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/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/lib/neofiles/version.rb

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

data/lib/neofiles.rb

@@ -20,7 +20,7 @@ module Neofiles
 
       # web frontend for serving images and other files
       get  '/serve/:id', to: 'files#show', as: :neofiles_file
-      get  '/serve-image/:id(/:format(/c:crop)(/q:quality))', to: 'images#show', as: :neofiles_image, constraints: {format: /[1-9]\d*x[1-9]\d*/, crop: /[10]/, quality: /[1-9]\d*/}
+      get  '/serve-image/:id(/:format(/c:crop)(/q:quality))', to: 'images#show', as: :neofiles_image, format: false, constraints: {format: /[1-9]\d*x[1-9]\d*/, crop: /[10]/, quality: /[1-9]\d*/}
 
       # serve images w/o watermark - path has prefix nowm_ to let Nginx ot other web server not cache these queries,
       # unlike usual /serve-image/:id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neofiles
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Konanykhin Ilya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2023-04-04 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: []