paperclip 3.3.0 → 3.3.1

data/NEWS

@@ -1,3 +1,11 @@
+New In 3.3.1:
+
+* Bug fix: Moved Filesystem's copy_to_local_file to the right place.
+
+New in 3.3.0:
+
+* Improvement: Upgrade cocaine to 0.4
+
 New in 3.2.0:
 
 * Bug fix: Use the new correct Amazon S3 encryption header.

data/README.md

@@ -42,7 +42,9 @@ directory to its path.
 
 In development mode, you might add this line to `config/environments/development.rb)`:
 
-    Paperclip.options[:command_path] = "/usr/local/bin/"
+```ruby
+Paperclip.options[:command_path] = "/usr/local/bin/"
+```
 
 If you're on Mac OS X, you'll want to run the following with Homebrew:
 
@@ -61,15 +63,21 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 
 Include the gem in your Gemfile:
 
-    gem "paperclip", "~> 3.0"
+```ruby
+gem "paperclip", "~> 3.0"
+```
 
 If you're still using Rails 2.3.x, you should do this instead:
 
-    gem "paperclip", "~> 2.7"
+```ruby
+gem "paperclip", "~> 2.7"
+```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 
-    gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
+```ruby
+gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
+```
 
 If you're trying to use features that don't seem to be in the latest released gem, but are
 mentioned in this README, then you probably need to specify the master branch if you want to
@@ -567,18 +575,20 @@ end
 
 Then in `RAILS_ROOT/public/system/paperclip_attachments.yml`:
 
-    ---
-    :User:
-      :avatar:
-      - :thumb
-      - :croppable
-      - :big
-    :Book:
-      :cover:
-      - :small
-      - :large
-      :sample:
-      - :thumb
+```yml
+---
+:User:
+  :avatar:
+  - :thumb
+  - :croppable
+  - :big
+:Book:
+  :cover:
+  - :small
+  - :large
+  :sample:
+  - :thumb
+```
 
 Testing
 -------

data/lib/paperclip/attachment.rb

@@ -46,7 +46,7 @@ module Paperclip
     # +styles+ - a hash of options for processing the attachment. See +has_attached_file+ for the details
     # +only_process+ - style args to be run through the post-processor. This defaults to the empty list
     # +default_url+ - a URL for the missing image
-    # +default_style+ - the style to use when don't specify an argument to e.g. #url, #path
+    # +default_style+ - the style to use when an argument is not specified e.g. #url, #path
     # +storage+ - the storage mechanism. Defaults to :filesystem
     # +use_timestamp+ - whether to append an anti-caching timestamp to image URLs. Defaults to true
     # +whiny+, +whiny_thumbnails+ - whether to raise when thumbnailing fails
@@ -57,7 +57,7 @@ module Paperclip
     # +convert_options+ - flags passed to the +convert+ command for processing
     # +source_file_options+ - flags passed to the +convert+ command that controls how the file is read
     # +processors+ - classes that transform the attachment. Defaults to [:thumbnail]
-    # +preserve_files+ - whether to keep files on the filesystem when deleting to clearing the attachment. Defaults to false
+    # +preserve_files+ - whether to keep files on the filesystem when deleting or clearing the attachment. Defaults to false
     # +interpolator+ - the object used to interpolate filenames and URLs. Defaults to Paperclip::Interpolations
     # +url_generator+ - the object used to generate URLs, using the interpolator. Defaults to Paperclip::UrlGenerator
     def initialize(name, instance, options = {})
@@ -167,7 +167,7 @@ module Paperclip
         styles = styles.call(self) if styles.respond_to?(:call)
 
         @normalized_styles = styles.dup
-        @normalized_styles.each_pair do |name, options|
+        styles.each_pair do |name, options|
           @normalized_styles[name.to_sym] = Paperclip::Style.new(name.to_sym, options.dup, self)
         end
       end
@@ -244,7 +244,7 @@ module Paperclip
     end
 
     # Returns the fingerprint of the file, if one's defined. The fingerprint is
-    # stored in the <attachment>_fingerpring attribute of the model.
+    # stored in the <attachment>_fingerprint attribute of the model.
     def fingerprint
       instance_read(:fingerprint)
     end

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -2,6 +2,8 @@ require 'active_support/core_ext/module/delegation'
 
 module Paperclip
   class AbstractAdapter
+    OS_RESTRICTED_CHARACTERS = %r{[/:]}
+
     attr_reader :content_type, :original_filename, :size
     delegate :close, :closed?, :eof?, :path, :rewind, :unlink, :to => :@tempfile
 
@@ -17,6 +19,10 @@ module Paperclip
       "#{self.class}: #{self.original_filename}"
     end
 
+    def original_filename=(new_filename)
+      @original_filename = new_filename.gsub(OS_RESTRICTED_CHARACTERS, "_")
+    end
+
     private
 
     def destination

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -6,7 +6,8 @@ module Paperclip
       @tempfile = copy_to_tempfile(@target)
     end
 
-    attr_writer :original_filename, :content_type
+    attr_writer :content_type
+
     private
 
     def cache_current_values

data/lib/paperclip/io_adapters/uri_adapter.rb

@@ -9,7 +9,8 @@ module Paperclip
       @tempfile = copy_to_tempfile(@content)
     end
 
-    attr_writer :original_filename, :content_type
+    attr_writer :content_type
+
     private
 
     def download_content

data/lib/paperclip/storage/filesystem.rb

@@ -67,10 +67,10 @@ module Paperclip
         end
         @queued_for_delete = []
       end
-    end
 
-    def copy_to_local_file(style, local_dest_path)
-      FileUtils.cp(path(style), local_dest_path)
+      def copy_to_local_file(style, local_dest_path)
+        FileUtils.cp(path(style), local_dest_path)
+      end
     end
 
   end

data/lib/paperclip/storage/fog.rb

@@ -204,4 +204,4 @@ module Paperclip
       end
     end
   end
-end
+end

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   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')
+  s.add_development_dependency('fog', '>= 1.4.0', "< 1.7.0")
   s.add_development_dependency('pry')
   s.add_development_dependency('launchy')
   s.add_development_dependency('rake')

data/test/helper.rb

@@ -14,6 +14,7 @@ require 'active_support/core_ext'
 require 'mime/types'
 require 'pathname'
 require 'ostruct'
+require 'pry'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 

data/test/io_adapters/abstract_adapter_test.rb

@@ -2,7 +2,7 @@ require './test/helper'
 
 class AbstractAdapterTest < Test::Unit::TestCase
   class TestAdapter < Paperclip::AbstractAdapter
-    attr_accessor :original_file_name, :tempfile
+    attr_accessor :tempfile
 
     def content_type
       Paperclip::ContentTypeDetector.new(path).detect
@@ -40,4 +40,11 @@ class AbstractAdapterTest < Test::Unit::TestCase
       end
     end
   end
+
+  should 'get rid of slashes and colons in filenames' do
+    @adapter = TestAdapter.new
+    @adapter.original_filename = "awesome/file:name.png"
+
+    assert_equal "awesome_file_name.png", @adapter.original_filename
+  end
 end

data/test/storage/filesystem_test.rb

@@ -41,6 +41,14 @@ class FileSystemTest < Test::Unit::TestCase
         assert paths.none?{ |path| File.exists?(path) },
           "Expect all the files to be deleted."
       end
+
+      should 'copy the file to a known location with copy_to_local_file' do
+        tempfile = Tempfile.new("known_location")
+        @dummy.avatar.copy_to_local_file(:original, tempfile.path)
+        tempfile.rewind
+        assert_equal @file.read, tempfile.read
+        tempfile.close
+      end
     end
 
     context "with file that has space in file name" do

data/test/storage/fog_test.rb

@@ -149,6 +149,17 @@ class FogTest < Test::Unit::TestCase
           "Expect all the files to be deleted."
       end
 
+      should 'be able to be copied to a local file' do
+        @dummy.save
+        tempfile = Tempfile.new("known_location")
+        tempfile.binmode
+        @dummy.avatar.copy_to_local_file(:original, tempfile.path)
+        tempfile.rewind
+        assert_equal @connection.directories.get(@fog_directory).files.get(@dummy.avatar.path).body,
+                     tempfile.read
+        tempfile.close
+      end
+
       should "pass the content type to the Fog::Storage::AWS::Files instance" do
         Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
           hash[:content_type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -288,17 +288,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement