saviour 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bca4d3cff0e6279633cfffc29a4d773766027a10cdf78476779184d9f280d00
-  data.tar.gz: d386ff08897ea1241edad2f320e9c37e6384150a0f784cad9094156393f8722c
+  metadata.gz: e01220554bae6d136bace3b491f366aa5e5f8a8e6b853b1d19f5fe2ee194f7ac
+  data.tar.gz: cce3bf80da5aad0f7056422f9e30d9595f5c2b597f899346f09f0b615e0c5ce3
 SHA512:
-  metadata.gz: d1488dfc1fc68bc7039d8bc37157002e0fb55e1f5acac50cdfa0f3f3c4abd02b56b06fd0688e1c7c686e949929a1c86878742698dc27c3dc4925d37aa3c37a83
-  data.tar.gz: 79612867403b5856c642fdd69297f31e13006b08d9f998480b8f006e64d36f7555b699f44baaf0fc360fb811ff507157b08ca6ae2644c0b7571a2c92fafa442e
+  metadata.gz: 0b9b2682ffb7d3584853b3cb3ceca37cbae5f95a9802eabbe5d3df80a5de79810dbb3f26e5cb29fdfcf2acb128a9cd8d9f459458e0dc43bf93c47ec1274af303
+  data.tar.gz: 0a94d1526dcbb231bb27feb1b47cd913dd668ee127e6ce41961a67d2cd14ff646a7f52b856d5dc2b2758c1e3ca59b12473f2a8b9227c5c1078d17cd860a90bbe

data/lib/saviour/life_cycle.rb

@@ -49,7 +49,7 @@ module Saviour
         end
 
         @new_path = @file.write(
-            before_write: ->(path) { dup_file.call if @current_path == path }
+          before_write: ->(path) { dup_file.call if @current_path == path }
         )
 
         return unless @new_path
@@ -124,17 +124,18 @@ module Saviour
         next unless @model.send(column).changed?
 
         klass.new(
-            persistence_layer.read(column),
-            @model.send(column),
-            column,
-            ActiveRecord::Base.connection
+          persistence_layer.read(column),
+          @model.send(column),
+          column,
+          ActiveRecord::Base.connection
         )
       end.compact
 
       pool = Concurrent::FixedThreadPool.new(Saviour::Config.concurrent_workers)
+
       futures = uploaders.map { |uploader|
         Concurrent::Future.execute(executor: pool) {
-          if defined?(Rails)
+          if defined?(Rails) && Rails::VERSION::MAJOR < 6
             Rails.application.executor.wrap { uploader.upload }
           else
             uploader.upload
@@ -142,13 +143,19 @@ module Saviour
         }
       }
 
-      result = ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+      work = -> {
         futures.map do |x|
           x.value.tap do
             raise(x.reason) if x.rejected?
           end
         end.compact
-      end
+      }
+
+      result = if defined?(Rails) && Rails::VERSION::MAJOR < 6
+                 ActiveSupport::Dependencies.interlock.permit_concurrent_loads(&work)
+               else
+                 work.call
+               end
 
       pool.shutdown
       pool.wait_for_termination

data/lib/saviour/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord