onlyoffice_s3_wrapper 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f371300c8b28c568d47bf7dc85ce6815026833b540bfc8e9b9ac602856f15c82
-  data.tar.gz: 5d08e52e477eb493d027914258196b55b3af4a0230b3215e0b62eb0871126cc5
+  metadata.gz: 4f759299fdd77c2713fe455c51d27d341b35ca6eb011ba5fb5672418ac29804d
+  data.tar.gz: 52f1566fa9c5d47f81c7f107537480ec6f5c901955036e4b5186ddb372344c22
 SHA512:
-  metadata.gz: ca9c3f1b34c432beb95f37e4d1bab93d5a6bc74c132a0f76c680f90a06f59bd87f75f151cdecca8062e5c044a51b9fb5dd99e78966fc24e839a9b1a5ae07e4f0
-  data.tar.gz: 163fe1a244b2bc4a41fcd1ba8469501e36a3b24a48f16511818eda6a7af267e68a30a8be0257eeafdd58fa80cf16d2ef9b7aecc9886ca94de68bfe2a50f8221f
+  metadata.gz: 6adf855422c3d44b99a6c357eb680330feb6c9b4644ced8d76173f55b64781fe731ab1e44646c82c511c826ac70d7d373743968340f9973054d9c55a5430732d
+  data.tar.gz: 67c4fcf4192b16197d9d91c9a762424b02286f309cc0073f3bea09f0d94fc81409546130b5d5d505d428b0d1fb3e34ffed62a203349b7c664b8afd0074842ca1

data/lib/onlyoffice_s3_wrapper/version.rb

@@ -2,5 +2,5 @@
 
 module OnlyofficeS3Wrapper
   # [String] Version of gem
-  VERSION = '0.4.0'
+  VERSION = '1.0.0'
 end

data/lib/onlyoffice_s3_wrapper.rb

@@ -11,6 +11,9 @@ require 'onlyoffice_s3_wrapper/version'
 module OnlyofficeS3Wrapper
   # Class for working with amazon s3
   class AmazonS3Wrapper
+    # @return [String] default content type for uploaded files
+    DEFAULT_CONTENT_TYPE = 'binary/octet-stream'
+
     include PathHelper
     attr_accessor :s3, :bucket, :download_folder
     # [String] Amazon key
@@ -38,6 +41,16 @@ module OnlyofficeS3Wrapper
              .reject { |file| folder?(file) }
     end
 
+    # Get list of files from specific folder
+    # Will not use folder name as prefix, will always try to look at folder
+    # with exact specified name
+    # @param [String] folder to get files
+    # @return [Array<Object>] result set
+    def files_from_folder(folder = nil)
+      folder = "#{folder}/" unless folder.end_with?('/')
+      get_files_by_prefix(folder)
+    end
+
     # param [String] prefix
     # return [Array] of folder names with '/'
     # in end and filenames with fullpath (started ad prefix)
@@ -93,11 +106,12 @@ module OnlyofficeS3Wrapper
     # Upload file
     # @param file_path [String] file to upload
     # @param upload_folder [String] path to upload
+    # @param content_type [String] content type of file to upload
     # @return [nil]
-    def upload_file(file_path, upload_folder)
+    def upload_file(file_path, upload_folder, content_type = DEFAULT_CONTENT_TYPE)
       path = bucket_file_path(File.basename(file_path),
                               upload_folder)
-      @bucket.object(path).upload_file(file_path)
+      @bucket.object(path).upload_file(file_path, content_type: content_type)
     end
 
     # Make file public
@@ -119,9 +133,12 @@ module OnlyofficeS3Wrapper
     # Upload file/folder and make public
     # @param file_path [String] file to upload
     # @param upload_folder [True, False] is this a folder
+    # @param content_type [String] content type of file to upload
     # @return [String] public url
-    def upload_file_and_make_public(file_path, upload_folder = nil)
-      upload_file(file_path, upload_folder)
+    def upload_file_and_make_public(file_path,
+                                    upload_folder = nil,
+                                    content_type = DEFAULT_CONTENT_TYPE)
+      upload_file(file_path, upload_folder, content_type)
       make_public(bucket_file_path(File.basename(file_path), upload_folder))
       @bucket.object(bucket_file_path(File.basename(file_path),
                                       upload_folder)).public_url
@@ -142,8 +159,8 @@ module OnlyofficeS3Wrapper
       @access_key_id = File.read("#{key_location}/key").strip
       @secret_access_key = File.read("#{key_location}/private_key").strip
     rescue Errno::ENOENT
-      raise Errno::ENOENT, "No key or private key found in #{key_location} "\
-                           "Please create files #{key_location}/key "\
+      raise Errno::ENOENT, "No key or private key found in #{key_location} " \
+                           "Please create files #{key_location}/key " \
                            "and #{key_location}/private_key"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_s3_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,16 +30,16 @@ dependencies:
   name: onlyoffice_file_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/onlyoffice_s3_wrapper
   homepage_uri: https://github.com/ONLYOFFICE-QA/onlyoffice_s3_wrapper
   source_code_uri: https://github.com/ONLYOFFICE-QA/onlyoffice_s3_wrapper
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -201,14 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.19
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Helper Gem for S3