paperclip 2.4.5 → 2.5.0

data/test/style_test.rb

@@ -8,7 +8,7 @@ class StyleTest < Test::Unit::TestCase
       @attachment = attachment :path => ":basename.:extension",
                                :styles => { :foo => {:geometry => "100x100#", :format => :png} },
                                :whiny => true
-      @style = @attachment.options.styles[:foo]
+      @style = @attachment.styles[:foo]
     end
 
     should "be held as a Style object" do
@@ -41,16 +41,20 @@ class StyleTest < Test::Unit::TestCase
                                :styles => {
                                  :foo => lambda{|a| "300x300#"},
                                  :bar => {
-                                   :geometry => lambda{|a| "300x300#"}
+                                   :geometry => lambda{|a| "300x300#"},
+                                   :convert_options => lambda{|a| "-do_stuff"},
+                                   :source_file_options => lambda{|a| "-do_extra_stuff"}
                                  }
                                }
     end
 
     should "call procs when they are needed" do
-      assert_equal "300x300#", @attachment.options.styles[:foo].geometry
-      assert_equal "300x300#", @attachment.options.styles[:bar].geometry
-      assert_equal [:test], @attachment.options.styles[:foo].processors
-      assert_equal [:test], @attachment.options.styles[:bar].processors
+      assert_equal "300x300#", @attachment.styles[:foo].geometry
+      assert_equal "300x300#", @attachment.styles[:bar].geometry
+      assert_equal [:test], @attachment.styles[:foo].processors
+      assert_equal [:test], @attachment.styles[:bar].processors
+      assert_equal "-do_stuff", @attachment.styles[:bar].convert_options
+      assert_equal "-do_extra_stuff", @attachment.styles[:bar].source_file_options
     end
   end
 
@@ -64,30 +68,30 @@ class StyleTest < Test::Unit::TestCase
                                :styles => styles
     end
     should "have the right number of styles" do
-      assert_kind_of Hash, @attachment.options.styles
-      assert_equal 3, @attachment.options.styles.size
+      assert_kind_of Hash, @attachment.styles
+      assert_equal 3, @attachment.styles.size
     end
 
     should "have styles as Style objects" do
       [:aslist, :ashash, :aslist].each do |s|
-        assert_kind_of Paperclip::Style, @attachment.options.styles[s]
+        assert_kind_of Paperclip::Style, @attachment.styles[s]
       end
     end
 
     should "have the right geometries" do
       [:aslist, :ashash, :aslist].each do |s|
-        assert_equal @attachment.options.styles[s].geometry, "100x100"
+        assert_equal @attachment.styles[s].geometry, "100x100"
       end
     end
 
     should "have the right formats" do
-      assert_equal @attachment.options.styles[:aslist].format, :png
-      assert_equal @attachment.options.styles[:ashash].format, :png
-      assert_nil @attachment.options.styles[:asstring].format
+      assert_equal @attachment.styles[:aslist].format, :png
+      assert_equal @attachment.styles[:ashash].format, :png
+      assert_nil @attachment.styles[:asstring].format
     end
 
     should "retain order" do
-      assert_equal [:aslist, :ashash, :asstring], @attachment.options.styles.keys
+      assert_equal [:aslist, :ashash, :asstring], @attachment.styles.keys
     end
   end
 
@@ -96,7 +100,7 @@ class StyleTest < Test::Unit::TestCase
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
-      @style = @attachment.options.styles[:thumb]
+      @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
@@ -107,7 +111,7 @@ class StyleTest < Test::Unit::TestCase
 
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment.expects(:extra_options_for).with(:thumb)
-      @attachment.options.styles[:thumb].convert_options
+      @attachment.styles[:thumb].convert_options
     end
   end
 
@@ -116,7 +120,7 @@ class StyleTest < Test::Unit::TestCase
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
-      @style = @attachment.options.styles[:thumb]
+      @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
@@ -127,7 +131,7 @@ class StyleTest < Test::Unit::TestCase
 
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment.expects(:extra_source_file_options_for).with(:thumb)
-      @attachment.options.styles[:thumb].source_file_options
+      @attachment.styles[:thumb].source_file_options
     end
   end
 
@@ -142,7 +146,7 @@ class StyleTest < Test::Unit::TestCase
                                   }
                                 },
                                :processors => [:thumbnail]
-      @style = @attachment.options.styles[:foo]
+      @style = @attachment.styles[:foo]
     end
 
     should "not get processors from the attachment" do
@@ -170,11 +174,36 @@ class StyleTest < Test::Unit::TestCase
     end
 
     should "defer processing of procs until they are needed" do
-      assert_kind_of Proc, @attachment.options.styles[:foo].instance_variable_get("@processors")
+      assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@processors")
     end
 
     should "call procs when they are needed" do
-      assert_equal [:test], @attachment.options.styles[:foo].processors
+      assert_equal [:test], @attachment.styles[:foo].processors
+    end
+  end
+
+  context "An attachment with :convert_options and :source_file_options in :styles" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {
+                                 :thumb => "100x100",
+                                 :large => {:geometry => "400x400",
+                                            :convert_options => "-do_stuff",
+                                            :source_file_options => "-do_extra_stuff"
+                                 }
+                               }
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+    end
+
+    should "have empty options for :thumb style" do
+      assert_equal "", @attachment.styles[:thumb].processor_options[:convert_options]
+      assert_equal "", @attachment.styles[:thumb].processor_options[:source_file_options]
+    end
+
+    should "have the right options for :large style" do
+      assert_equal "-do_stuff", @attachment.styles[:large].processor_options[:convert_options]
+      assert_equal "-do_extra_stuff", @attachment.styles[:large].processor_options[:source_file_options]
     end
   end
 end

data/test/support/mock_attachment.rb

@@ -0,0 +1,22 @@
+class MockAttachment
+  attr_accessor :updated_at, :original_filename
+
+  def initialize(options = {})
+    @model = options[:model]
+    @responds_to_updated_at = options[:responds_to_updated_at]
+    @updated_at = options[:updated_at]
+    @original_filename = options[:original_filename]
+  end
+
+  def instance
+    @model
+  end
+
+  def respond_to?(meth)
+    if meth.to_s == "updated_at"
+      @responds_to_updated_at || @updated_at
+    else
+      super
+    end
+  end
+end

data/test/support/mock_interpolator.rb

@@ -0,0 +1,24 @@
+class MockInterpolator
+  def initialize(options = {})
+    @options = options
+  end
+
+  def interpolate(pattern, attachment, style_name)
+    @interpolated_pattern = pattern
+    @interpolated_attachment = attachment
+    @interpolated_style_name = style_name
+    @options[:result]
+  end
+
+  def has_interpolated_pattern?(pattern)
+    @interpolated_pattern == pattern
+  end
+
+  def has_interpolated_style_name?(style_name)
+    @interpolated_style_name == style_name
+  end
+
+  def has_interpolated_attachment?(attachment)
+    @interpolated_attachment == attachment
+  end
+end

data/test/support/mock_model.rb

@@ -0,0 +1,2 @@
+class MockModel
+end

data/test/support/mock_url_generator_builder.rb

@@ -0,0 +1,27 @@
+class MockUrlGeneratorBuilder
+  def initializer
+  end
+
+  def new(attachment, attachment_options)
+    @attachment = attachment
+    @attachment_options = attachment_options
+    self
+  end
+
+  def for(style_name, options)
+    @generated_url_with_style_name = style_name
+    @generated_url_with_options = options
+    "hello"
+  end
+
+  def has_generated_url_with_options?(options)
+    # options.is_a_subhash_of(@generated_url_with_options)
+    options.inject(true) do |acc,(k,v)|
+      acc && @generated_url_with_options[k] == v
+    end
+  end
+
+  def has_generated_url_with_style_name?(style_name)
+    @generated_url_with_style_name == style_name
+  end
+end

data/test/url_generator_test.rb

@@ -0,0 +1,187 @@
+# encoding: utf-8
+require './test/helper'
+require 'paperclip/url_generator'
+
+class UrlGeneratorTest < Test::Unit::TestCase
+  should "use the given interpolator" do
+    expected = "the expected result"
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new(:result => expected)
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment,
+                                                { :interpolator => mock_interpolator })
+    result = url_generator.for(:style_name, {})
+
+    assert_equal expected, result
+    assert mock_interpolator.has_interpolated_attachment?(mock_attachment)
+    assert mock_interpolator.has_interpolated_style_name?(:style_name)
+  end
+
+  should "use the default URL when no file is assigned" do
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new
+    default_url = "the default url"
+    options = { :interpolator => mock_interpolator, :default_url => default_url}
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator.for(:style_name, {})
+
+    assert mock_interpolator.has_interpolated_pattern?(default_url),
+      "expected the interpolator to be passed #{default_url.inspect} but it wasn't"
+  end
+
+  should "execute the default URL lambda when no file is assigned" do
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new
+    default_url = lambda {|attachment| "the #{attachment.class.name} default url" }
+    options = { :interpolator => mock_interpolator, :default_url => default_url}
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator.for(:style_name, {})
+
+    assert mock_interpolator.has_interpolated_pattern?("the MockAttachment default url"),
+      %{expected the interpolator to be passed "the MockAttachment default url", but it wasn't}
+  end
+
+  should "execute the method named by the symbol as the default URL when no file is assigned" do
+    mock_model = MockModel.new
+    mock_attachment = MockAttachment.new(:model => mock_model)
+    mock_interpolator = MockInterpolator.new
+    default_url = :to_s
+    options = { :interpolator => mock_interpolator, :default_url => default_url}
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator.for(:style_name, {})
+
+    assert mock_interpolator.has_interpolated_pattern?(mock_model.to_s),
+      %{expected the interpolator to be passed #{mock_model.to_s}, but it wasn't}
+  end
+
+  should "URL-escape spaces if asked to" do
+    expected = "the expected result"
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    options = { :interpolator => mock_interpolator }
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:escape => true})
+
+    assert_equal "the%20expected%20result", result
+  end
+
+  should "escape the result of the interpolator using a method on the object, if asked to escape" do
+    expected = Class.new do
+      def escape
+        "the escaped result"
+      end
+    end.new
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:escape => true})
+
+    assert_equal "the escaped result", result
+  end
+
+  should "leave spaces unescaped as asked to" do
+    expected = "the expected result"
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:escape => false})
+
+    assert_equal "the expected result", result
+  end
+
+  should "default to leaving spaces unescaped" do
+    expected = "the expected result"
+    mock_attachment = MockAttachment.new
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {})
+
+    assert_equal "the expected result", result
+  end
+
+  should "produce URLs without the updated_at value when the object does not respond to updated_at" do
+    expected = "the expected result"
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    mock_attachment = MockAttachment.new(:responds_to_updated_at => false)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:timestamp => true})
+
+    assert_equal expected, result
+  end
+
+  should "produce URLs without the updated_at value when the updated_at value is nil" do
+    expected = "the expected result"
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    mock_attachment = MockAttachment.new(:responds_to_updated_at => true, :updated_at => nil)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:timestamp => true})
+
+    assert_equal expected, result
+  end
+
+  should "produce URLs with the updated_at when it exists" do
+    expected = "the expected result"
+    updated_at = 1231231234
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    mock_attachment = MockAttachment.new(:updated_at => updated_at)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:timestamp => true})
+
+    assert_equal "#{expected}?#{updated_at}", result
+  end
+
+  should "produce URLs with the updated_at when it exists, separated with a & if a ? follow by = already exists" do
+    expected = "the?expected=result"
+    updated_at = 1231231234
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    mock_attachment = MockAttachment.new(:updated_at => updated_at)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:timestamp => true})
+
+    assert_equal "#{expected}&#{updated_at}", result
+  end
+
+  should "produce URLs without the updated_at when told to do as much" do
+    expected = "the expected result"
+    updated_at = 1231231234
+    mock_interpolator = MockInterpolator.new(:result => expected)
+    mock_attachment = MockAttachment.new(:updated_at => updated_at)
+    options = { :interpolator => mock_interpolator}
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+
+    result = url_generator.for(:style_name, {:timestamp => false})
+
+    assert_equal expected, result
+  end
+
+  should "produce the correct URL when the instance has a file name" do
+    expected = "the expected result"
+    mock_attachment = MockAttachment.new(:original_filename => 'exists')
+    mock_interpolator = MockInterpolator.new
+    options = { :interpolator => mock_interpolator, :url => expected}
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator.for(:style_name, {})
+
+    assert mock_interpolator.has_interpolated_pattern?(expected),
+      "expected the interpolator to be passed #{expected.inspect} but it wasn't"
+  end
+end

metadata

@@ -1,175 +1,349 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: paperclip
-version: !ruby/object:Gem::Version
-  version: 2.4.5
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 2
+  - 5
+  - 0
+  version: 2.5.0
 platform: ruby
-authors:
+authors: 
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70180663783480 !ruby/object:Gem::Requirement
+
+date: 2012-01-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :runtime
   prerelease: false
-  version_requirements: *70180663783480
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70180663782680 !ruby/object:Gem::Requirement
+  name: activerecord
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
-  type: :runtime
   prerelease: false
-  version_requirements: *70180663782680
-- !ruby/object:Gem::Dependency
-  name: cocaine
-  requirement: &70180663782140 !ruby/object:Gem::Requirement
+  name: activesupport
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
+  prerelease: false
+  name: cocaine
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70180663782140
-- !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70180663781760 !ruby/object:Gem::Requirement
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70180663781760
-- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70180663781280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
   prerelease: false
-  version_requirements: *70180663781280
-- !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70180663780840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70180663780840
-- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70180663780420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: *70180663780420
-- !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: &70180663779980 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: aws-sdk
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
   prerelease: false
-  version_requirements: *70180663779980
-- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70180663779560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   prerelease: false
-  version_requirements: *70180663779560
-- !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70180663779140 !ruby/object:Gem::Requirement
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: aruba
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70180663779140
-- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70180663778720 !ruby/object:Gem::Requirement
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: bundler
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  prerelease: false
+  name: cocaine
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: fog
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: rake
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70180663778720
+  name: fakeweb
+  version_requirements: *id017
 description: Easy upload management for ActiveRecord
-email: jyurek@thoughtbot.com
+email: 
+- jyurek@thoughtbot.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- README.md
-files:
-- README.md
+
+extra_rdoc_files: []
+
+files: 
+- .gitignore
+- .travis.yml
+- Appraisals
+- CONTRIBUTING.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
+- NEWS
+- README.md
 - Rakefile
+- cucumber/paperclip_steps.rb
+- features/basic_integration.feature
+- features/rake_tasks.feature
+- features/step_definitions/attachment_steps.rb
+- features/step_definitions/html_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/s3_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/fakeweb.rb
+- features/support/fixtures/.boot_config.rb.swo
+- features/support/fixtures/boot_config.txt
+- features/support/fixtures/gemfile.txt
+- features/support/fixtures/preinitializer.txt
+- features/support/paths.rb
+- features/support/rails.rb
+- features/support/selectors.rb
+- gemfiles/rails2.gemfile
+- gemfiles/rails3.gemfile
+- gemfiles/rails3_1.gemfile
+- generators/paperclip/USAGE
+- generators/paperclip/paperclip_generator.rb
+- generators/paperclip/templates/paperclip_migration.rb.erb
 - init.rb
+- lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
-- lib/generators/paperclip/USAGE
+- lib/paperclip.rb
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatibility.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
+- lib/paperclip/matchers.rb
 - lib/paperclip/matchers/have_attached_file_matcher.rb
 - lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
 - lib/paperclip/matchers/validate_attachment_presence_matcher.rb
 - lib/paperclip/matchers/validate_attachment_size_matcher.rb
-- lib/paperclip/matchers.rb
 - lib/paperclip/missing_attachment_styles.rb
-- lib/paperclip/options.rb
 - lib/paperclip/processor.rb
 - lib/paperclip/railtie.rb
+- lib/paperclip/schema.rb
+- lib/paperclip/storage.rb
 - lib/paperclip/storage/filesystem.rb
 - lib/paperclip/storage/fog.rb
 - lib/paperclip/storage/s3.rb
-- lib/paperclip/storage.rb
 - lib/paperclip/style.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
+- lib/paperclip/url_generator.rb
 - lib/paperclip/version.rb
-- lib/paperclip.rb
 - lib/tasks/paperclip.rake
+- paperclip.gemspec
+- rails/init.rb
+- shoulda_macros/paperclip.rb
+- test/.gitignore
 - test/attachment_test.rb
 - test/database.yml
 - test/fixtures/12k.png
@@ -178,12 +352,12 @@ files:
 - test/fixtures/animated.gif
 - test/fixtures/bad.png
 - test/fixtures/fog.yml
+- test/fixtures/question?mark.png
 - test/fixtures/s3.yml
 - test/fixtures/spaced file.png
 - test/fixtures/text.txt
 - test/fixtures/twopage.pdf
 - test/fixtures/uppercase.PNG
-- test/fog_test.rb
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
@@ -193,46 +367,54 @@ files:
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
-- test/options_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
 - test/processor_test.rb
+- test/schema_test.rb
 - test/storage/filesystem_test.rb
+- test/storage/fog_test.rb
 - test/storage/s3_live_test.rb
 - test/storage/s3_test.rb
 - test/style_test.rb
+- test/support/mock_attachment.rb
+- test/support/mock_interpolator.rb
+- test/support/mock_model.rb
+- test/support/mock_url_generator_builder.rb
 - test/thumbnail_test.rb
 - test/upfile_test.rb
-- rails/init.rb
-- generators/paperclip/paperclip_generator.rb
-- generators/paperclip/templates/paperclip_migration.rb.erb
-- generators/paperclip/USAGE
-- shoulda_macros/paperclip.rb
+- test/url_generator_test.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-require_paths:
+rdoc_options: []
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []
+