onlyoffice_s3_wrapper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bad6470557003c5cd85d5ea551afd742ac5bd2df
-  data.tar.gz: fe925f5ed9ce38860d13def655a17a77bd7e4331
+SHA256:
+  metadata.gz: 48ef6d43732a45068d62ff4656240ff3176bd7b2e230408a740cf5b02a8d1880
+  data.tar.gz: cdf87b651e2de49a66a370b39aff82fe3713c6dd8dc07a5acb715d622cfea21e
 SHA512:
-  metadata.gz: 19e92c37a0828842de80a7581394605b99a938bf86e80299669d977e1ed2876cfcbfb2fda7c6f8bae09914ca144e50c0cb1c5572d0982f8d631dd1d4ee2cbaf9
-  data.tar.gz: 6d5d36c93d978007ab7d068b7890f3e94ba5f2150f52184d4c42061eb54a502065ee2e57f40ea2db01ebf2ea32d3875144ef2e2de828a50790f3f78ecdcdf63d
+  metadata.gz: 16d104821d05e85e26ed46d41af37140088c7ef6bcd165b13bef2ee409a102b9295398ddcda23154d35b617439312a2cc129018eae3993185f35d889a3de1a04
+  data.tar.gz: d2d1131bd96f3de426f9dd86c613c3282aae3cf3969e40339db5a13e5bf81c1946b82bc8e5ba6bd12b9f26914d4c386c598023b25dd045b9c03dc051e453f766

data/lib/onlyoffice_s3_wrapper/version.rb

@@ -1,3 +1,3 @@
 module OnlyofficeS3Wrapper
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/onlyoffice_s3_wrapper.rb

@@ -10,16 +10,7 @@ module OnlyofficeS3Wrapper
     attr_accessor :s3, :bucket, :download_folder, :access_key_id, :secret_access_key
 
     def initialize(bucket_name: 'nct-data-share', region: 'us-west-2')
-      @access_key_id = ENV['S3_KEY']
-      @secret_access_key = ENV['S3_PRIVATE_KEY']
-      if @access_key_id.nil? || @secret_access_key.nil?
-        begin
-          @access_key_id = File.read(Dir.home + '/.s3/key').delete("\n")
-          @secret_access_key = File.read(Dir.home + '/.s3/private_key').delete("\n")
-        rescue Errno::ENOENT
-          raise Errno::ENOENT, "No key or private key found in #{Dir.home}/.s3/ directory. Please create files #{Dir.home}/.s3/key and #{Dir.home}/.s3/private_key"
-        end
-      end
+      read_keys
       Aws.config = { access_key_id: @access_key_id,
                      secret_access_key: @secret_access_key,
                      region: region }
@@ -28,17 +19,18 @@ module OnlyofficeS3Wrapper
       @download_folder = Dir.mktmpdir('amazon-s3-downloads')
     end
 
-    def get_files_by_prefix(prefix = nil)
-      @bucket.objects(prefix: prefix).collect(&:key).reject { |file| is_folder?(file) }
+    def get_files_by_prefix(prefix = nil, field: :key)
+      @bucket.objects(prefix: prefix).collect(&field).reject { |file| folder?(file) }
     end
 
     # param [String] prefix
-    # return [Array] of folder names with '/' in end and filenames with fullpath (started ad prefix)
+    # return [Array] of folder names with '/'
+    # in end and filenames with fullpath (started ad prefix)
     def get_elements_by_prefix(prefix = nil)
       @bucket.objects(prefix: prefix).collect(&:key)
     end
 
-    def is_folder?(str)
+    def folder?(str)
       str.end_with? '/'
     end
 
@@ -47,7 +39,8 @@ 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("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)
@@ -55,18 +48,20 @@ module OnlyofficeS3Wrapper
 
     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 folder #{download_folder}")
       File.open("#{download_folder}/#{File.basename(object.key)}", 'w') do |f|
         IO.copy_stream(open(link), f)
       end
-      OnlyofficeLoggerHelper.log("File with name #{object.key} successfully downloaded to folder #{download_folder}")
+      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}")
     end
 
     def upload_file(file_path, upload_folder)
       upload_folder.sub!('/', '') if upload_folder[0] == '/'
-      upload_folder.chop! if is_folder?(upload_folder)
+      upload_folder.chop! if folder?(upload_folder)
       @bucket.object("#{upload_folder}/#{File.basename(file_path)}").upload_file(file_path)
     end
 
@@ -90,5 +85,26 @@ module OnlyofficeS3Wrapper
       file_path.sub!('/', '') if file_path[0] == '/'
       get_object(file_path).delete
     end
+
+    private
+
+    # Get S3 key and S3 private key
+    # @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."\
+                           "Please create files #{Dir.home}/.s3/key "\
+                           "and #{Dir.home}/.s3/private_key"
+    end
+
+    # 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
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_s3_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Helper Gem for S3