Skip to content

P
paperclip
Commit a1281bee by Prem Sichanugrist
Options

Revert "[#940] Raise error when style defined & not in path" 

Reverting this for now. This commit would better be in a minor release,
since it break everyone's application. Going to reopen the ticket and
mark it to be merged in next minor release.

This reverts commit b7b2b843.
parent 6a0124b9
Showing with 11 additions and 37 deletions
lib/paperclip/attachment.rb
......@@ -77,7 +77,6 @@ module Paperclip
@source_file_options = options[:source_file_options]
@whiny = options[:whiny]
initialize_path
initialize_storage
end
......@@ -359,17 +358,6 @@ module Paperclip
file.nil? || (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
end
def initialize_path
if style_not_in_custom_path?
raise(Paperclip::Errors::StyleTokenNotFound)
end
end
def style_not_in_custom_path?
@options[:path] != Paperclip::Attachment.default_options[:path] &&
@options[:styles].present? && !@options[:path].include?(':style')
end
def initialize_storage #:nodoc:
storage_class_name = @options[:storage].to_s.downcase.camelize
begin
......
lib/paperclip/errors.rb
......@@ -9,11 +9,6 @@ module Paperclip
class StorageMethodNotFound < Paperclip::Error
end
# Will be thrown when there are custom styles and those styles aren't
# included in the path
class StyleTokenNotFound < Paperclip::Error
end
# Will be thrown when a command or executable is not found.
class CommandNotFoundError < Paperclip::Error
end
......
test/attachment_test.rb
......@@ -309,7 +309,7 @@ class AttachmentTest < Test::Unit::TestCase
context "An attachment with a default style and an extension interpolation" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => { :default => ["100x100", :png] },
:default_style => :default
@file = StringIO.new("...")
......@@ -317,7 +317,7 @@ class AttachmentTest < Test::Unit::TestCase
end
should "return the right extension for the path" do
@attachment.assign(@file)
assert_equal "default_file.png", @attachment.path
assert_equal "file.png", @attachment.path
end
end
......
test/storage/s3_test.rb
......@@ -243,7 +243,7 @@ class S3Test < Test::Unit::TestCase
rebuild_model :styles => { :large => ['500x500#', :jpg] },
:storage => :s3,
:bucket => "bucket",
:path => ":attachment/:style/:basename.:extension",
:path => ":attachment/:basename.:extension",
:s3_credentials => {
'access_key_id' => "12345",
'secret_access_key' => "54321"
......
test/style_test.rb
......@@ -5,7 +5,7 @@ class StyleTest < Test::Unit::TestCase
context "A style rule" do
setup do
@attachment = attachment :path => ":basename_:style.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => { :foo => {:geometry => "100x100#", :format => :png} },
:whiny => true
@style = @attachment.styles[:foo]
......@@ -33,18 +33,9 @@ class StyleTest < Test::Unit::TestCase
end
end
context "A path not containing a style rule" do
should "generate a warning when a :style token isn't found" do
assert_raises(Paperclip::Errors::StyleTokenNotFound) do
@attachment = attachment :path => ":basename_:extension",
:styles => { :foo => {:geometry => "100x100#", :format => :png} }
end
end
end
context "A style rule with properties supplied as procs" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:whiny_thumbnails => true,
:processors => lambda {|a| [:test]},
:styles => {
......@@ -73,7 +64,7 @@ class StyleTest < Test::Unit::TestCase
styles[:aslist] = ["100x100", :png]
styles[:ashash] = {:geometry => "100x100", :format => :png}
styles[:asstring] = "100x100"
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => styles
end
should "have the right number of styles" do
......@@ -106,7 +97,7 @@ class StyleTest < Test::Unit::TestCase
context "An attachment with :convert_options" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => {:thumb => "100x100", :large => "400x400"},
:convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
@style = @attachment.styles[:thumb]
......@@ -126,7 +117,7 @@ class StyleTest < Test::Unit::TestCase
context "An attachment with :source_file_options" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => {:thumb => "100x100", :large => "400x400"},
:source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
@style = @attachment.styles[:thumb]
......@@ -146,7 +137,7 @@ class StyleTest < Test::Unit::TestCase
context "A style rule with its own :processors" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => {
:foo => {
:geometry => "100x100#",
......@@ -171,7 +162,7 @@ class StyleTest < Test::Unit::TestCase
context "A style rule with :processors supplied as procs" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => {
:foo => {
:geometry => "100x100#",
......@@ -193,7 +184,7 @@ class StyleTest < Test::Unit::TestCase
context "An attachment with :convert_options and :source_file_options in :styles" do
setup do
@attachment = attachment :path => ":style_:basename.:extension",
@attachment = attachment :path => ":basename.:extension",
:styles => {
:thumb => "100x100",
:large => {:geometry => "400x400",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment