s33r 0.5.4 → 0.5.5

data/lib/s33r/utility.rb

@@ -368,9 +368,9 @@ module S33r
   # Note that if a :path option is not set, a path is generated from any :bucket and/or :path 
   # parameters supplied.
   def s3_public_url(options)
+    options[:use_ssl] = false if options[:subdomain]
     scheme = options[:use_ssl] ? 'https' : 'http'
-    path = options[:path]
-    path ||= s3_path(options)
+    path = options[:path] || s3_path(options)
     host = HOST
     host = (options[:bucket] + "." + host ) if options[:subdomain] and options[:bucket]
     "#{scheme}://" + host + path

data/test/cases/spec_utility.rb

@@ -39,7 +39,6 @@ context 'S33r utility' do
     @correct_public_url = "http://s3.amazonaws.com/quotes/nelson"
     @correct_public_ssl_url = "https://s3.amazonaws.com/quotes/nelson"
     @correct_public_url_with_subdomain = "http://quotes.s3.amazonaws.com/nelson"
-    @correct_public_url_with_ssl_and_subdomain = "https://quotes.s3.amazonaws.com/nelson"
     @correct_public_url_without_key = "http://s3.amazonaws.com/quotes/"
     @correct_logging_url = "http://s3.amazonaws.com/quotes/?logging"
     @correct_acl_url = "http://s3.amazonaws.com/quotes/?acl"
@@ -195,7 +194,7 @@ context 'S33r utility' do
     s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true).should == \
     @correct_public_url_with_subdomain
     s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true, :use_ssl => true).should == \
-    @correct_public_url_with_ssl_and_subdomain
+    @correct_public_url_with_subdomain
   end
   
   specify 'should generate URLs for buckets without keys' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s33r
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Elliot Smith
@@ -9,7 +9,7 @@ autorequire: s33r
 bindir: bin
 cert_chain: []
 
-date: 2008-06-14 00:00:00 +01:00
+date: 2008-06-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency