saviour 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2408d3766fe7e343df39bf80798d3f1c55b257bb
-  data.tar.gz: 982c9775fda3297f502b5dd5675d0887c65a51e5
+  metadata.gz: 68e8a4112de62c4fe7d28f634ba8b296a9c28602
+  data.tar.gz: 696487d7c403c9d8792825cefec5991a81f1b3dd
 SHA512:
-  metadata.gz: 2fe5f34e9257b8268a0716b122488da444bbcb2564fc9809d37edd74e56475594f7a3f506a3733c29d21b9034964c2dca99284c11c7575e77de94462ed0da796
-  data.tar.gz: b036f619061734cccf4437c4ded64aabef8712f02adc8136c28390cd6706d21e30dbb484d99426ea8c0461a6ec02c75913c2d0a966d863ae8bb58b7d0f9f7b58
+  metadata.gz: b6964d6d057e12efd48c702ad0928966c172d63f45579a8ab72df6fb07bfecf467167946b6a3267baaaee3a24f57165f2094f11937497bb64f70afe4587cd198
+  data.tar.gz: 29ed2dd0ffd4cc4fade49f01455b8715f24d5302a904259399f8859a6f761feab9b707f38300b7adba17878b506d9051c750f0f509864f21abf9ac8c6993f2b5

data/README.md

@@ -180,8 +180,9 @@ You must configure Saviour by providing the storage to use:
 Saviour::Config.storage = MyStorageImplementation.new
 ```
 
-The provided storage object will be used for all the lifespan of the running application, for all the file uploads
-handled by Saviour.
+The provided storage object is considered a global configuration state that will be used by Saviour for all mounters.
+However, this configuration is thread-safe and can be changed at runtime, allowing you in practice to work with different
+storages by swapping them depending on your use case.
 
 
 ### public_url
@@ -389,7 +390,7 @@ Saviour::Config.processing_enabled = true
 ```
 
 You can use this when running tests, for example, or if you want processors to not execute for some reason. The flag can be
-changed in real time.
+changed in real time and is thread-safe.
 
 
 ## Versions

data/lib/saviour/config.rb

@@ -1,13 +1,16 @@
 module Saviour
-  module Config
-    extend self
-
-    attr_writer :storage
-    def storage
-      @storage || raise(RuntimeError, "You need to provide a storage! Set Saviour::Config.storage = xxx")
+  class Config
+    class NotImplemented
+      def method_missing(*)
+        raise(RuntimeError, "You need to provide a storage! Set Saviour::Config.storage = xxx")
+      end
     end
 
-    attr_accessor :processing_enabled
-    @processing_enabled = true
+    extend ActiveSupport::PerThreadRegistry
+
+    attr_accessor :storage, :processing_enabled
+
+    self.processing_enabled = true
+    self.storage = NotImplemented.new
   end
 end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/feature/{access_to_model_and_mounted_as.rb → access_to_model_and_mounted_as_spec.rb}

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe "access to model data from uploaders" do
-  before { Saviour::Config.storage = Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com") }
-  after { Saviour::Config.storage = nil }
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
 
   let(:uploader) {
     Class.new(Saviour::BaseUploader) do
@@ -12,7 +11,8 @@ describe "access to model data from uploaders" do
   }
 
   let(:klass) {
-    a = Class.new(Text)
+    a = Class.new(Test)
+    a.include Saviour
     a.attach_file :file, uploader
     a
   }

data/spec/feature/crud_workflows_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe "saving a new file" do
-  before { Saviour::Config.storage = Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com") }
-  after { Saviour::Config.storage = nil }
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
 
   let(:uploader) {
     Class.new(Saviour::BaseUploader) {

data/spec/feature/persisted_path_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe "persisted path" do
-  before { Saviour::Config.storage = Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com") }
-  after { Saviour::Config.storage = nil }
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
 
   context "can change the default_path on the uploader and previous instances are not affected" do
     it do

data/spec/feature/reload_model_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe "reload model" do
-  before { Saviour::Config.storage = Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com") }
-  after { Saviour::Config.storage = nil }
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
 
   context "updates the Saviour::File instance" do
     it do

data/spec/feature/validations_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe "validations saving a new file" do
-  before { Saviour::Config.storage = Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com") }
-  after { Saviour::Config.storage = nil }
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
 
   let(:uploader) {
     Class.new(Saviour::BaseUploader) {

data/spec/feature/versions_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe "saving a new file" do
-  before { Saviour::Config.storage = Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com") }
-  after { Saviour::Config.storage = nil }
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
 
   let(:uploader) {
     Class.new(Saviour::BaseUploader) do

data/spec/models/config_spec.rb

@@ -1,16 +1,24 @@
 require 'spec_helper'
 
 describe Saviour::Config do
-  after { Saviour::Config.storage = nil }
-  
   describe "#storage" do
     it do
-      expect { Saviour::Config.storage }.to raise_error(RuntimeError)
+      expect { Saviour::Config.storage.anything }.to raise_error(RuntimeError)
     end
 
     it do
       Saviour::Config.storage = :test
       expect(Saviour::Config.storage).to eq :test
     end
+
+    it "is thread-safe" do
+      (0.upto(1_000)).map do |x|
+        Thread.new do
+          Saviour::Config.storage = x
+          sleep 0.05 # Simulate work
+          expect(Saviour::Config.storage).to eq x
+        end
+      end.each(&:join)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -149,7 +149,7 @@ files:
 - lib/saviour/url_source.rb
 - lib/saviour/version.rb
 - saviour.gemspec
-- spec/feature/access_to_model_and_mounted_as.rb
+- spec/feature/access_to_model_and_mounted_as_spec.rb
 - spec/feature/crud_workflows_spec.rb
 - spec/feature/persisted_path_spec.rb
 - spec/feature/reload_model_spec.rb