paperclip-cloudfiles 2.3.8 → 2.3.8.1

data/{README.rdoc → README.md}

@@ -1,4 +1,5 @@
-=Paperclip
+Paperclip
+=========
 
 Paperclip is intended as an easy file attachment library for ActiveRecord. The
 intent behind it was to keep setup as easy as possible and to treat files as
@@ -12,7 +13,7 @@ packages). Attached files are saved to the filesystem and referenced in the
 browser by an easily understandable specification, which has sensible and
 useful defaults.
 
-See the documentation for +has_attached_file+ in Paperclip::ClassMethods for
+See the documentation for `has_attached_file` in Paperclip::ClassMethods for
 more detailed options.
 
 This fork has support for Rackspace Cloud Files.  It requires the "cloudfiles"
@@ -22,71 +23,76 @@ personally use on projects, so until they discover the joy of Cloud Files, this
 fork is available as the {paperclip-cloudfiles gem}[http://gemcutter.org/gems/paperclip-cloudfiles]
 on Gemcutter's gem server.
 
-==Installation
+The complete [RDoc](http://rdoc.info/github/minter/paperclip) is online.
+
+Installation
+------------
 
 Include the gem in your Gemfile:
 
   gem "paperclip-cloudfiles", "~> 2.3"
 
-==Quick Start
-
 In your environment.rb:
 
   config.gem "paperclip-cloudfiles", :lib => 'paperclip'
 
 This is because the gem name and the library name don't match.
 
+Quick Start
+-----------
+
 In your model:
 
-  class User < ActiveRecord::Base
-    has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
-  end
+    class User < ActiveRecord::Base
+      has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
+    end
 
 In your migrations:
 
-  class AddAvatarColumnsToUser < ActiveRecord::Migration
-    def self.up
-      add_column :users, :avatar_file_name,    :string
-      add_column :users, :avatar_content_type, :string
-      add_column :users, :avatar_file_size,    :integer
-      add_column :users, :avatar_updated_at,   :datetime
+    class AddAvatarColumnsToUser < ActiveRecord::Migration
+      def self.up
+        add_column :users, :avatar_file_name,    :string
+        add_column :users, :avatar_content_type, :string
+        add_column :users, :avatar_file_size,    :integer
+        add_column :users, :avatar_updated_at,   :datetime
+      end
+
+      def self.down
+        remove_column :users, :avatar_file_name
+        remove_column :users, :avatar_content_type
+        remove_column :users, :avatar_file_size
+        remove_column :users, :avatar_updated_at
+      end
     end
 
-    def self.down
-      remove_column :users, :avatar_file_name
-      remove_column :users, :avatar_content_type
-      remove_column :users, :avatar_file_size
-      remove_column :users, :avatar_updated_at
-    end
-  end
-
 In your edit and new views:
 
-  <% form_for :user, @user, :url => user_path, :html => { :multipart => true } do |form| %>
-    <%= form.file_field :avatar %>
-  <% end %>
+    <% form_for :user, @user, :url => user_path, :html => { :multipart => true } do |form| %>
+      <%= form.file_field :avatar %>
+    <% end %>
 
 In your controller:
 
-  def create
-    @user = User.create( params[:user] )
-  end
+    def create
+      @user = User.create( params[:user] )
+    end
 
 In your show view:
 
-  <%= image_tag @user.avatar.url %>
-  <%= image_tag @user.avatar.url(:medium) %>
-  <%= image_tag @user.avatar.url(:thumb) %>
+    <%= image_tag @user.avatar.url %>
+    <%= image_tag @user.avatar.url(:medium) %>
+    <%= image_tag @user.avatar.url(:thumb) %>
 
-==Usage
+Usage
+-----
 
 The basics of paperclip are quite simple: Declare that your model has an
 attachment with the has_attached_file method, and give it a name. Paperclip
 will wrap up up to four attributes (all prefixed with that attachment's name,
 so you can have multiple attachments per model if you wish) and give the a
-friendly front end. The attributes are <attachment>_file_name,
-<attachment>_file_size, <attachment>_content_type, and <attachment>_updated_at.
-Only <attachment>_file_name is required for paperclip to operate. More
+friendly front end. The attributes are `<attachment>_file_name`,
+`<attachment>_file_size`, `<attachment>_content_type`, and `<attachment>_updated_at`.
+Only `<attachment>_file_name` is required for paperclip to operate. More
 information about the options to has_attached_file is available in the
 documentation of Paperclip::ClassMethods.
 
@@ -94,7 +100,8 @@ Attachments can be validated with Paperclip's validation methods,
 validates_attachment_presence, validates_attachment_content_type, and
 validates_attachment_size.
 
-==Storage
+Storage
+-------
 
 The files that are assigned as attachments are, by default, placed in the
 directory specified by the :path option to has_attached_file. By default, this
@@ -104,10 +111,10 @@ public/system directory is symlinked to the app's shared directory, meaning it
 will survive between deployments. For example, using that :path, you may have a
 file at
 
-  /data/myapp/releases/20081229172410/public/system/avatars/13/small/my_pic.png
+    /data/myapp/releases/20081229172410/public/system/avatars/13/small/my_pic.png
 
-NOTE: This is a change from previous versions of Paperclip, but is overall a
-safer choice for the default file store.
+_NOTE: This is a change from previous versions of Paperclip, but is overall a
+safer choice for the default file store._
 
 You may also choose to store your files using Amazon's S3 service or Rackspace's Cloud Files service. You can find
 more information about S3 storage at the description for Paperclip::Storage::S3. and more information about Cloud Files storage at the description for Paperclip::Storage::CloudFile
@@ -119,7 +126,8 @@ both the :path and :url options in order to make sure the files are unavailable
 to the public. Both :path and :url allow the same set of interpolated
 variables.
 
-==Post Processing
+Post Processing
+---------------
 
 Paperclip supports an extensible selection of post-processors. When you define
 a set of styles for an attachment, by default it is expected that those
@@ -130,8 +138,8 @@ your Rails app's lib/paperclip_processors directory is automatically loaded by
 paperclip, allowing you to easily define custom processors. You can specify a
 processor with the :processors option to has_attached_file:
 
-  has_attached_file :scan, :styles => { :text => { :quality => :better } },
-                           :processors => [:ocr]
+    has_attached_file :scan, :styles => { :text => { :quality => :better } },
+                             :processors => [:ocr]
 
 This would load the hypothetical class Paperclip::Ocr, which would have the
 hash "{ :quality => :better }" passed to it along with the uploaded file. For
@@ -141,7 +149,7 @@ The default processor is Paperclip::Thumbnail. For backwards compatability
 reasons, you can pass a single geometry string or an array containing a
 geometry and a format, which the file will be converted to, like so:
 
-  has_attached_file :avatar, :styles => { :thumb => ["32x32#", :png] }
+    has_attached_file :avatar, :styles => { :thumb => ["32x32#", :png] }
 
 This will convert the "thumb" style to a 32x32 square in png format, regardless
 of what was uploaded. If the format is not specified, it is kept the same (i.e.
@@ -153,39 +161,42 @@ be given the result of the previous processor's execution. All processors will
 receive the same parameters, which are what you define in the :styles hash.
 For example, assuming we had this definition:
 
-  has_attached_file :scan, :styles => { :text => { :quality => :better } },
-                           :processors => [:rotator, :ocr]
+    has_attached_file :scan, :styles => { :text => { :quality => :better } },
+                             :processors => [:rotator, :ocr]
 
 then both the :rotator processor and the :ocr processor would receive the
 options "{ :quality => :better }". This parameter may not mean anything to one
 or more or the processors, and they are expected to ignore it.
 
-NOTE: Because processors operate by turning the original attachment into the
-styles, no processors will be run if there are no styles defined.
+_NOTE: Because processors operate by turning the original attachment into the
+styles, no processors will be run if there are no styles defined._
 
-==Events
+Events
+------
 
 Before and after the Post Processing step, Paperclip calls back to the model
 with a few callbacks, allowing the model to change or cancel the processing
-step. The callbacks are "before_post_process" and "after_post_process" (which
+step. The callbacks are `before_post_process` and `after_post_process` (which
 are called before and after the processing of each attachment), and the
-attachment-specific "before_<attachment>_post_process" and
-"after_<attachment>_post_process". The callbacks are intended to be as close to
+attachment-specific `before_<attachment>_post_process` and
+`after_<attachment>_post_process`. The callbacks are intended to be as close to
 normal ActiveRecord callbacks as possible, so if you return false (specifically
 - returning nil is not the same) in a before_ filter, the post processing step
 will halt. Returning false in an after_ filter will not halt anything, but you
 can access the model and the attachment if necessary.
 
-NOTE: Post processing will not even *start* if the attachment is not valid
+_NOTE: Post processing will not even *start* if the attachment is not valid
 according to the validations. Your callbacks and processors will *only* be
-called with valid attachments.
+called with valid attachments._
 
-==Testing
+Testing
+-------
 
 Paperclip provides rspec-compatible matchers for testing attachments. See the
 documentation on Paperclip::Shoulda::Matchers for more information.
 
-==Contributing
+Contributing
+------------
 
 If you'd like to contribute a feature or bugfix: Thanks! To make sure your
 fix/feature has a high chance of being included, please read the following
@@ -196,3 +207,19 @@ guidelines:
 2. Make sure there are tests! We will not accept any patch that is not tested.
    It's a rare time when explicit tests aren't needed. If you have questions
    about writing tests for paperclip, please ask the mailing list.
+
+Credits
+-------
+
+![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+
+Paperclip is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+
+Thank you to all [the contributors](https://github.com/thoughtbot/paperclip/contributors)!
+
+The names and logos for thoughtbot are trademarks of thoughtbot, inc.
+
+License
+-------
+
+Paperclip is Copyright © 2008-2011 thoughtbot. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/lib/paperclip/attachment.rb

@@ -253,6 +253,9 @@ module Paperclip
       else
         true
       end
+    rescue Errno::EACCES => e
+      warn "#{e} - skipping file"
+      false
     end
 
     # Returns true if a file has been assigned.

data/lib/paperclip/storage/cloud_files.rb

@@ -24,6 +24,7 @@ module Paperclip
     #       username: minter
     #       api_key: 87k... 
     #       servicenet: true
+    #       auth_url: https://lon.auth.api.rackspacecloud.com/v1.0
     #   This is not required, however, and the file may simply look like this:
     #     username: minter...
     #     api_key: 11q... 
@@ -39,13 +40,16 @@ module Paperclip
     #   you will want to interpolate. Keys should be unique, like filenames, and despite the fact that
     #   Cloud Files (strictly speaking) does not support directories, you can still use a / to
     #   separate parts of your file name, and they will show up in the URL structure.
+    # * +auth_url+: The URL to the authentication endpoint. If blank, defaults to the Rackspace Cloud Files
+    #   USA endpoint. You can use this to specify things like the Rackspace Cloud Files UK infrastructure, or
+    #   a non-Rackspace OpenStack Swift installation.  Requires 1.4.11 or higher of the Cloud Files gem.
     module Cloud_files
       def self.extended base
         require 'cloudfiles'
         @@container ||= {}
         base.instance_eval do
           @cloudfiles_credentials = parse_credentials(@options[:cloudfiles_credentials])
-          @container_name         = @options[:container]              || @cloudfiles_credentials[:container]
+          @container_name         = @options[:container] || options[:container_name] || @cloudfiles_credentials[:container] || @cloudfiles_credentials[:container_name]
           @container_name         = @container_name.call(self) if @container_name.is_a?(Proc)
           @cloudfiles_options     = @options[:cloudfiles_options]     || {}
           @@cdn_url               = cloudfiles_container.cdn_url
@@ -59,7 +63,10 @@ module Paperclip
       end
       
       def cloudfiles
-        @@cf ||= CloudFiles::Connection.new(:username => @cloudfiles_credentials[:username], :api_key => @cloudfiles_credentials[:api_key], :snet => @cloudfiles_credentials[:servicenet])
+        @@cf ||= CloudFiles::Connection.new(:username => @cloudfiles_credentials[:username], 
+                                            :api_key => @cloudfiles_credentials[:api_key], 
+                                            :snet => @cloudfiles_credentials[:servicenet],
+                                            :auth_url => (@cloudfiles_credentials[:auth_url] || "https://auth.api.rackspacecloud.com/v1.0"))
       end
 
       def create_container

data/lib/paperclip/version.rb

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

data/test/integration_test.rb

@@ -34,6 +34,22 @@ class IntegrationTest < Test::Unit::TestCase
     should "create its thumbnails properly" do
       assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
     end
+    
+    context 'reprocessing with unreadable original' do
+      setup { File.chmod(0000, @dummy.avatar.path) }
+      
+      should "not raise an error" do
+        assert_nothing_raised do
+          @dummy.avatar.reprocess!
+        end
+      end
+      
+      should "return false" do
+        assert ! @dummy.avatar.reprocess!
+      end
+      
+      teardown { File.chmod(0644, @dummy.avatar.path) }
+    end
 
     context "redefining its attachment styles" do
       setup do

data/test/storage_test.rb

@@ -7,6 +7,29 @@ class StorageTest < Test::Unit::TestCase
       Object.const_set(:Rails, stub('Rails', :env => env))
     end
   end
+  
+  context "filesystem" do
+    setup do
+      rebuild_model :styles => { :thumbnail => "25x25#" }
+      @dummy = Dummy.create!
+
+      @dummy.avatar = File.open(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
+    end
+    
+    should "allow file assignment" do
+      assert @dummy.save
+    end
+    
+    should "store the original" do
+      @dummy.save
+      assert File.exists?(@dummy.avatar.path)
+    end
+    
+    should "store the thumbnail" do
+      @dummy.save
+      assert File.exists?(@dummy.avatar.path(:thumbnail))
+    end
+  end
 
   context "Parsing S3 credentials" do
     setup do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-cloudfiles
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 85
+  prerelease: 
   segments: 
   - 2
   - 3
   - 8
-  version: 2.3.8
+  - 1
+  version: 2.3.8.1
 platform: ruby
 authors: 
 - Jon Yurek
@@ -16,12 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -05:00
+date: 2011-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +32,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   name: activerecord
-  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   name: activesupport
-  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   name: shoulda
-  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   name: appraisal
-  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   name: mocha
-  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,12 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   name: aws-s3
-  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,12 +118,12 @@ dependencies:
         - 4
         - 9
         version: 1.4.9
-  requirement: *id007
   name: cloudfiles
-  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,9 +132,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
   name: sqlite3-ruby
-  type: :development
+  version_requirements: *id008
 description: Easy upload management for ActiveRecord with Rackspace Cloud Files support
 email: 
 - jyurek@thoughtbot.com
@@ -142,9 +143,9 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
-- README.rdoc
+- README.md
 - LICENSE
 - Rakefile
 - init.rb
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord with Rackspace Cloud Files support