paperclip 3.4.0 → 3.4.1

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -28,13 +28,13 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('activemodel', '>= 3.0.0')
   s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('cocaine', '~> 0.4.0')
+  s.add_dependency('cocaine', '~> 0.5.0')
   s.add_dependency('mime-types')
 
   s.add_development_dependency('shoulda')
   s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '>= 1.2.0')
+  s.add_development_dependency('aws-sdk', '>= 1.5.7')
   s.add_development_dependency('bourne')
   s.add_development_dependency('sqlite3', '~> 1.3.4')
   s.add_development_dependency('cucumber', '~> 1.2.1')
@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('nokogiri')
   s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
-  s.add_development_dependency('cocaine', '~> 0.2')
   s.add_development_dependency('fog', '>= 1.4.0', "< 1.7.0")
   s.add_development_dependency('pry')
   s.add_development_dependency('launchy')

data/test/attachment_test.rb

@@ -1207,6 +1207,13 @@ class AttachmentTest < Test::Unit::TestCase
         assert_equal creation.to_i, @dummy.avatar.created_at
         assert_not_equal now.to_i, @dummy.avatar.created_at
       end
+
+      should "set changed? to true on attachment assignment" do
+        @dummy.avatar = @file
+        @dummy.save!
+        @dummy.avatar = @file
+        assert @dummy.changed?
+      end
     end
 
     context "and avatar_updated_at column" do
@@ -1317,6 +1324,12 @@ class AttachmentTest < Test::Unit::TestCase
       assert_file_exists(@path)
     end
 
+    should "clear out attachment data when attachment is destroyed" do
+      @attachment.destroy
+      assert !@attachment.exists?
+      assert_nil @dummy.avatar_file_name
+    end
+
     should "not delete the file when model is destroyed" do
       @dummy.destroy
       assert_file_exists(@path)

data/test/io_adapters/attachment_adapter_test.rb

@@ -56,6 +56,31 @@ class AttachmentAdapterTest < Test::Unit::TestCase
 
   end
 
+  context "for a file with restricted characters in the name" do
+    setup do
+      file_contents = File.new(fixture_file("animated.gif"))
+      @file = StringIO.new(file_contents.read)
+      @file.stubs(:original_filename).returns('image:restricted.gif')
+      @file.binmode
+
+      @attachment.assign(@file)
+      @attachment.save
+      @subject = Paperclip.io_adapters.for(@attachment)
+    end
+
+    teardown do
+      @file.close
+    end
+
+    should "not generate paths that include restricted characters" do
+      assert_no_match /:/, @subject.path
+    end
+
+    should "not generate filenames that include restricted characters" do
+      assert_equal 'image_restricted.gif', @subject.original_filename
+    end
+  end
+
   context "for a style" do
     setup do
       @file = File.new(fixture_file("5k.png"))

data/test/io_adapters/file_adapter_test.rb

@@ -84,6 +84,25 @@ class FileAdapterTest < Test::Unit::TestCase
       end
     end
 
+    context "filename with restricted characters" do
+      setup do
+        file_contents = File.new(fixture_file("animated.gif"))
+        @file = StringIO.new(file_contents.read)
+        @file.stubs(:original_filename).returns('image:restricted.gif')
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      teardown { @file.close }
+
+      should "not generate filenames that include restricted characters" do
+        assert_equal 'image_restricted.gif', @subject.original_filename
+      end
+
+      should "not generate paths that include restricted characters" do
+        assert_no_match /:/, @subject.path
+      end
+    end
+
     context "empty file" do
       setup do
         @file = Tempfile.new("file_adapter_test")

data/test/io_adapters/stringio_adapter_test.rb

@@ -42,10 +42,20 @@ class StringioFileProxyTest < Test::Unit::TestCase
       assert_equal 'image/png', @subject.content_type
     end
 
-    should 'accept an orgiginal_filename' do
+    should 'accept an original_filename' do
       @subject.original_filename = 'image.png'
       assert_equal 'image.png', @subject.original_filename
     end
 
+    should "not generate filenames that include restricted characters" do
+      @subject.original_filename = 'image:restricted.png'
+      assert_equal 'image_restricted.png', @subject.original_filename
+    end
+
+    should "not generate paths that include restricted characters" do
+      @subject.original_filename = 'image:restricted.png'
+      assert_no_match /:/, @subject.path
+    end
+
   end
 end

data/test/io_adapters/uploaded_file_adapter_test.rb

@@ -52,6 +52,29 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
       end
     end
 
+    context "with UploadedFile that has restricted characters" do
+      setup do
+        Paperclip::UploadedFileAdapter.content_type_detector = nil
+
+        class UploadedFile < OpenStruct; end
+        @file = UploadedFile.new(
+          :original_filename => "image:restricted.gif",
+          :content_type => "image/x-png-by-browser",
+          :head => "",
+          :path => fixture_file("5k.png")
+        )
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      should "not generate paths that include restricted characters" do
+        assert_no_match /:/, @subject.path
+      end
+
+      should "not generate filenames that include restricted characters" do
+        assert_equal 'image_restricted.gif', @subject.original_filename
+      end
+    end
+
     context "with UploadFile responding to #path" do
       setup do
         Paperclip::UploadedFileAdapter.content_type_detector = nil

data/test/io_adapters/uri_adapter_test.rb

@@ -83,4 +83,20 @@ class UriProxyTest < Test::Unit::TestCase
     end
   end
 
+  context "a url with restricted characters in the filename" do
+    setup do
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
+      @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
+      @subject = Paperclip.io_adapters.for(@uri)
+    end
+
+    should "not generate filenames that include restricted characters" do
+      assert_equal "paper_clip.jpg", @subject.original_filename
+    end
+
+    should "not generate paths that include restricted characters" do
+      assert_no_match /:/, @subject.path
+    end
+  end
+
 end

data/test/plural_cache_test.rb

@@ -0,0 +1,36 @@
+require './test/helper'
+
+class PluralCacheTest < Test::Unit::TestCase
+  should 'cache pluralizations' do
+    cache = Paperclip::Interpolations::PluralCache.new
+    word = "box"
+
+    word.expects(:pluralize).returns("boxes").once
+
+    cache.pluralize(word)
+    cache.pluralize(word)
+  end
+
+  should 'cache pluralizations and underscores' do
+    cache = Paperclip::Interpolations::PluralCache.new
+    word = "BigBox"
+
+    word.expects(:pluralize).returns(word).once
+    word.expects(:underscore).returns(word).once
+
+    cache.underscore_and_pluralize(word)
+    cache.underscore_and_pluralize(word)
+  end
+
+  should 'pluralize words' do
+    cache = Paperclip::Interpolations::PluralCache.new
+    word = "box"
+    assert_equal "boxes", cache.pluralize(word)
+  end
+
+  should 'pluralize and underscore words' do
+    cache = Paperclip::Interpolations::PluralCache.new
+    word = "BigBox"
+    assert_equal "big_boxes", cache.underscore_and_pluralize(word)
+  end
+end

data/test/storage/s3_test.rb

@@ -238,6 +238,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] },
@@ -272,6 +292,45 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "An attachment that uses S3 for storage and has a proc for styles" do
+    setup do
+      rebuild_model :styles  => lambda { |attachment| attachment.instance.counter; {:thumbnail => { :geometry => "50x50#", :s3_headers => {'Cache-Control' => 'max-age=31557600'}} }},
+                    :storage => :s3,
+                    :bucket  => "bucket",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    }
+
+      @file = File.new(fixture_file('5k.png'), 'rb')
+
+      Dummy.class_eval do
+        def counter
+          @counter ||= 0
+          @counter += 1
+          @counter
+        end
+      end
+
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+
+      object = stub
+      @dummy.avatar.stubs(:s3_object).with(:original).returns(object)
+      @dummy.avatar.stubs(:s3_object).with(:thumbnail).returns(object)
+      object.expects(:write).with(anything, :content_type => 'image/png', :acl => :public_read)
+      object.expects(:write).with(anything, :content_type => 'image/png', :acl => :public_read, :cache_control => 'max-age=31557600')
+      @dummy.save
+    end
+
+    teardown { @file.close }
+
+    should "succeed" do
+      assert_equal @dummy.counter, 7
+    end
+  end
+
   context "An attachment that uses S3 for storage and has spaces in file name" do
     setup do
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },
@@ -700,6 +759,47 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with S3 storage and S3 credentials with a :credential_provider" do
+    setup do
+      class DummyCredentialProvider; end
+
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :s3_credentials => {
+                      :credential_provider => DummyCredentialProvider.new
+                    }
+      @dummy = Dummy.new
+    end
+
+    should "set the credential-provider" do
+      assert_kind_of DummyCredentialProvider, @dummy.avatar.s3_bucket.config.credential_provider
+    end
+  end
+
+  context "An attachment with S3 storage and S3 credentials in an unsupported manor" do
+    setup do
+      rebuild_model :storage => :s3, :bucket => "testing", :s3_credentials => ["unsupported"]
+      @dummy = Dummy.new
+    end
+
+    should "not accept the credentials" do
+      assert_raise(ArgumentError) do
+        @dummy.avatar.s3_credentials
+      end
+    end
+  end
+
+  context "An attachment with S3 storage and S3 credentials not supplied" do
+    setup do
+      rebuild_model :storage => :s3, :bucket => "testing"
+      @dummy = Dummy.new
+    end
+
+    should "not parse any credentials" do
+      assert_equal({}, @dummy.avatar.s3_credentials)
+    end
+  end
+
   context "An attachment with S3 storage and specific s3 headers set" do
     setup do
       rebuild_model :storage => :s3,

metadata

@@ -1,290 +1,276 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
+  version: 3.4.1
   prerelease: 
-  version: 3.4.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  name: activerecord
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  name: activemodel
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  name: activesupport
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: cocaine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    none: false
-  name: cocaine
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    none: false
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: mime-types
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: shoulda
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: appraisal
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: mocha
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    none: false
-  name: aws-sdk
+        version: 1.5.7
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    none: false
+        version: 1.5.7
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bourne
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: bourne
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
-    none: false
-  name: sqlite3
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
-  name: cucumber
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: aruba
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: nokogiri
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: capybara
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: bundler
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    none: false
-  name: cocaine
-  type: :development
-  prerelease: false
+  name: fog
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
     none: false
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -292,11 +278,10 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 1.7.0
-    none: false
-  name: fog
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -304,103 +289,102 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 1.7.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: pry
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: launchy
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: fakeweb
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: railties
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: actionmailer
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Easy upload management for ActiveRecord
 email:
 - jyurek@thoughtbot.com
@@ -458,6 +442,7 @@ files:
 - lib/paperclip/helpers.rb
 - lib/paperclip/instance_methods.rb
 - lib/paperclip/interpolations.rb
+- lib/paperclip/interpolations/plural_cache.rb
 - lib/paperclip/io_adapters/abstract_adapter.rb
 - lib/paperclip/io_adapters/attachment_adapter.rb
 - lib/paperclip/io_adapters/file_adapter.rb
@@ -538,6 +523,7 @@ files:
 - test/meta_class_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
+- test/plural_cache_test.rb
 - test/processor_test.rb
 - test/schema_test.rb
 - test/storage/filesystem_test.rb
@@ -570,21 +556,21 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 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
@@ -649,6 +635,7 @@ test_files:
 - test/meta_class_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
+- test/plural_cache_test.rb
 - test/processor_test.rb
 - test/schema_test.rb
 - test/storage/filesystem_test.rb
@@ -667,3 +654,4 @@ test_files:
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
 - test/validators_test.rb
+has_rdoc: