Permalink
Browse files

Merge branch 'stest' of https://github.com/asanghi/paperclip

  • Loading branch information...
2 parents 4d843c9 + e15648c commit 59e52b70c9438ea65d9cef99fe33e934bfa89643 @mike-burns mike-burns committed Jun 30, 2011
Showing with 11 additions and 8 deletions.
  1. +2 −2 lib/paperclip/attachment.rb
  2. +9 −6 test/style_test.rb
@@ -67,7 +67,7 @@ def initialize name, instance, options = {}
def styles
if @styles.respond_to?(:call) || !@normalized_styles
- @normalized_styles = {}
+ @normalized_styles = ActiveSupport::OrderedHash.new
(@styles.respond_to?(:call) ? @styles.call(self) : @styles).each do |name, args|
@normalized_styles[name] = Paperclip::Style.new(name, args.dup, self)
end
@@ -275,7 +275,7 @@ def reprocess!(*style_args)
def file?
!original_filename.blank?
end
-
+
alias :present? :file?
# Writes the attachment-specific attribute on the instance. For example,
View
@@ -62,12 +62,12 @@ class StyleTest < Test::Unit::TestCase
context "An attachment with style rules in various forms" do
setup do
+ styles = ActiveSupport::OrderedHash.new
+ styles[:aslist] = ["100x100", :png]
+ styles[:ashash] = {:geometry => "100x100", :format => :png}
+ styles[:asstring] = "100x100"
@attachment = attachment :path => ":basename.:extension",
- :styles => {
- :aslist => ["100x100", :png],
- :ashash => {:geometry => "100x100", :format => :png},
- :asstring => "100x100"
- }
+ :styles => styles
end
should "have the right number of styles" do
assert_kind_of Hash, @attachment.styles
@@ -92,6 +92,9 @@ class StyleTest < Test::Unit::TestCase
assert_nil @attachment.styles[:asstring].format
end
+ should "retain order" do
+ assert_equal [:aslist, :ashash, :asstring], @attachment.styles.keys
+ end
end
context "An attachment with :convert_options" do
@@ -138,7 +141,7 @@ class StyleTest < Test::Unit::TestCase
end
end
-
+
context "A style rule with :processors supplied as procs" do
setup do
@attachment = attachment :path => ":basename.:extension",

0 comments on commit 59e52b7

Please sign in to comment.