paperclip-cloudfiles 2.3.2 → 2.3.8

data/test/storage_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 require 'aws/s3'
 
 class StorageTest < Test::Unit::TestCase
@@ -50,29 +50,29 @@ class StorageTest < Test::Unit::TestCase
       
       @dummy = Dummy.new
       @avatar = @dummy.avatar
-      @current_env = RAILS_ENV
+      @current_env = Rails.env
     end
 
     teardown do
-      Object.const_set("RAILS_ENV", @current_env)
+      rails_env(@current_env)
     end
 
     should "get the correct credentials when RAILS_ENV is production" do
-      Object.const_set('RAILS_ENV', "production")
+      rails_env("production")
       assert_equal({:username => "minter"},
                    @avatar.parse_credentials('production' => {:username => 'minter'},
                                              :development => {:username => "mcornick"}))
     end
 
     should "get the correct credentials when RAILS_ENV is development" do
-      Object.const_set('RAILS_ENV', "development")
+      rails_env("development")
       assert_equal({:key => "mcornick"},
                    @avatar.parse_credentials('production' => {:key => 'minter'},
                                              :development => {:key => "mcornick"}))
     end
 
     should "return the argument if the key does not exist" do
-      Object.const_set('RAILS_ENV', "not really an env")
+      rails_env("not_valid")
       assert_equal({:test => "minter"}, @avatar.parse_credentials(:test => "minter"))
     end
   end
@@ -215,18 +215,18 @@ class StorageTest < Test::Unit::TestCase
                       :development  => { :container => "dev_container" }
                     }
       @dummy = Dummy.new
-      @old_env = RAILS_ENV
+      @old_env = Rails.env
     end
 
-    teardown{ Object.const_set("RAILS_ENV", @old_env) }
+    teardown{ rails_env(@old_env) }
 
     should "get the right container in production" do
-      Object.const_set("RAILS_ENV", "production")
+      rails_env("production")
       assert_equal "prod_container", @dummy.avatar.container_name
     end
 
     should "get the right bucket in development" do
-      Object.const_set("RAILS_ENV", "development")
+      rails_env("development")
       assert_equal "dev_container", @dummy.avatar.container_name
     end
   end
@@ -277,6 +277,21 @@ class StorageTest < Test::Unit::TestCase
         end
       end
 
+      context "and saved without a bucket" do
+        setup do
+          class AWS::S3::NoSuchBucket < AWS::S3::ResponseError
+            # Force the class to be created as a proper subclass of ResponseError thanks to AWS::S3's autocreation of exceptions
+          end
+          AWS::S3::Bucket.expects(:create).with("testing")
+          AWS::S3::S3Object.stubs(:store).raises(AWS::S3::NoSuchBucket.new(:message, :response)).then.returns(true)
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+
       context "and remove" do
         setup do
           AWS::S3::S3Object.stubs(:exists?).returns(true)
@@ -304,7 +319,7 @@ class StorageTest < Test::Unit::TestCase
 
     should "be extended by the CloudFile module" do
       CloudFiles::Connection.stubs(:new).returns(true)
-      assert Dummy.new.avatar.is_a?(Paperclip::Storage::CloudFile)
+      assert Dummy.new.avatar.is_a?(Paperclip::Storage::Cloud_files)
     end
 
     should "not be extended by the Filesystem module" do
@@ -501,7 +516,7 @@ class StorageTest < Test::Unit::TestCase
         teardown { @file.close }
 
         should "still return a Tempfile when sent #to_file" do
-          assert_equal Tempfile, @dummy.avatar.to_file.class
+          assert_equal Paperclip::Tempfile, @dummy.avatar.to_file.class
         end
 
         context "and saved" do
@@ -512,6 +527,11 @@ class StorageTest < Test::Unit::TestCase
           should "be on S3" do
             assert true
           end
+
+          should "generate a tempfile with the right name" do
+            file = @dummy.avatar.to_file
+            assert_match /^original.*\.png$/, File.basename(file.path)
+          end
         end
       end
     end

data/test/style_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'test/helper'
+require './test/helper'
 
 class StyleTest < Test::Unit::TestCase
 
@@ -9,7 +9,7 @@ class StyleTest < Test::Unit::TestCase
                                :styles => { :foo => {:geometry => "100x100#", :format => :png} }
       @style = @attachment.styles[:foo]
     end
-    
+
     should "be held as a Style object" do
       assert_kind_of Paperclip::Style, @style
     end
@@ -21,18 +21,18 @@ class StyleTest < Test::Unit::TestCase
     should "have the right geometry" do
       assert_equal "100x100#", @style.geometry
     end
-    
+
     should "be whiny if the attachment is" do
       @attachment.expects(:whiny).returns(true)
       assert @style.whiny?
     end
-    
+
     should "respond to hash notation" do
       assert_equal [:thumbnail], @style[:processors]
       assert_equal "100x100#", @style[:geometry]
     end
   end
-  
+
   context "A style rule with properties supplied as procs" do
     setup do
       @attachment = attachment :path => ":basename.:extension",
@@ -45,13 +45,13 @@ class StyleTest < Test::Unit::TestCase
                                  }
                                }
     end
-  
+
     should "defer processing of procs until they are needed" do
       assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@geometry")
       assert_kind_of Proc, @attachment.styles[:bar].instance_variable_get("@geometry")
       assert_kind_of Proc, @attachment.instance_variable_get("@processors")
     end
-  
+
     should "call procs when they are needed" do
       assert_equal "300x300#", @attachment.styles[:foo].geometry
       assert_equal "300x300#", @attachment.styles[:bar].geometry
@@ -63,7 +63,7 @@ class StyleTest < Test::Unit::TestCase
   context "An attachment with style rules in various forms" do
     setup do
       @attachment = attachment :path => ":basename.:extension",
-                               :styles => { 
+                               :styles => {
                                  :aslist => ["100x100", :png],
                                  :ashash => {:geometry => "100x100", :format => :png},
                                  :asstring => "100x100"
@@ -73,13 +73,13 @@ class StyleTest < Test::Unit::TestCase
       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.styles[s]
       end
     end
-    
+
     should "have the right geometries" do
       [:aslist, :ashash, :aslist].each do |s|
         assert_equal @attachment.styles[s].geometry, "100x100"
@@ -107,32 +107,32 @@ class StyleTest < Test::Unit::TestCase
     before_should "not have called extra_options_for(:thumb/:large) on initialization" do
       @attachment.expects(:extra_options_for).never
     end
-    
+
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment.expects(:extra_options_for).with(:thumb)
       @attachment.styles[:thumb].convert_options
     end
   end
-  
+
   context "A style rule with its own :processors" do
     setup do
       @attachment = attachment :path => ":basename.:extension",
-                               :styles => { 
+                               :styles => {
                                  :foo => {
-                                   :geometry => "100x100#", 
+                                   :geometry => "100x100#",
                                    :format => :png,
                                    :processors => [:test]
-                                  } 
+                                  }
                                 },
                                :processors => [:thumbnail]
       @style = @attachment.styles[:foo]
     end
-    
+
     should "not get processors from the attachment" do
       @attachment.expects(:processors).never
       assert_not_equal [:thumbnail], @style.processors
     end
-  
+
     should "report its own processors" do
       assert_equal [:test], @style.processors
     end

data/test/thumbnail_test.rb

@@ -1,10 +1,10 @@
-require 'test/helper'
+require './test/helper'
 
 class ThumbnailTest < Test::Unit::TestCase
 
   context "A Paperclip Tempfile" do
     setup do
-      @tempfile = Paperclip::Tempfile.new("file.jpg")
+      @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
     end
 
     should "have its path contain a real extension" do
@@ -47,7 +47,7 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "start with dimensions of 434x66" do
-          cmd = %Q[identify -format "%wx%h" "#{@file.path}"] 
+          cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
           assert_equal "434x66", `#{cmd}`.chomp
         end
 
@@ -61,7 +61,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
 
           should "be the size we expect it to be" do
-            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"] 
+            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"]
             assert_equal args[1], `#{cmd}`.chomp
           end
         end
@@ -85,14 +85,14 @@ class ThumbnailTest < Test::Unit::TestCase
       should "have whiny turned on by default" do
         assert @thumb.whiny
       end
-      
+
       should "have convert_options set to nil by default" do
         assert_equal nil, @thumb.convert_options
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:"`").with do |arg|
-          arg.match %r{convert '#{File.expand_path(@thumb.file.path)}\[0\]' '-resize' 'x50' '-crop' '100x50\+114\+0' '\+repage' '.*?'}
+        Paperclip::CommandLine.expects(:"`").with do |arg|
+          arg.match %r{convert ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage ["'].*?["']}
         end
         @thumb.make
       end
@@ -102,7 +102,7 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_match /100x50/, `identify "#{dst.path}"`
       end
     end
-    
+
     context "being thumbnailed with source file options set" do
       setup do
         @thumb = Paperclip::Thumbnail.new(@file,
@@ -115,8 +115,8 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:"`").with do |arg|
-          arg.match %r{convert '-strip' '#{File.expand_path(@thumb.file.path)}\[0\]' '-resize' 'x50' '-crop' '100x50\+114\+0' '\+repage' '.*?'}
+        Paperclip::CommandLine.expects(:"`").with do |arg|
+          arg.match %r{convert -strip ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage ["'].*?["']}
         end
         @thumb.make
       end
@@ -125,7 +125,7 @@ class ThumbnailTest < Test::Unit::TestCase
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
-      
+
       context "redefined to have bad source_file_options setting" do
         setup do
           @thumb = Paperclip::Thumbnail.new(@file,
@@ -138,7 +138,7 @@ class ThumbnailTest < Test::Unit::TestCase
             @thumb.make
           end
         end
-      end      
+      end
     end
 
     context "being thumbnailed with convert options set" do
@@ -153,8 +153,8 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:"`").with do |arg|
-          arg.match %r{convert '#{File.expand_path(@thumb.file.path)}\[0\]' '-resize' 'x50' '-crop' '100x50\+114\+0' '\+repage' '-strip' '-depth' '8' '.*?'}
+        Paperclip::CommandLine.expects(:"`").with do |arg|
+          arg.match %r{convert ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage -strip -depth 8 ["'].*?["']}
         end
         @thumb.make
       end
@@ -163,7 +163,7 @@ class ThumbnailTest < Test::Unit::TestCase
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
-      
+
       context "redefined to have bad convert_options setting" do
         setup do
           @thumb = Paperclip::Thumbnail.new(@file,
@@ -176,16 +176,16 @@ class ThumbnailTest < Test::Unit::TestCase
             @thumb.make
           end
         end
-      end      
+      end
     end
-    
+
     context "being thumbnailed with a blank geometry string" do
       setup do
         @thumb = Paperclip::Thumbnail.new(@file,
                                           :geometry        => "",
                                           :convert_options => "-gravity center -crop \"300x300+0-0\"")
       end
-      
+
       should "not get resized by default" do
         assert !@thumb.transformation_command.include?("-resize")
       end

data/test/upfile_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class UpfileTest < Test::Unit::TestCase
   { %w(jpg jpe jpeg) => 'image/jpeg',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-cloudfiles
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 19
   prerelease: false
   segments: 
   - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 8
+  version: 2.3.8
 platform: ruby
 authors: 
 - Jon Yurek
@@ -16,13 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -05:00
+date: 2011-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
+  name: activerecord
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
+  requirement: *id002
+  name: activesupport
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  name: shoulda
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: cloudfiles
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+  name: appraisal
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  name: mocha
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: active_record
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +100,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+  name: aws-s3
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: active_support
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 4
+        - 9
+        version: 1.4.9
+  requirement: *id007
+  name: cloudfiles
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,8 +130,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
+  name: sqlite3-ruby
   type: :development
-  version_requirements: *id007
 description: Easy upload management for ActiveRecord with Rackspace Cloud Files support
 email: 
 - jyurek@thoughtbot.com
@@ -132,11 +148,12 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- generators/paperclip/paperclip_generator.rb
-- generators/paperclip/templates/paperclip_migration.rb.erb
-- generators/paperclip/USAGE
+- lib/generators/paperclip/paperclip_generator.rb
+- lib/generators/paperclip/templates/paperclip_migration.rb.erb
+- lib/generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatability.rb
+- lib/paperclip/command_line.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
@@ -146,14 +163,20 @@ files:
 - lib/paperclip/matchers/validate_attachment_size_matcher.rb
 - lib/paperclip/matchers.rb
 - lib/paperclip/processor.rb
+- lib/paperclip/railtie.rb
+- lib/paperclip/storage/cloud_files.rb
+- lib/paperclip/storage/filesystem.rb
+- lib/paperclip/storage/s3.rb
 - lib/paperclip/storage.rb
 - lib/paperclip/style.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
+- lib/paperclip/version.rb
 - lib/paperclip.rb
-- tasks/paperclip_tasks.rake
+- lib/tasks/paperclip.rake
 - test/attachment_test.rb
 - test/cloudfiles.yml
+- test/command_line_test.rb
 - test/database.yml
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
@@ -177,6 +200,10 @@ files:
 - test/style_test.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
 has_rdoc: true
 homepage: http://github.com/minter/paperclip

data/tasks/paperclip_tasks.rake

@@ -1,79 +0,0 @@
-def obtain_class
-  class_name = ENV['CLASS'] || ENV['class']
-  raise "Must specify CLASS" unless class_name
-  @klass = Object.const_get(class_name)
-end
-
-def obtain_attachments
-  name = ENV['ATTACHMENT'] || ENV['attachment']
-  raise "Class #{@klass.name} has no attachments specified" unless @klass.respond_to?(:attachment_definitions)
-  if !name.blank? && @klass.attachment_definitions.keys.include?(name)
-    [ name ]
-  else
-    @klass.attachment_definitions.keys
-  end
-end
-
-def for_all_attachments
-  klass = obtain_class
-  names = obtain_attachments
-  ids   = klass.connection.select_values(klass.send(:construct_finder_sql, :select => 'id'))
-
-  ids.each do |id|
-    instance = klass.find(id)
-    names.each do |name|
-      result = if instance.send("#{ name }?")
-                 yield(instance, name)
-               else
-                 true
-               end
-      print result ? "." : "x"; $stdout.flush
-    end
-  end
-  puts " Done."
-end
-
-namespace :paperclip do
-  desc "Refreshes both metadata and thumbnails."
-  task :refresh => ["paperclip:refresh:metadata", "paperclip:refresh:thumbnails"]
-
-  namespace :refresh do
-    desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT)."
-    task :thumbnails => :environment do
-      errors = []
-      for_all_attachments do |instance, name|
-        result = instance.send(name).reprocess!
-        errors << [instance.id, instance.errors] unless instance.errors.blank?
-        result
-      end
-      errors.each{|e| puts "#{e.first}: #{e.last.full_messages.inspect}" }
-    end
-
-    desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."
-    task :metadata => :environment do
-      for_all_attachments do |instance, name|
-        if file = instance.send(name).to_file
-          instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
-          instance.send("#{name}_content_type=", file.content_type.strip)
-          instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
-          instance.save(false)
-        else
-          true
-        end
-      end
-    end
-  end
-
-  desc "Cleans out invalid attachments. Useful after you've added new validations."
-  task :clean => :environment do
-    for_all_attachments do |instance, name|
-      instance.send(name).send(:validate)
-      if instance.send(name).valid?
-        true
-      else
-        instance.send("#{name}=", nil)
-        instance.save
-      end
-    end
-  end
-end