dragonfly-s3_data_store 1.1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 350d8e976a1a0035972b02a7f024d982abd176e4
-  data.tar.gz: 1730399277815a8dce6feb6a89ed280cea18ad90
+  metadata.gz: 768cec2575b167242c6c5bf6b02313d61add3dbe
+  data.tar.gz: dfa4bc29b433f342556df40ba346a4967b915265
 SHA512:
-  metadata.gz: d1708908b4b45d4fcbf5530a1056afe69921a3ef421b3482eb2efb16e921e354a29919395a16b5d347a0fbad43131cf941a90586bf031ab4c420816506a60c36
-  data.tar.gz: 84e28e6bd5f589c4f41ca2f65db364f8bdd5cc9feaeb002cb814625d6dc343d9f658376aefda1d8604d2e047b808078ee33deab946d0f0fc86da15736c17066f
+  metadata.gz: 12c5156cd14a58c7feeeb580cd4d79125071a9bf543df232828c88a6c4e3c5351587aa8d0dfc1a386cbbedf77eadebef2df379820322ef3e9a5b570f322cbd1a
+  data.tar.gz: 3dd4be70964435582b15ff3bd2fe15f06e28383dd6e974b63cfb4002639bda5385b0d13ccf83a5e2320afda29fedf92faa958b6a3f2b5780f240ad6ad5f0a814

data/README.md

@@ -2,6 +2,11 @@
 
 Amazon AWS S3 data store for use with the [Dragonfly](http://github.com/markevans/dragonfly) gem.
 
+**NOTE:** version 1.2 saves files into a different directory structure, e.g. '2015/08/03/5bccfdd8-0de2-4efc-b3f3-f4e96bcc4afa/file.png' rather than '2015/08/03/12/03/24/492/file.png'.
+
+However this does not affect any functionality and won't break any of your old content!
+It's just more robust.
+
 ## Gemfile
 
 ```ruby
@@ -43,7 +48,7 @@ end
 
 ### Per-storage options
 ```ruby
-Dragonfly.app.store(some_file, path: 'some/path.txt', headers: {'x-amz-acl' => 'public-read-write'})
+Dragonfly.app.store(some_file, {'some' => 'metadata'}, path: 'some/path.txt', headers: {'x-amz-acl' => 'public-read-write'})
 ```
 
 or
@@ -95,3 +100,9 @@ or with a custom host:
 ```ruby
 my_model.attachment.remote_url(host: 'custom.domain')   # also configurable for all urls with 'url_host'
 ```
+
+or with other query parameters (needs an expiry):
+
+```ruby
+my_model.attachment.remote_url(expires: 3.days.from_now, query: {'response-content-disposition' => 'attachment'})  # URL that downloads the file
+```

data/lib/dragonfly/s3_data_store.rb

@@ -1,6 +1,7 @@
 require 'fog/aws'
 require 'dragonfly'
 require 'cgi'
+require 'securerandom'
 
 Dragonfly::App.register_datastore(:s3){ Dragonfly::S3DataStore }
 
@@ -71,8 +72,8 @@ module Dragonfly
     end
 
     def url_for(uid, opts={})
-      if opts[:expires]
-        storage.get_object_https_url(bucket_name, full_path(uid), opts[:expires])
+      if expires = opts[:expires]
+        storage.get_object_https_url(bucket_name, full_path(uid), expires, {:query => opts[:query]})
       else
         scheme = opts[:scheme] || url_scheme
         host   = opts[:host]   || url_host || (
@@ -136,7 +137,7 @@ module Dragonfly
     end
 
     def generate_uid(name)
-      "#{Time.now.strftime '%Y/%m/%d/%H/%M/%S'}/#{rand(1000)}/#{name}"
+      "#{Time.now.strftime '%Y/%m/%d/%H/%M/%S'}/#{SecureRandom.uuid}/#{name}"
     end
 
     def full_path(uid)

data/lib/dragonfly/s3_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   class S3DataStore
-    VERSION = "1.1.1"
+    VERSION = "1.2"
   end
 end

data/spec/s3_data_store_spec.rb

@@ -196,20 +196,6 @@ describe Dragonfly::S3DataStore do
       @data_store.storage.should_receive(:delete_object).with(BUCKET_NAME, /^some\/path\/.*\/something\.png$/)
       @data_store.destroy(uid)
     end
-
-    describe "url_for" do
-      before do
-        @uid = @data_store.write(content)
-      end
-
-      it "returns the uid prefixed with the root_path" do
-        @data_store.url_for(@uid).should =~ /some\/path\/.*\/something\.png/
-      end
-
-      it "gives an expiring url" do
-        @data_store.url_for(@uid, :expires => 1301476942).should =~ /\/some\/path\/.*\/something\.png\?X-Amz-Expires=/
-      end
-    end
   end
 
   describe "autocreating the bucket" do
@@ -291,7 +277,12 @@ describe Dragonfly::S3DataStore do
 
     it "should give an expiring url" do
       @data_store.url_for(@uid, :expires => 1301476942).should =~
-        %r{^https://#{BUCKET_NAME}\.#{@data_store.domain}/some/path/on/s3\?X-Amz-Expires=}
+        %r{^https://#{BUCKET_NAME}\.#{@data_store.domain}/some/path/on/s3\?.*X-Amz-Expires=}
+    end
+
+    it "should add query params" do
+      @data_store.url_for(@uid, :expires => 1301476942, :query => {'response-content-disposition' => 'attachment'}).should =~
+        %r{^https://#{BUCKET_NAME}\.#{@data_store.domain}/some/path/on/s3\?.*response-content-disposition=attachment}
     end
 
     it "should allow for using https" do
@@ -342,12 +333,13 @@ describe Dragonfly::S3DataStore do
 
   describe "fog_storage_options" do
     it "adds options to Fog::Storage object" do
+      allow(Fog::Storage).to receive(:new).and_call_original
       @data_store.fog_storage_options = {:random_option => 'look at me!'}
-      Fog::Storage.should_receive(:new).with do |hash|
-        hash[:random_option].should == 'look at me!'
-        hash[:aws_access_key_id].should match /\w+/
-      end.and_call_original
       @data_store.storage
+      expect(Fog::Storage).to have_received(:new).with(hash_including(
+        :random_option => 'look at me!',
+        :aws_access_key_id => anything
+      ))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-s3_data_store
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: '1.2'
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly