dragonfly-s3_data_store 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4b096e174cc3386bcdb840d6f942b94f8cbb6d
-  data.tar.gz: d11b8ef53ce003bf73b24c0db94c70a5fd0e5684
+  metadata.gz: 0d0b5dfd4515b32b598c7638932ac8f39f4b47c8
+  data.tar.gz: ca1cabb75ddd830e74b1486bff88d88cc405ef4b
 SHA512:
-  metadata.gz: 19319c9981cf83aed2f8147b568535afbc35de43c405ee2148e283b375870a9dc5d414085ad1b1679934e011988027fc2c20455b1485cb130ada64b16eac0e09
-  data.tar.gz: 81ee661b5d3c8a0fe7d6f39da1e8cd1c4ba59c9b36ed1c6ee9cd0a14008c27d87667870d70e98625b99ba43d5b154a5f2721defbc1bbbda646cc3f2331fd54a8
+  metadata.gz: 00c60f985a4fa8bff4b15b89446a86cf8770395724345cccc07f947e752339a03fe87d662f69f4cdf6777fa1dc565246ab52a17d185a9b0135d95633d62be05c
+  data.tar.gz: 876ba3537e4ba0a6e0f7cfc4bdcbbc8c241f338c5e9b141e8f70f10f217112dfcefa26e14e1b2480b8d0f4cfa93620fbac90ce53b0b44b8da530d9484e8cbdba

data/README.md

@@ -34,7 +34,7 @@ end
 :region               # default 'us-east-1', see Dragonfly::S3DataStore::REGIONS for options
 :storage_headers      # defaults to {'x-amz-acl' => 'public-read'}, can be overridden per-write - see below
 :url_scheme           # defaults to "http"
-:url_host             # defaults to "<bucket-name>.s3.amazonaws.com"
+: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
 ```
 

data/lib/dragonfly/s3_data_store.rb

@@ -20,6 +20,8 @@ module Dragonfly
       'sa-east-1' => 's3-sa-east-1.amazonaws.com'
     }
 
+    SUBDOMAIN_PATTERN = /^[a-z0-9][a-z0-9.-]+[a-z0-9]$/
+
     def initialize(opts={})
       @bucket_name       = opts[:bucket_name]
       @access_key_id     = opts[:access_key_id]
@@ -69,7 +71,9 @@ module Dragonfly
         storage.get_object_https_url(bucket_name, uid, opts[:expires])
       else
         scheme = opts[:scheme] || url_scheme
-        host   = opts[:host]   || url_host || "#{bucket_name}.s3.amazonaws.com"
+        host   = opts[:host]   || url_host || (
+          bucket_name =~ SUBDOMAIN_PATTERN ? "#{bucket_name}.s3.amazonaws.com" : "s3.amazonaws.com/#{bucket_name}"
+        )
         "#{scheme}://#{host}/#{uid}"
       end
     end

data/lib/dragonfly/s3_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
-  module S3DataStore
-    VERSION = "1.0.0"
+  class S3DataStore
+    VERSION = "1.0.1"
   end
 end

data/spec/s3_data_store_spec.rb

@@ -234,6 +234,12 @@ describe Dragonfly::S3DataStore do
       @data_store.url_for(@uid).should == "http://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
     end
 
+    it "should use path style if the bucket is not a valid S3 subdomain" do
+      bucket_name = BUCKET_NAME.upcase
+      @data_store.bucket_name = bucket_name
+      @data_store.url_for(@uid).should == "http://s3.amazonaws.com/#{bucket_name}/some/path/on/s3"
+    end
+
     it "should use the bucket subdomain for other regions too" do
       @data_store.region = 'eu-west-1'
       @data_store.url_for(@uid).should == "http://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
@@ -241,7 +247,7 @@ 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\?AWSAccessKeyId=#{@data_store.access_key_id}&Signature=[\w%]+&Expires=1301476942$}
+        %r{^https://#{BUCKET_NAME}\.#{@data_store.domain}/some/path/on/s3\?AWSAccessKeyId=#{@data_store.access_key_id}&Signature=[\w%/]+&Expires=1301476942$}
     end
 
     it "should allow for using https" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-s3_data_store
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly