saviour 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e8a4112de62c4fe7d28f634ba8b296a9c28602
-  data.tar.gz: 696487d7c403c9d8792825cefec5991a81f1b3dd
+  metadata.gz: 5c2fca8190280a50014041a2989e1faa1ab76940
+  data.tar.gz: 49c26d990899a05d0b10ce48196c26429a0e8bff
 SHA512:
-  metadata.gz: b6964d6d057e12efd48c702ad0928966c172d63f45579a8ab72df6fb07bfecf467167946b6a3267baaaee3a24f57165f2094f11937497bb64f70afe4587cd198
-  data.tar.gz: 29ed2dd0ffd4cc4fade49f01455b8715f24d5302a904259399f8859a6f761feab9b707f38300b7adba17878b506d9051c750f0f509864f21abf9ac8c6993f2b5
+  metadata.gz: 06fa6cba605bc2d7f44043bd979189cf3b8ddeb27faee2dd14f7c77c6361910c5abe0de610562cdd5d21c56e41e636a8aefc5a1fe40a879a1e46c3175e3d08c3
+  data.tar.gz: 0075fc54313974fe0d8ca044ad9b749bc92368ad1053d2844b60bd8e518d2d4f311d596423fbe0598e7a94e77b6a0f22e207efd99b754bbff77108f6d4d2f831

data/.gitignore

@@ -17,4 +17,5 @@ test/version_tmp
 tmp
 spec/support/test_data_dir/*
 .idea
-.rbenv-gemsets
+.rbenv-gemsets
+*.gemfile.lock

data/.travis.yml

@@ -5,6 +5,19 @@ rvm:
   - 2.2.4
   - 2.3.0
 
+gemfile:
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
+
 addons:
   code_climate:
     repo_token: abb288da5fac3efc45be30ffb37085314b9189ddccedf2cc68282777477e21c5
+
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/5.0.gemfile

data/Appraisals

@@ -0,0 +1,19 @@
+appraise "4.0" do
+  gem "activesupport", "~> 4.0.0"
+  gem "activerecord", "~> 4.0.0"
+end
+
+appraise "4.1" do
+  gem "activesupport", "~> 4.1.0"
+  gem "activerecord", "~> 4.1.0"
+end
+
+appraise "4.2" do
+  gem "activesupport", "~> 4.2.0"
+  gem "activerecord", "~> 4.2.0"
+end
+
+appraise "5.0" do
+  gem "activesupport", "~> 5.0.0"
+  gem "activerecord", "~> 5.0.0"
+end

data/gemfiles/4.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "activesupport", "~> 4.0.0"
+gem "activerecord", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "activesupport", "~> 4.1.0"
+gem "activerecord", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "activesupport", "~> 4.2.0"
+gem "activerecord", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/5.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "activesupport", "~> 5.0.0"
+gem "activerecord", "~> 5.0.0"
+
+gemspec :path => "../"

data/lib/saviour/config.rb

@@ -6,11 +6,27 @@ module Saviour
       end
     end
 
-    extend ActiveSupport::PerThreadRegistry
+    class << self
+      def processing_enabled
+        Thread.current["Saviour::Config"] ||= {}
+        Thread.current["Saviour::Config"][:processing_enabled] || true
+      end
+
+      def processing_enabled=(value)
+        Thread.current["Saviour::Config"] ||= {}
+        Thread.current["Saviour::Config"][:processing_enabled] = value
+      end
 
-    attr_accessor :storage, :processing_enabled
 
-    self.processing_enabled = true
-    self.storage = NotImplemented.new
+      def storage
+        Thread.current["Saviour::Config"] ||= {}
+        Thread.current["Saviour::Config"][:storage] || Thread.main["Saviour::Config"][:storage] || NotImplemented.new
+      end
+
+      def storage=(value)
+        Thread.current["Saviour::Config"] ||= {}
+        Thread.current["Saviour::Config"][:storage] = value
+      end
+    end
   end
 end

data/lib/saviour/version.rb

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

data/saviour.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0.0"
 
-  spec.add_dependency "activerecord", ">= 3.0"
-  spec.add_dependency "activesupport", ">= 3.0"
+  spec.add_dependency "activerecord", ">= 4.0"
+  spec.add_dependency "activesupport", ">= 4.0"
   spec.add_dependency "fog-aws"
   spec.add_dependency "mime-types"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "appraisal"
 end

data/spec/feature/access_to_model_and_mounted_as_spec.rb

@@ -11,10 +11,9 @@ describe "access to model data from uploaders" do
   }
 
   let(:klass) {
-    a = Class.new(Test)
-    a.include Saviour
-    a.attach_file :file, uploader
-    a
+    klass = Class.new(Test) { include Saviour }
+    klass.attach_file :file, uploader
+    klass
   }
 
   describe "file store" do

data/spec/feature/crud_workflows_spec.rb

@@ -81,7 +81,13 @@ describe "saving a new file" do
     it "don't create anything if save do not completes (halt during before_save)" do
       klass = Class.new(Test) do
         attr_accessor :fail_at_save
-        before_save { !fail_at_save }
+        before_save {
+          if ActiveRecord.version >= Gem::Version.new("5.0")
+            throw(:abort) if fail_at_save
+          else
+            !fail_at_save
+          end
+        }
         include Saviour
       end
       klass.attach_file :file, uploader

data/spec/models/config_spec.rb

@@ -11,14 +11,30 @@ describe Saviour::Config do
       expect(Saviour::Config.storage).to eq :test
     end
 
-    it "is thread-safe" do
-      (0.upto(1_000)).map do |x|
+    describe "threading behaviour" do
+      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
+
+      it "provides main value on new threads" do
+        Saviour::Config.storage = "chuck"
+        Thread.new { expect(Saviour::Config.storage).to eq("chuck") }.join
+      end
+
+      it "allows per-thread values" do
+        Saviour::Config.storage = 12
         Thread.new do
-          Saviour::Config.storage = x
-          sleep 0.05 # Simulate work
-          expect(Saviour::Config.storage).to eq x
-        end
-      end.each(&:join)
+          Saviour::Config.storage = :foo
+          expect(Saviour::Config.storage).to eq :foo
+        end.join
+        expect(Saviour::Config.storage).to eq 12
+      end
     end
   end
 end

data/spec/models/file_spec.rb

@@ -179,7 +179,7 @@ describe Saviour::File do
       test_exception = Class.new(Exception)
 
       begin
-        file.with_copy {|_| raise(test_exception, "some exception within the block") }
+        file.with_copy { |_| raise(test_exception, "some exception within the block") }
       rescue test_exception
       end
     end
@@ -203,7 +203,7 @@ describe Saviour::File do
     end
 
     it "it's false when persisted and assigned" do
-      file = Saviour::File.new(uploader_klass, Test.create!(file: example_file), :file)
+      file = Saviour::File.new(uploader_klass, Test.create!(file: "/mocked/path/file.rar"), :file)
       expect(file).not_to be_blank
     end
   end

data/spec/spec_helper.rb

@@ -21,7 +21,19 @@ connection_opts = case ENV.fetch('DB', "sqlite")
 ActiveRecord::Base.establish_connection(connection_opts)
 
 ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV['DEBUG']
+
+def silence_stream(stream)
+  old_stream = stream.dup
+  stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+  stream.sync = true
+  yield
+ensure
+  stream.reopen(old_stream)
+  old_stream.close
+end
+
 silence_stream(STDOUT) { require 'support/schema' }
+
 require 'support/models'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: File storage handler following active record model lifecycle
 email:
 - roger@rogercampos.com
@@ -131,10 +145,15 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/saviour.rb
 - lib/saviour/base_uploader.rb
 - lib/saviour/config.rb