saviour 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518c8ff0b7b4f9109e1639526b4ff4d25e1878b9e0a4e572cbaab60321788f58
-  data.tar.gz: bfba0fd29fc19d8464e9c4aac30e8b100c029b2a034dba3bc44a62fc36d2cd94
+  metadata.gz: 482a04ef6b634ab6764da860557971b844fa1100c86f27eca3abf87eee26c9fa
+  data.tar.gz: 4ec9ed3937d113c39e0a8258a40771985258ca791e817cc9b84aaf39a4a2fbcb
 SHA512:
-  metadata.gz: 6b3d3a893c42fdc9cec9eeb661955f2c43be8540f8175772bb4d8086de9625bb86026ee2038fa1566fc8db81996f42d17107620abfddb7a6f65061adeb54e72d
-  data.tar.gz: c1b569e988c4a515289ea4cbabe48ba6ad3ab739bd791b19cefd2168ba0c81f6c148aef3745fdb3b8c0e55e8581700090abc14866ec4705463a250ff87cff80e
+  metadata.gz: c9ca2eb4c9ac709ac1ec724476663217eede8c9a3081f7a4caeaf56891da2d458142d184310c3b4b38554dcda3c5e297de2cdadc4ecbbb0dbfe881985f27bd80
+  data.tar.gz: fa501dce7fa4030e4a7ba93f865e276d56aca9eebabaebf0152e44dc25e757a969b396291c7c56b28272d70846106c4f2a0edc314250ec9b75c1956bc777f6ec

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.3.5
   - 2.4.2
   - 2.5.0
+  - 2.6.0
 
 gemfile:
   - gemfiles/5.1.gemfile

data/lib/saviour/base_uploader.rb

@@ -79,6 +79,8 @@ module Saviour
 
       def storage
         @storage ||= Config.storage
+
+        @storage.respond_to?(:call) ? @storage.call : @storage
       end
 
       def process(name = nil, opts = {}, type = :memory, &block)

data/lib/saviour/s3_storage.rb

@@ -11,6 +11,7 @@ module Saviour
     def initialize(conf = {})
       @bucket = conf.delete(:bucket)
       @public_url_prefix = conf.delete(:public_url_prefix)
+      @extra_aws_client_options = conf.delete(:aws_client_opts)
       @conf = conf
       @create_options = conf.delete(:create_options) { {} }
       conf.fetch(:aws_access_key_id) { raise(ArgumentError, "aws_access_key_id is required") }
@@ -119,9 +120,11 @@ module Saviour
 
     def client
       @client ||= Aws::S3::Client.new(
-        access_key_id: @conf[:aws_access_key_id],
-        secret_access_key: @conf[:aws_secret_access_key],
-        region: @region
+        {
+          access_key_id: @conf[:aws_access_key_id],
+          secret_access_key: @conf[:aws_secret_access_key],
+          region: @region
+        }.merge(@extra_aws_client_options || {})
       )
     end
   end

data/lib/saviour/uploader/processors_runner.rb

@@ -58,7 +58,7 @@ module Saviour
           result = run_method_or_block(method_or_block, opts, file)
 
           self.file = result[0]
-          file.reopen(file.path)
+          file.reopen(file.path, "r+")
 
           self.filename = result[1]
         end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/feature/storages_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe "uploader declaration" do
+  let!(:default_storage) do
+    Saviour::LocalStorage.new(
+      local_prefix: @tmpdir,
+      public_url_prefix: "http://domain.com"
+    )
+  end
+
+  let!(:another_storage) do
+    Saviour::LocalStorage.new(
+      local_prefix: @tmpdir,
+      public_url_prefix: "http://custom-domain.com"
+    )
+  end
+
+  before { allow(Saviour::Config).to receive(:storage).and_return(default_storage) }
+
+  it "lets you override storage on attachment basis" do
+    klass = Class.new(Test) { include Saviour::Model }
+    custom_storage = another_storage
+
+    klass.attach_file(:file) do
+      store_dir { "/store/dir" }
+    end
+
+    klass.attach_file(:file_thumb) do
+      store_dir { "/store/dir" }
+      with_storage custom_storage
+    end
+
+    a = klass.create!(
+      file: Saviour::StringSource.new("content", "houhou.txt"),
+      file_thumb: Saviour::StringSource.new("content", "custom_houhou.txt")
+    )
+
+    expect(a.file.filename).to eq "houhou.txt"
+    expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
+
+    expect(a.file_thumb.filename).to eq "custom_houhou.txt"
+    expect(a.file_thumb.url).to eq 'http://custom-domain.com/store/dir/custom_houhou.txt'
+  end
+
+  context do
+    it "allows for lambda storages" do
+      allow(Saviour::Config).to receive(:storage).and_return(-> { default_storage })
+
+      klass = Class.new(Test) { include Saviour::Model }
+
+      klass.attach_file(:file) do
+        store_dir { "/store/dir" }
+      end
+
+      a = klass.create!(file: Saviour::StringSource.new("content", "houhou.txt"))
+
+      expect(a.file.filename).to eq "houhou.txt"
+      expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
+    end
+
+    it "allow to change storage on the fly" do
+      dynamic_storage = default_storage
+      allow(Saviour::Config).to receive(:storage).and_return(-> { dynamic_storage })
+
+      klass = Class.new(Test) { include Saviour::Model }
+
+      klass.attach_file(:file) do
+        store_dir { "/store/dir" }
+      end
+
+      a = klass.create!(
+        file: Saviour::StringSource.new("content", "houhou.txt"),
+        file_thumb: Saviour::StringSource.new("content", "custom_houhou.txt")
+      )
+
+      expect(a.file.filename).to eq "houhou.txt"
+      expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
+
+      dynamic_storage = another_storage  # Lambda will pick up the new storage.
+
+      a = klass.create!(file: Saviour::StringSource.new("content", "houhou.txt"))
+
+      expect(a.file.filename).to eq "houhou.txt"
+      expect(a.file.url).to eq 'http://custom-domain.com/store/dir/houhou.txt'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -217,7 +217,7 @@ files:
 - spec/feature/reopens_file_at_every_process_spec.rb
 - spec/feature/rewind_source_before_read_spec.rb
 - spec/feature/stash_spec.rb
-- spec/feature/storage_overriding_spec.rb
+- spec/feature/storages_spec.rb
 - spec/feature/transactional_behavior_spec.rb
 - spec/feature/uploader_declaration_spec.rb
 - spec/feature/validations_spec.rb

data/spec/feature/storage_overriding_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe "uploader declaration" do
-  let!(:default_storage) do
-    Saviour::LocalStorage.new(
-      local_prefix: @tmpdir,
-      public_url_prefix: "http://domain.com"
-    )
-  end
-
-  let!(:another_storage) do
-    Saviour::LocalStorage.new(
-      local_prefix: @tmpdir,
-      public_url_prefix: "http://custom-domain.com"
-    )
-  end
-
-  before { allow(Saviour::Config).to receive(:storage).and_return(default_storage) }
-
-  it "lets you override storage on attachment basis" do
-    klass = Class.new(Test) { include Saviour::Model }
-    custom_storage = another_storage
-
-    klass.attach_file(:file) do
-      store_dir { "/store/dir" }
-    end
-
-    klass.attach_file(:file_thumb) do
-      store_dir { "/store/dir" }
-      with_storage custom_storage
-    end
-
-    a = klass.create!(
-      file: Saviour::StringSource.new("content", "houhou.txt"),
-      file_thumb: Saviour::StringSource.new("content", "custom_houhou.txt")
-    )
-
-    expect(a.file.filename).to eq "houhou.txt"
-    expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
-
-    expect(a.file_thumb.filename).to eq "custom_houhou.txt"
-    expect(a.file_thumb.url).to eq 'http://custom-domain.com/store/dir/custom_houhou.txt'
-  end
-end