saviour 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202bb160466c2bb965d8bf474c07d0e55456f0ee8b001f07f023903146683b2f
-  data.tar.gz: 52e50a243ef24bafbbb44d41b4ac19b9f81b6c21413a799d3dfb0efdfefa19ed
+  metadata.gz: 94654aa75977e1fc1b51ac4635cf62d99daacfe0c63b94b27132176e1a89b2f8
+  data.tar.gz: 72c77578ddfc92a494b4397a11ee55d5427075158939a3ab82d46fa620dada04
 SHA512:
-  metadata.gz: 066ea6c30f34caa92fb60ead4c33393b417a0ade42dccc464e079679840aae7c0161a7cec1de38c11f4ee0c29d7930db59fd7e0f1db0a098943b05b0fc55ab45
-  data.tar.gz: b5c6a954120bb02290a6dc26936760201b24253601262622edec69c188f4bc3e56837d43420387f0761676764ee55cee939fa92a56c2ddef09ca394a53f917fa
+  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/lib/saviour/life_cycle.rb

@@ -1,6 +1,6 @@
 module Saviour
   class LifeCycle
-    SHOULD_USE_INTERLOCK = defined?(Rails)
+    SHOULD_USE_INTERLOCK = defined?(Rails) && !Rails.env.test?
 
     class FileCreator
       def initialize(current_path, file, column, connection)
@@ -96,9 +96,7 @@ module Saviour
           end
         end
 
-        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-          futures.each(&:value!)
-        end
+        futures.each(&:value!)
       end
     end
 

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.9"
+  VERSION = "0.6.10"
 end

data/saviour.gemspec

@@ -15,10 +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.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 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
@@ -66,6 +72,20 @@ dependencies:
     - - ">="
       - !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
@@ -255,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: File storage handler following active record model lifecycle