remote_files 3.0.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7eb3bb17b8ce4eada434b51a093440ccdb5704e0
-  data.tar.gz: 015a8bf9379626635aa58a73e15a8e9684effc4f
+SHA256:
+  metadata.gz: f2bdd40ed1be30e3649f6089e603134e8cbc4bf8445d8b355f769b4ce29c2b25
+  data.tar.gz: 9a4d13593c4022eff78130eaf61d61e83a6bd8cfaae164636dfd81fca95fd7d2
 SHA512:
-  metadata.gz: 07b76566a9048eabcd4608f29609a34259e0f7ef1c134ce8d6e6155630c74b0330d44000594ceb14bd5c9d2bb4ef7c3467424894de21f9b44c2c2bb9fd7dd15a
-  data.tar.gz: 58d458f04016d0c72f0ea4339763bfb1d38d1f705c7e819e6528607c6ff2dd723a8af01005388e60b75b9aa3e9fe34df274d7b1ac95ddb453edffb547f38cc9a
+  metadata.gz: 648b24549307387c950a8ef5f72b0df42f6274eb53889b8c207e0aaba40618bbe1d1bbb43192baf6b037d43c885d492739994ee204a4e65e041321c4640e5d92
+  data.tar.gz: 8ad800c0ddd17a85e4631d6b38e960287c278127b88ec349cb2df890e37442e3fba4239e1219b6b54d66b6cebaf328bb92571607a6e3fd9817e2ef0dbc0ee7c0

data/lib/remote_files/file.rb

@@ -1,9 +1,9 @@
 module RemoteFiles
   class File
-    attr_reader :content, :content_type, :identifier, :stored_in, :configuration
+    attr_reader :content, :content_type, :identifier, :stored_in, :configuration, :populate_stored_in
 
     def initialize(identifier, options = {})
-      known_keys = [:identifier, :stored_in, :content_type, :configuration, :content]
+      known_keys = [:identifier, :stored_in, :content_type, :configuration, :content, :populate_stored_in]
       known_keys.each do |key|
         options[key] ||= options.delete(key.to_s)
       end
@@ -14,6 +14,7 @@ module RemoteFiles
       @content_type  = options[:content_type]
       @configuration = RemoteFiles::CONFIGURATIONS[(options[:configuration] || :default).to_sym]
       @logger        = options[:logger]
+      @populate_stored_in = options[:populate_stored_in]
       @options       = options
     end
 
@@ -34,7 +35,8 @@ module RemoteFiles
         :identifier    => identifier,
         :stored_in     => stored_in,
         :content_type  => content_type,
-        :configuration => configuration.name
+        :configuration => configuration.name,
+        :populate_stored_in => populate_stored_in
       )
     end
 
@@ -79,6 +81,8 @@ module RemoteFiles
           next unless file
           @content      = file.content
           @content_type = file.content_type
+          # :populate_stored_in is a boolean
+          @stored_in = file.stored_in if @populate_stored_in
           return true
         rescue Error => e
         end

data/lib/remote_files/fog_store.rb

@@ -48,16 +48,22 @@ module RemoteFiles
     end
 
     def delete!(identifier)
-      connection.delete_object(directory.key, identifier)
+      if identifier.to_s.chomp.empty?
+        message = "Empty identifier is not supported"
+        raise RemoteFiles::Error, message
+      end
+
+      connection.delete_object(directory_name, identifier)
     rescue Fog::Errors::NotFound, Excon::Errors::NotFound
       raise NotFoundError, $!.message, $!.backtrace
     end
 
     def connection
-      connection_options = options.dup
-      connection_options.delete(:directory)
-      connection_options.delete(:public)
-      @connection ||= Fog::Storage.new(connection_options)
+      opts = options.dup
+      opts.delete(:directory)
+      opts.delete(:public)
+      opts[:connection_options] ||= default_connection_options
+      @connection ||= Fog::Storage.new(opts)
     end
 
     def directory_name
@@ -70,6 +76,13 @@ module RemoteFiles
 
     protected
 
+    def default_connection_options
+      {
+        retry_limit: 0,
+        retry_interval: 0
+      }
+    end
+
     def aws_host
       case options[:region]
       when nil, 'us-east-1'

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '3.0.2'
+  VERSION = '3.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Mick Staugaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -59,7 +59,7 @@ files:
 - lib/remote_files/version.rb
 homepage: https://github.com/zendesk/remote_files
 licenses:
-- Apache License Version 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: The purpose of the library is to implement a simple interface for uploading