saviour 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04095eaf0410d74e00e023a53cc473e8b5f2898f49673a329127d446a87f0080'
-  data.tar.gz: a3cba3ccb7d59f0f0e219475f003f21f102205132d3bc2cfb9ccc2ca6b0b5c54
+  metadata.gz: d30fa955590994c40acee59df17db7840c20d772afd8532e772813f53cdf9588
+  data.tar.gz: 37f60dce478723b85d08ba25e971497b9a20829fab51c0d6f46e2422661cfa5e
 SHA512:
-  metadata.gz: 83428891e963c4a96bffe2865380bbd586af945029e23d50c86c8b6aacac99f2ee7b928d89383bba0e1845175396e0b6f0c972d18e2df03390579cbf197518f0
-  data.tar.gz: 3ba8709c6d680f74eb933c3336b3954cd284b8bd52445db2cab72e2c58e1534152667a482b5cab2b5c8cf49a95a63e22f2a0a33e4cebf1becd03f3e1dddc65a6
+  metadata.gz: 0055e48b2d02bc40270c32ddf797089c0ef4c7fcfc1d29ecae04b2abd6a72ce952b2faf319bed50619b5497eab337001e950edb2c4b0a06a478dce7fefbc8941
+  data.tar.gz: bb9bd3648caaa9fc1c379f374f7c97f5e131916ba3ffa600f691db28ae90853afed59432b86f359b0f1d93064d3efb683f2fe4c7f0f58dc8d118992569d764c6

data/lib/saviour.rb

@@ -18,6 +18,8 @@ require 'tempfile'
 require 'fileutils'
 require 'concurrent/future'
 
+require 'active_support/dependencies'
+
 module Saviour
   NoActiveRecordDetected = Class.new(StandardError)
   FileNotPresent = Class.new(StandardError)

data/lib/saviour/life_cycle.rb

@@ -115,17 +115,27 @@ module Saviour
       end.compact
 
       pool = Concurrent::FixedThreadPool.new(Saviour::Config.concurrent_workers)
-      futures = uploaders.map { |uploader| Concurrent::Future.execute(executor: pool) { uploader.upload } }
+      futures = uploaders.map { |uploader|
+        Concurrent::Future.execute(executor: pool) {
+          if defined?(Rails)
+            Rails.application.executor.wrap { uploader.upload }
+          else
+            uploader.upload
+          end
+        }
+      }
+
+      result = ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+        futures.map do |x|
+          x.value.tap do
+            raise(x.reason) if x.rejected?
+          end
+        end.compact
+      end
 
       pool.shutdown
       pool.wait_for_termination
 
-      result = futures.map do |x|
-        x.value.tap do
-          raise(x.reason) if x.rejected?
-        end
-      end.compact
-
       attrs = result.to_h
 
       uploaders.map(&:uploader).select { |x| x.class.after_upload_hooks.any? }.each do |uploader|

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/feature/concurrent_processors_spec.rb

@@ -10,15 +10,29 @@ describe "concurrent processors" do
       store_dir { "/store/dir" }
 
       process_with_file do |file, filename|
+        stash(attached_as => Time.now.to_f)
         sleep WAIT_TIME
 
         [file, filename]
       end
