onlyoffice_s3_wrapper 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ef6d43732a45068d62ff4656240ff3176bd7b2e230408a740cf5b02a8d1880
-  data.tar.gz: cdf87b651e2de49a66a370b39aff82fe3713c6dd8dc07a5acb715d622cfea21e
+  metadata.gz: 4af2be8cb335b101363b5cef8e5cc0887399dd737283d5c28229f1468b37c5df
+  data.tar.gz: 6bdd4346707a555268285f21ee1b0a75d821998d94b5df73fc92f518a6cf1d20
 SHA512:
-  metadata.gz: 16d104821d05e85e26ed46d41af37140088c7ef6bcd165b13bef2ee409a102b9295398ddcda23154d35b617439312a2cc129018eae3993185f35d889a3de1a04
-  data.tar.gz: d2d1131bd96f3de426f9dd86c613c3282aae3cf3969e40339db5a13e5bf81c1946b82bc8e5ba6bd12b9f26914d4c386c598023b25dd045b9c03dc051e453f766
+  metadata.gz: e974d934b9c74d0d50e43ac55e1e20f6c8e81a939074c558e3cc574b26ac58f388e446765bb640212de4b8bca0f121b8fc56ca3ac04c0a32fa13ff755c415e8a
+  data.tar.gz: 7fe4920dfd38dd251b4c6f6161e194d2a6b118f3c685275f8f8e75fc7d139c98fa26fa52aa521bbbab2ff6ae71369d7e0407fbfb16c66373699c608365a0a0bf

data/lib/onlyoffice_s3_wrapper.rb

@@ -1,13 +1,21 @@
-require 'aws-sdk'
+# frozen_string_literal: true
+
+require 'aws-sdk-s3'
 require 'open-uri'
 require 'securerandom'
 require 'onlyoffice_file_helper'
+require 'onlyoffice_s3_wrapper/path_helper'
 require 'onlyoffice_s3_wrapper/version'
 
 module OnlyofficeS3Wrapper
   # Class for working with amazon s3
   class AmazonS3Wrapper
-    attr_accessor :s3, :bucket, :download_folder, :access_key_id, :secret_access_key
+    include PathHelper
+    attr_accessor :s3, :bucket, :download_folder
+    # [String] Amazon key
+    attr_writer :access_key_id
+    # [String] Amazon secret key
+    attr_writer :secret_access_key
 
     def initialize(bucket_name: 'nct-data-share', region: 'us-west-2')
       read_keys
@@ -20,7 +28,9 @@ module OnlyofficeS3Wrapper
     end
 
     def get_files_by_prefix(prefix = nil, field: :key)
-      @bucket.objects(prefix: prefix).collect(&field).reject { |file| folder?(file) }
+      @bucket.objects(prefix: prefix)
+             .collect(&field)
+             .reject { |file| folder?(file) }
     end
 
     # param [String] prefix
@@ -39,30 +49,29 @@ module OnlyofficeS3Wrapper
     end
 
     def download_file_by_name(file_name, download_folder = @download_folder)
-      OnlyofficeLoggerHelper.log("Download file with name #{file_name} to "\
-                                      "folder #{download_folder}")
-      OnlyofficeLoggerHelper.log('Try to find file:')
       object = get_object(file_name)
       download_object(object, download_folder)
+      OnlyofficeLoggerHelper.log("Downloaded file with name #{file_name} to "\
+                                      "folder #{download_folder}")
     end
 
     def download_object(object, download_folder = @download_folder)
       link = object.presigned_url(:get, expires_in: 3600)
-      OnlyofficeLoggerHelper.log("Try to download object with name #{object.key} "\
-                                      "to folder #{download_folder}")
+      OnlyofficeLoggerHelper.log('Try to download object with name '\
+                                      "#{object.key} to #{download_folder}")
       File.open("#{download_folder}/#{File.basename(object.key)}", 'w') do |f|
-        IO.copy_stream(open(link), f)
+        IO.copy_stream(URI.parse(link).open, f)
       end
       OnlyofficeLoggerHelper.log("File with name #{object.key} successfully "\
                                       "downloaded to folder #{download_folder}")
     rescue StandardError
-      raise("File with name #{object.key} is not found un bucket #{@bucket.name}")
+      raise("File #{object.key} is not found un bucket #{@bucket.name}")
     end
 
     def upload_file(file_path, upload_folder)
-      upload_folder.sub!('/', '') if upload_folder[0] == '/'
-      upload_folder.chop! if folder?(upload_folder)
-      @bucket.object("#{upload_folder}/#{File.basename(file_path)}").upload_file(file_path)
+      path = bucket_file_path(File.basename(file_path),
+                              upload_folder)
+      @bucket.object(path).upload_file(file_path)
     end
 
     def make_public(file_path)
@@ -75,14 +84,15 @@ module OnlyofficeS3Wrapper
       @bucket.object(file_path).acl
     end
 
-    def upload_file_and_make_public(file_path, upload_folder)
+    def upload_file_and_make_public(file_path, upload_folder = nil)
       upload_file(file_path, upload_folder)
-      make_public("#{upload_folder}/#{File.basename(file_path)}")
-      @bucket.object("#{upload_folder}/#{File.basename(file_path)}").public_url
+      make_public(bucket_file_path(File.basename(file_path), upload_folder))
+      @bucket.object(bucket_file_path(File.basename(file_path),
+                                      upload_folder)).public_url
     end
 
     def delete_file(file_path)
-      file_path.sub!('/', '') if file_path[0] == '/'
+      file_path = file_path.sub('/', '') if file_path[0] == '/'
       get_object(file_path).delete
     end
 
@@ -92,10 +102,11 @@ module OnlyofficeS3Wrapper
     # @return [Array <String>] list of keys
     def read_keys
       return if read_env_keys
+
       @access_key_id = File.read(Dir.home + '/.s3/key').strip
       @secret_access_key = File.read(Dir.home + '/.s3/private_key').strip
     rescue Errno::ENOENT
-      raise Errno::ENOENT, "No key or private key found in #{Dir.home}/.s3/ directory."\
+      raise Errno::ENOENT, "No key or private key found in #{Dir.home}/.s3/ "\
                            "Please create files #{Dir.home}/.s3/key "\
                            "and #{Dir.home}/.s3/private_key"
     end
@@ -103,6 +114,7 @@ module OnlyofficeS3Wrapper
     # Read keys from env variables
     def read_env_keys
       return false unless ENV['S3_KEY'] && ENV['S3_PRIVATE_KEY']
+
       @access_key_id = ENV['S3_KEY']
       @secret_access_key = ENV['S3_PRIVATE_KEY']
     end

data/lib/onlyoffice_s3_wrapper/path_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module OnlyofficeS3Wrapper
+  # Module for method to work with paths
+  module PathHelper
+    # @param filename [String] name of file to upload
+    # @param folder [String] folder to upload file
+    # @return [String] correct full path to file
+    def bucket_file_path(filename, folder)
+      return filename unless folder
+
+      folder = folder.sub('/', '') if folder[0] == '/'
+      folder = folder.chop if folder?(folder)
+      "#{folder}/#{filename}"
+    end
+  end
+end

data/lib/onlyoffice_s3_wrapper/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeS3Wrapper
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_s3_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: onlyoffice_file_helper
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/onlyoffice_s3_wrapper.rb
+- lib/onlyoffice_s3_wrapper/path_helper.rb
 - lib/onlyoffice_s3_wrapper/version.rb
 homepage: https://github.com/onlyoffice-testing-robot/onlyoffice_s3_wrapper
 licenses:
@@ -70,8 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Helper Gem for S3