saviour 0.6.6 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01220554bae6d136bace3b491f366aa5e5f8a8e6b853b1d19f5fe2ee194f7ac
-  data.tar.gz: cce3bf80da5aad0f7056422f9e30d9595f5c2b597f899346f09f0b615e0c5ce3
+  metadata.gz: 94654aa75977e1fc1b51ac4635cf62d99daacfe0c63b94b27132176e1a89b2f8
+  data.tar.gz: 72c77578ddfc92a494b4397a11ee55d5427075158939a3ab82d46fa620dada04
 SHA512:
-  metadata.gz: 0b9b2682ffb7d3584853b3cb3ceca37cbae5f95a9802eabbe5d3df80a5de79810dbb3f26e5cb29fdfcf2acb128a9cd8d9f459458e0dc43bf93c47ec1274af303
-  data.tar.gz: 0a94d1526dcbb231bb27feb1b47cd913dd668ee127e6ce41961a67d2cd14ff646a7f52b856d5dc2b2758c1e3ca59b12473f2a8b9227c5c1078d17cd860a90bbe
+  metadata.gz: 1261335b9ae8af1929e708769cbcb115cb73e05f458241467a8a93124b198cbb1c7e2faec51a70b79dd068cab016277f84d4478d323bd7b83b25419a4a883ef7
+  data.tar.gz: f9012382aacb98104c4e83fe7049c554dad19ee2fae77f6f9524c43b03f4a531ea432fbd615211b0f2c2dcf7fc6669b3cdf2908a653db2e6aac37c6b7c7cc2e6

data/.gitignore

@@ -19,4 +19,5 @@ spec/support/test_data_dir/*
 .idea
 .rbenv-gemsets
 *.gemfile.lock
-.DS_Store
+.DS_Store
+.ruby-version

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.5.0
-  - 2.6.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 
 gemfile:
   - gemfiles/5.1.gemfile

data/lib/saviour/life_cycle.rb

@@ -1,5 +1,7 @@
 module Saviour
   class LifeCycle
+    SHOULD_USE_INTERLOCK = defined?(Rails) && !Rails.env.test?
+
     class FileCreator
       def initialize(current_path, file, column, connection)
         @file = file
@@ -84,26 +86,17 @@ module Saviour
 
     def delete!
       DbHelpers.run_after_commit do
-        pool = Concurrent::FixedThreadPool.new(Saviour::Config.concurrent_workers)
+        pool = Concurrent::Throttle.new Saviour::Config.concurrent_workers
 
         futures = attached_files.map do |column|
-          Concurrent::Future.execute(executor: pool) {
-            file = @model.send(column)
+          pool.future(@model.send(column)) do |file|
             path = file.persisted_path
             file.uploader.storage.delete(path) if path
             file.delete
-          }
-        end
-
-        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-          futures.each do |future|
-            future.value
-            raise(future.reason) if future.rejected?
           end
         end
 
-        pool.shutdown
-        pool.wait_for_termination
+        futures.each(&:value!)
       end
     end
 
@@ -131,35 +124,26 @@ module Saviour
         )
       end.compact
 
-      pool = Concurrent::FixedThreadPool.new(Saviour::Config.concurrent_workers)
+      pool = Concurrent::Throttle.new Saviour::Config.concurrent_workers
 
       futures = uploaders.map { |uploader|
-        Concurrent::Future.execute(executor: pool) {
-          if defined?(Rails) && Rails::VERSION::MAJOR < 6
-            Rails.application.executor.wrap { uploader.upload }
+        pool.future(uploader) { |given_uploader|
+          if SHOULD_USE_INTERLOCK
+            Rails.application.executor.wrap { given_uploader.upload }
           else
-            uploader.upload
+            given_uploader.upload
           end
         }
       }
 
-      work = -> {
-        futures.map do |x|
-          x.value.tap do
-            raise(x.reason) if x.rejected?
-          end
-        end.compact
-      }
+      work = -> { futures.map(&:value!).compact }
 
-      result = if defined?(Rails) && Rails::VERSION::MAJOR < 6
+      result = if SHOULD_USE_INTERLOCK
                  ActiveSupport::Dependencies.interlock.permit_concurrent_loads(&work)
                else
                  work.call
                end
 
-      pool.shutdown
-      pool.wait_for_termination
-
       attrs = result.to_h
 
       uploaders.map(&:uploader).select { |x| x.class.after_upload_hooks.any? }.each do |uploader|

data/lib/saviour/s3_storage.rb

@@ -3,6 +3,8 @@ begin
 rescue LoadError
 end
 
+require 'marcel'
+
 module Saviour
   class S3Storage
     MissingPublicUrlPrefix = Class.new(StandardError)
@@ -27,8 +29,12 @@ module Saviour
         raise(KeyTooLarge, "The key in S3 must be at max 1024 bytes, this key is too big: #{path}")
       end
 
+      mime_type = Marcel::MimeType.for file_or_contents
+
       # TODO: Use multipart api
-      client.put_object(@create_options.merge(body: file_or_contents, bucket: @bucket, key: path))
+      client.put_object(@create_options.merge(
+        body: file_or_contents, bucket: @bucket, key: path, content_type: mime_type
+      ))
     end
 
     def write_from_file(file, path)

data/lib/saviour/uploader/processors_runner.rb

@@ -24,7 +24,7 @@ module Saviour
           if opts.empty?
             @uploader.send(method_or_block, data, filename)
           else
-            @uploader.send(method_or_block, data, filename, opts)
+            @uploader.send(method_or_block, data, filename, **opts)
           end
         end
       end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.6.6"
+  VERSION = "0.6.10"
 end

data/lib/saviour.rb

@@ -17,7 +17,8 @@ require 'saviour/db_helpers'
 
 require 'tempfile'
 require 'fileutils'
-require 'concurrent/future'
+require 'concurrent/edge/throttle'
+require 'concurrent/edge/lock_free_queue'
 
 require 'active_support/dependencies'
 

data/saviour.gemspec

@@ -15,9 +15,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_dependency "activerecord", ">= 5.1"
+  spec.add_dependency "activerecord", ">= 5.1", "< 7.0.0"
   spec.add_dependency "activesupport", ">= 5.1"
   spec.add_dependency "concurrent-ruby", ">= 1.0.5"
+  spec.add_dependency "concurrent-ruby-edge", ">= 0.6.0"
+  spec.add_dependency "marcel", ">= 1.0.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec"

data/spec/feature/memory_usage_spec.rb

@@ -56,8 +56,7 @@ describe "memory usage" do
 
           a.update! file: f
 
-          # Expect memory usage to grow below 10% of the file size
-          expect(GetProcessMem.new.mb - base_line).to be < size_to_test / 10
+          expect(GetProcessMem.new.mb - base_line).to be < 3
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.10
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-edge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: marcel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -241,8 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: File storage handler following active record model lifecycle