+
+      after_upload do |stash|
+        model.times = model.times.merge(stash)
+      end
     }
   }
 
   let(:klass) {
-    klass = Class.new(Test) { include Saviour::Model }
+    klass = Class.new(Test) {
+      include Saviour::Model
+
+      attr_accessor :times
+
+      def initialize(*)
+        super
+        @times = {}
+      end
+    }
     klass.attach_file :file, uploader
     klass.attach_file :file_thumb, uploader
     klass.attach_file :file_thumb_2, uploader
@@ -32,15 +46,13 @@ describe "concurrent processors" do
 
       Saviour::Config.concurrent_workers = 4
 
-      t0 = Time.now
       a.update_attributes! file: Saviour::StringSource.new("contents", "file.txt"),
                            file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
                            file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
                            file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
 
-      diff = Time.now - t0
-      expect(diff).to be_within(0.05).of(WAIT_TIME)
-      expect(diff).to be < WAIT_TIME * 4
+      start_times = a.times.values.sort
+      expect((start_times[0] - start_times[-1]).abs).to be_within(0.1).of(0)
     end
 
     it 'works in serial with 1 worker' do
@@ -48,13 +60,13 @@ describe "concurrent processors" do
 
       Saviour::Config.concurrent_workers = 1
 
-      t0 = Time.now
       a.update_attributes! file: Saviour::StringSource.new("contents", "file.txt"),
                            file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
                            file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
                            file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
 
-      expect(Time.now - t0).to be >= WAIT_TIME * 4
+      start_times = a.times.values.sort
+      expect((start_times[0] - start_times[-1]).abs).to be > WAIT_TIME * 3
     end
 
     it 'concurrency can be adjusted' do
@@ -62,15 +74,15 @@ describe "concurrent processors" do
 
       Saviour::Config.concurrent_workers = 2
 
-      t0 = Time.now
       a.update_attributes! file: Saviour::StringSource.new("contents", "file.txt"),
                            file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
                            file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
                            file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
 
-      diff = Time.now - t0
-      expect(diff).to be_within(0.05).of(WAIT_TIME * 2)
-      expect(diff).to be < WAIT_TIME * 4
+      start_times = a.times.values.sort
+      expect((start_times[0] - start_times[1]).abs).to be_within(0.1).of(0)
+      expect((start_times[2] - start_times[3]).abs).to be_within(0.1).of(0)
+      expect((start_times[0] - start_times[-1]).abs).to be > WAIT_TIME
     end
   end
 
@@ -78,41 +90,39 @@ describe "concurrent processors" do
     it 'works concurrently with 4 workers' do
       Saviour::Config.concurrent_workers = 4
 
-      t0 = Time.now
-      klass.create! file: Saviour::StringSource.new("contents", "file.txt"),
-                    file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
-                    file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
-                    file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
+      a = klass.create! file: Saviour::StringSource.new("contents", "file.txt"),
+                        file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
+                        file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
+                        file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
 
-      diff = Time.now - t0
-      expect(diff).to be_within(0.05).of(WAIT_TIME)
-      expect(diff).to be < WAIT_TIME * 4
+      start_times = a.times.values.sort
+      expect((start_times[0] - start_times[-1]).abs).to be_within(0.1).of(0)
     end
 
     it 'works in serial with 1 worker' do
       Saviour::Config.concurrent_workers = 1
 
-      t0 = Time.now
-      klass.create! file: Saviour::StringSource.new("contents", "file.txt"),
-                    file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
-                    file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
-                    file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
+      a = klass.create! file: Saviour::StringSource.new("contents", "file.txt"),
+                        file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
+                        file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
+                        file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
 
-      expect(Time.now - t0).to be >= WAIT_TIME * 4
+      start_times = a.times.values.sort
+      expect((start_times[0] - start_times[-1]).abs).to be > WAIT_TIME * 3
     end
 
     it 'concurrency can be adjusted' do
       Saviour::Config.concurrent_workers = 2
 
-      t0 = Time.now
-      klass.create! file: Saviour::StringSource.new("contents", "file.txt"),
-                    file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
-                    file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
-                    file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
+      a = klass.create! file: Saviour::StringSource.new("contents", "file.txt"),
+                        file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
+                        file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
+                        file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
 
-      diff = Time.now - t0
-      expect(diff).to be_within(0.05).of(WAIT_TIME * 2)
-      expect(diff).to be < WAIT_TIME * 4
+      start_times = a.times.values.sort
+      expect((start_times[0] - start_times[1]).abs).to be_within(0.1).of(0)
+      expect((start_times[2] - start_times[3]).abs).to be_within(0.1).of(0)
+      expect((start_times[0] - start_times[-1]).abs).to be > WAIT_TIME
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord