paperclip 2.7.4 → 2.7.5

data/NEWS

@@ -1,3 +1,22 @@
+New in 2.7.5:
+
+* Feature: :s3_host_name can be a proc
+
+New in 2.7.4:
+
+* Feature: Allow :escape_url as an option in the defaults
+* Bug fix: Correcting some PATH-based tests.
+* Compatability: Cucumber tests work for Rails 3.2.8
+
+New in 2.7.2
+
+* Bug fix: Ensured the correct cocaine version.
+* Bug fix: Fixed some tests that shouldn't have been passing.
+
+New in 2.7.1:
+
+* Bug fix: Fixed the problem with E2BIG errors and an ever-expanding path
+
 New in 2.7.0:
 
 * Bug fix: Checking the existence of a file on S3 handles all AWS errors.

data/lib/paperclip/storage/s3.rb

@@ -150,7 +150,10 @@ module Paperclip
       end
 
       def s3_host_name
-        @options[:s3_host_name] || s3_credentials[:s3_host_name] || "s3.amazonaws.com"
+        host_name = @options[:s3_host_name]
+        host_name = host_name.call(self) if host_name.is_a?(Proc)
+
+        host_name || s3_credentials[:s3_host_name] || "s3.amazonaws.com"
       end
 
       def s3_host_alias

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.7.4" unless defined? Paperclip::VERSION
+  VERSION = "2.7.5" unless defined? Paperclip::VERSION
 end

data/test/storage/s3_test.rb

@@ -176,6 +176,26 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "dynamic s3_host_name" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension",
+                    :s3_host_name => lambda {|a| a.instance.value }
+      @dummy = Dummy.new
+      class << @dummy
+        attr_accessor :value
+      end
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "use s3_host_name as a proc if available" do
+      @dummy.value = "s3.something.com"
+      assert_equal "http://s3.something.com/bucket/avatars/stringio.txt", @dummy.avatar.url(:original, :timestamp => false)
+    end
+  end
+
   context "An attachment that uses S3 for storage and has styles that return different file types" do
     setup do
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord