paperclip 2.2.5 → 2.2.6

data/lib/paperclip.rb

@@ -43,7 +43,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:

data/lib/paperclip/attachment.rb

@@ -191,31 +191,24 @@ module Paperclip
     # necessary.
     def self.interpolations
       @interpolations ||= {
-        :rails_root    => lambda{|attachment,style| RAILS_ROOT },
-        :rails_env     => lambda{|attachment,style| RAILS_ENV },
-        :class         => lambda do |attachment,style|
-                            attachment.instance.class.name.underscore.pluralize
-                          end,
-        :basename      => lambda do |attachment,style|
-                            attachment.original_filename.gsub(/#{File.extname(attachment.original_filename)}$/, "")
-                          end,
-        :extension     => lambda do |attachment,style| 
-                            ((style = attachment.styles[style]) && style[:format]) ||
-                            File.extname(attachment.original_filename).gsub(/^\.+/, "")
-                          end,
-        :id            => lambda{|attachment,style| attachment.instance.id },
-        :id_partition  => lambda do |attachment, style|
-                            ("%09d" % attachment.instance.id).scan(/\d{3}/).join("/")
-                          end,
-        :attachment    => lambda{|attachment,style| attachment.name.to_s.downcase.pluralize },
-        :style         => lambda{|attachment,style| style || attachment.default_style },
-        :relative_root => lambda do |attachment,style| 
-                            if ActionController::AbstractRequest.respond_to?(:relative_url_root)
-                              ActionController::AbstractRequest.relative_url_root
-                            elsif ActionController::Base.respond_to?(:relative_url_root)
-                              ActionController::Base.relative_url_root
-                            end
-                          end
+        :rails_root   => lambda{|attachment,style| RAILS_ROOT },
+        :rails_env    => lambda{|attachment,style| RAILS_ENV },
+        :class        => lambda do |attachment,style|
+                           attachment.instance.class.name.underscore.pluralize
+                         end,
+        :basename     => lambda do |attachment,style|
+                           attachment.original_filename.gsub(/#{File.extname(attachment.original_filename)}$/, "")
+                         end,
+        :extension    => lambda do |attachment,style| 
+                           ((style = attachment.styles[style]) && style[:format]) ||
+                           File.extname(attachment.original_filename).gsub(/^\.+/, "")
+                         end,
+        :id           => lambda{|attachment,style| attachment.instance.id },
+        :id_partition => lambda do |attachment, style|
+                           ("%09d" % attachment.instance.id).scan(/\d{3}/).join("/")
+                         end,
+        :attachment   => lambda{|attachment,style| attachment.name.to_s.downcase.pluralize },
+        :style        => lambda{|attachment,style| style || attachment.default_style },
       }
     end
 

data/lib/paperclip/storage.rb

@@ -206,11 +206,11 @@ module Paperclip
       
       def find_credentials creds
         case creds
-        when File:
+        when File
           YAML.load_file(creds.path)
-        when String:
+        when String
           YAML.load_file(creds)
-        when Hash:
+        when Hash
           creds
         else
           raise ArgumentError, "Credentials are not a path, file, or hash."

data/shoulda_macros/paperclip.rb

@@ -9,6 +9,7 @@ module Paperclip
   # you're testing (that is, UserTest is the test for the User model), and
   # will load that class for testing purposes.
   module Shoulda
+    include Matchers
     # This will test whether you have defined your attachment correctly by
     # checking for all the required fields exist after the definition of the
     # attachment.
@@ -64,5 +65,4 @@ end
 
 class Test::Unit::TestCase #:nodoc:
  extend  Paperclip::Shoulda
- include Paperclip::Shoulda::Matchers
 end

data/test/attachment_test.rb

@@ -106,36 +106,6 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
-  context "An attachment with a :relative_root interpolation" do
-    setup do
-      rebuild_model :url => ":relative_root/:id.png"
-      @dummy = Dummy.new
-      @dummy.stubs(:id).returns(1024)
-      @dummy.avatar = StringIO.new(".")
-
-      ActionController::Base.stubs(:respond_to?).with(:relative_url_root).returns(false)
-      ActionController::Base.stubs(:relative_url_root).returns("/base")
-      ActionController::AbstractRequest.stubs(:respond_to?).with(:relative_url_root).returns(false)
-      ActionController::AbstractRequest.stubs(:relative_url_root).returns("/request")
-    end
-
-    should "return the proper path when the path is nil" do
-      assert_equal "/1024.png", @dummy.avatar.url(:original, false)
-    end
-
-    should "return the proper path when using Rails < 2.1" do
-      ActionController::AbstractRequest.expects(:respond_to?).with(:relative_url_root).returns(true)
-      ActionController::AbstractRequest.expects(:relative_url_root).returns("/request")
-      assert_equal "/request/1024.png", @dummy.avatar.url(:original, false)
-    end
-
-    should "return the proper path when using Rails >= 2.1" do
-      ActionController::Base.expects(:respond_to?).with(:relative_url_root).returns(true)
-      ActionController::Base.expects(:relative_url_root).returns("/base")
-      assert_equal "/base/1024.png", @dummy.avatar.url(:original, false)
-    end
-  end
-
   context "An attachment with :convert_options" do
     setup do
       rebuild_model :styles => {

data/test/helper.rb

@@ -9,7 +9,6 @@ gem 'sqlite3-ruby'
 
 require 'active_record'
 require 'active_support'
-require 'action_controller'
 begin
   require 'ruby-debug'
 rescue LoadError

data/test/matchers/have_attached_file_matcher_test.rb

@@ -5,7 +5,7 @@ class HaveAttachedFileMatcherTest < Test::Unit::TestCase
     setup do
       @dummy_class = reset_class "Dummy"
       reset_table "dummies"
-      @matcher     = have_attached_file(:avatar)
+      @matcher     = self.class.have_attached_file(:avatar)
     end
 
     should "reject a class with no attachment" do

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -8,7 +8,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
-      @matcher     = validate_attachment_content_type(:avatar).
+      @matcher     = self.class.validate_attachment_content_type(:avatar).
                        allowing(%w(image/png image/jpeg)).
                        rejecting(%w(audio/mp3 application/octet-stream))
     end

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -6,7 +6,7 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
       reset_table("dummies"){|d| d.string :avatar_file_name }
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
-      @matcher     = validate_attachment_presence(:avatar)
+      @matcher     = self.class.validate_attachment_presence(:avatar)
     end
 
     should "reject a class with no validation" do

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -11,7 +11,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     end
 
     context "of limited size" do
-      setup{ @matcher = validate_attachment_size(:avatar).in(256..1024) }
+      setup{ @matcher = self.class.validate_attachment_size(:avatar).in(256..1024) }
 
       should "reject a class with no validation" do
         assert_rejects @matcher, @dummy_class
@@ -34,7 +34,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     end
 
     context "validates_attachment_size with infinite range" do
-      setup{ @matcher = validate_attachment_size(:avatar) }
+      setup{ @matcher = self.class.validate_attachment_size(:avatar) }
 
       should "accept a class with an upper limit" do
         @dummy_class.validates_attachment_size :avatar, :less_than => 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-11 00:00:00 -05:00
+date: 2009-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -34,7 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: