dragonfly-s3_data_store 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db0a53665e761115c7791d464ec6f88c8d19e64
-  data.tar.gz: a8cbd2bbc9fa864f7c88fc1329f94f9d46c57816
+  metadata.gz: 7958747f8087147274b566b9a03b588016e1951c
+  data.tar.gz: baf40e36ace3f506553d1c227bfdae3e53a705ac
 SHA512:
-  metadata.gz: b195b31ba392d8cd217333e0428211bbcc6c96910564c92650ca0bdf67f4363e31513d4fdb17d9378bb4dffaf307322667b0f2010c7b3dd3827b1019e8d5dc4c
-  data.tar.gz: e2f60e2b217bc400b901c95cee0234b6ac20ce8619877f29cc7c8029b85ed98d632f34a507023760240dc1b2e607b9a0756c6dcef938cf6f5039f4f654f78c94
+  metadata.gz: 3a5a60312800230e4dcacd84486003e61114fab36c7a2922f28097f260dee1917b5f5f37de8fe930e32e12dcd298b56ebc65a079d1dba7f5134b72f1100f8763
+  data.tar.gz: 6b8c30b5863c92c0485f91f4d4b492149e559525a990b9cd44473e610fe2bb63158022327e7d8c8df2e45ba87afd8371bd6c663a665b3822a6a91ad254d84336

data/README.md

@@ -9,10 +9,11 @@ gem 'dragonfly-s3_data_store'
 ```
 
 ## Usage
-
-In your dragonfly config block (with default options):
+Configuration (remember the require)
 
 ```ruby
+require 'dragonfly/s3_data_store'
+
 Dragonfly.app.configure do
   # ...
 
@@ -36,6 +37,7 @@ end
 :url_scheme           # defaults to "http"
 :url_host             # defaults to "<bucket-name>.s3.amazonaws.com", or "s3.amazonaws.com/<bucket-name>" if not a valid subdomain
 :use_iam_profile      # boolean - if true, no need for access_key_id or secret_access_key
+:root_path            # store all content under a subdirectory - uids will be relative to this - defaults to nil
 ```
 
 ### Per-storage options
@@ -48,8 +50,12 @@ or
 ```ruby
 class MyModel
   dragonfly_accessor :photo do
-    storage_path { "some/path/#{some_instance_method}/#{rand(100)}" }
-    storage_headers { {"x-amz-acl" => "public-read-write"} }
+    storage_options do |attachment|
+      {
+        path: "some/path/#{some_instance_method}/#{rand(100)}",
+        headers: {"x-amz-acl" => "public-read-write"}
+      }
+    end
   end
 end
 ```

data/lib/dragonfly/s3_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   class S3DataStore
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/dragonfly/s3_data_store.rb

@@ -31,9 +31,10 @@ module Dragonfly
       @url_scheme        = opts[:url_scheme] || 'http'
       @url_host          = opts[:url_host]
       @use_iam_profile   = opts[:use_iam_profile]
+      @root_path         = opts[:root_path]
     end
 
-    attr_accessor :bucket_name, :access_key_id, :secret_access_key, :region, :storage_headers, :url_scheme, :url_host, :use_iam_profile
+    attr_accessor :bucket_name, :access_key_id, :secret_access_key, :region, :storage_headers, :url_scheme, :url_host, :use_iam_profile, :root_path
 
     def write(content, opts={})
       ensure_configured
@@ -45,7 +46,7 @@ module Dragonfly
 
       rescuing_socket_errors do
         content.file do |f|
-          storage.put_object(bucket_name, uid, f, full_storage_headers(headers, content.meta))
+          storage.put_object(bucket_name, full_path(uid), f, full_storage_headers(headers, content.meta))
         end
       end
 
@@ -54,27 +55,27 @@ module Dragonfly
 
     def read(uid)
       ensure_configured
-      response = rescuing_socket_errors{ storage.get_object(bucket_name, uid) }
+      response = rescuing_socket_errors{ storage.get_object(bucket_name, full_path(uid)) }
       [response.body, headers_to_meta(response.headers)]
     rescue Excon::Errors::NotFound => e
       nil
     end
 
     def destroy(uid)
-      rescuing_socket_errors{ storage.delete_object(bucket_name, uid) }
+      rescuing_socket_errors{ storage.delete_object(bucket_name, full_path(uid)) }
     rescue Excon::Errors::NotFound, Excon::Errors::Conflict => e
       Dragonfly.warn("#{self.class.name} destroy error: #{e}")
     end
 
     def url_for(uid, opts={})
-      if opts && opts[:expires]
-        storage.get_object_https_url(bucket_name, uid, opts[:expires])
+      if opts[:expires]
+        storage.get_object_https_url(bucket_name, full_path(uid), opts[:expires])
       else
         scheme = opts[:scheme] || url_scheme
         host   = opts[:host]   || url_host || (
           bucket_name =~ SUBDOMAIN_PATTERN ? "#{bucket_name}.s3.amazonaws.com" : "s3.amazonaws.com/#{bucket_name}"
         )
-        "#{scheme}://#{host}/#{uid}"
+        "#{scheme}://#{host}/#{full_path(uid)}"
       end
     end
 
@@ -135,6 +136,10 @@ module Dragonfly
       "#{Time.now.strftime '%Y/%m/%d/%H/%M/%S'}/#{rand(1000)}/#{name.gsub(/[^\w.]+/, '_')}"
     end
 
+    def full_path(uid)
+      File.join *[root_path, uid].compact
+    end
+
     def full_storage_headers(headers, meta)
       storage_headers.merge(meta_to_headers(meta)).merge(headers)
     end
@@ -165,4 +170,3 @@ module Dragonfly
 
   end
 end
-

data/spec/s3_data_store_spec.rb

@@ -165,7 +165,51 @@ describe Dragonfly::S3DataStore do
         expect{ @data_store.write(content) }.not_to raise_error
       end
     end
+  end
+
+  describe "root_path" do
+    before do
+      content.name = "something.png"
+      @data_store.root_path = "some/path"
+    end
+
+    it "stores files in the provided sub directory" do
+      @data_store.storage.should_receive(:put_object).with(BUCKET_NAME, /^some\/path\/.*\/something\.png$/, anything, anything)
+      @data_store.write(content)
+    end
 
+    it "finds files in the provided sub directory" do
+      mock_response = double("response", body: "", headers: {})
+      uid = @data_store.write(content)
+      @data_store.storage.should_receive(:get_object).with(BUCKET_NAME, /^some\/path\/.*\/something\.png$/).and_return(mock_response)
+      @data_store.read(uid)
+    end
+
+    it "does not alter the uid" do
+      uid = @data_store.write(content)
+      uid.should include("something.png")
+      uid.should_not include("some/path")
+    end
+
+    it "destroys files in the provided sub directory" do
+      uid = @data_store.write(content)
+      @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\?AWSAccessKeyId=/
+      end
+    end
   end
 
   describe "autocreating the bucket" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-s3_data_store
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly