saviour 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58fead9b2cc6702062727d40824f65b016445a6d
-  data.tar.gz: 5a6a218dae027315fce70761c2b39035cd243bcb
+  metadata.gz: 2408d3766fe7e343df39bf80798d3f1c55b257bb
+  data.tar.gz: 982c9775fda3297f502b5dd5675d0887c65a51e5
 SHA512:
-  metadata.gz: 58f13bfb42bb55782bcade9e8fefb67e5d697eb614cd181cca89eaa6443b3166dbbd73d70a53ce24af864de2d9d5f918c8dd48a13f1eb1a96fd821d1d8267a95
-  data.tar.gz: c1d3737b8414cae6610d4c33232514aa74e99b1a5e948b887f2aa32de0b9bd5629b644478e269726053901590e16452af717486fcdb95f4d6bc1fb43ff393495
+  metadata.gz: 2fe5f34e9257b8268a0716b122488da444bbcb2564fc9809d37edd74e56475594f7a3f506a3733c29d21b9034964c2dca99284c11c7575e77de94462ed0da796
+  data.tar.gz: b036f619061734cccf4437c4ded64aabef8712f02adc8136c28390cd6706d21e30dbb484d99426ea8c0461a6ec02c75913c2d0a966d863ae8bb58b7d0f9f7b58

data/README.md

@@ -246,11 +246,23 @@ the `host` option, as well as `region`, etc.
 
 The `exists?` method uses a head request to verify existence, so it doesn't actually download the file.
 
-All files will be created as public.
+All files will be created as public by default, but you can set an additional argument when initializing the storage to
+declare options to be used when creating files to S3, and those options will take precedence. Use this for example to
+set an expiration time for the asset. Example:
+
+```
+Saviour::Config.storage = Saviour::S3Storage.new(
+  bucket: "my-bucket-name",
+  aws_access_key_id: "stub",
+  aws_secret_access_key: "stub",
+  create_options: {public: false, 'Cache-Control' => 'max-age=31536000'}
+)
+```
 
 This storage includes a feature of overwrite protection, raising an exception if an attempt is made of writing something
 on a path that already exists. This behaviour in enabled by default, but you can turn it off by passing an additional
-argument when instantiating the storage: `overwrite_protection: false`.
+argument when instantiating the storage: `overwrite_protection: false`. This feature requires an additional HEAD request
+to verify existence for every write.
 
 
 ## Source abstraction

data/lib/saviour/s3_storage.rb

@@ -5,6 +5,7 @@ module Saviour
       @public_url_prefix = conf.delete(:public_url_prefix)
       @conf = conf
       @overwrite_protection = conf.delete(:overwrite_protection) { true }
+      @create_options = conf.delete(:create_options) { {} }
       assert_directory_exists!
     end
 
@@ -12,10 +13,11 @@ module Saviour
       raise(RuntimeError, "The path you're trying to write already exists!") if @overwrite_protection && exists?(path)
 
       path = sanitize_leading_slash(path)
-      directory.files.create(
-          key: path,
-          body: contents,
-          public: true
+      directory.files.create({
+                                 key: path,
+                                 body: contents,
+                                 public: true
+                             }.merge(@create_options)
       )
     end
 

data/lib/saviour/version.rb

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

data/spec/models/s3_storage_spec.rb

@@ -76,6 +76,19 @@ describe Saviour::S3Storage do
       expect(subject.exists?("/folder/file.out")).to be_truthy
       expect(subject.exists?("////folder/file.out")).to be_truthy
     end
+
+    describe "fog create options" do
+      subject { Saviour::S3Storage.new(bucket: "fake-bucket", aws_access_key_id: "stub", aws_secret_access_key: "stub", public_url_prefix: "https://fake-bucket.s3.amazonaws.com", create_options: {'Cache-Control' => 'max-age=31536000'}) }
+
+      it "uses passed options to create new files in S3" do
+        with_test_file("camaloon.jpg") do |file, _|
+          contents = file.read
+          subject.write(contents, destination_path)
+          file_data = mocked_s3.head(destination_path)
+          expect(file_data.cache_control).to eq "max-age=31536000"
+        end
+      end
+    end
   end
 
   describe "#read" do

data/spec/spec_helper.rb

@@ -33,6 +33,8 @@ RSpec.configure do |config|
       example.run
     }
   end
+
+  config.after { Fog::Mock.reset }
 end
 
 def with_tempfile(ext = ".jpg")
@@ -77,8 +79,12 @@ class MockedS3Helper
     directory.files.get(path).destroy
   end
 
+  def head(path)
+    directory.files.head(path)
+  end
+
   def exists?(path)
-    !!directory.files.head(path)
+    !!head(path)
   end
 
   def public_url(path)

metadata

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