paperclip 2.8.0 → 3.0.2

data/init.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), "lib", "paperclip")
-require 'paperclip/railtie'
-
-Paperclip::Railtie.insert

data/lib/paperclip/callback_compatibility.rb

@@ -1,61 +0,0 @@
-module Paperclip
-  module CallbackCompatability
-    module Rails21
-      def self.included(base)
-        base.extend(Defining)
-        base.send(:include, Running)
-      end
-
-      module Defining
-        def define_paperclip_callbacks(*args)
-          args.each do |callback|
-            define_callbacks("before_#{callback}")
-            define_callbacks("after_#{callback}")
-          end
-        end
-      end
-
-      module Running
-        def run_paperclip_callbacks(callback, opts = nil, &blk)
-          # The overall structure of this isn't ideal since after callbacks run even if
-          # befores return false. But this is how rails 3's callbacks work, unfortunately.
-          if run_callbacks(:"before_#{callback}"){ |result, object| result == false } != false
-            blk.call
-          end
-          run_callbacks(:"after_#{callback}"){ |result, object| result == false }
-        end
-      end
-    end
-
-    module Rails3
-      def self.included(base)
-        base.extend(Defining)
-        base.send(:include, Running)
-      end
-
-      module Defining
-        def define_paperclip_callbacks(*callbacks)
-          define_callbacks *[callbacks, {:terminator => "result == false"}].flatten
-          callbacks.each do |callback|
-            eval <<-end_callbacks
-              def before_#{callback}(*args, &blk)
-                set_callback(:#{callback}, :before, *args, &blk)
-              end
-              def after_#{callback}(*args, &blk)
-                set_callback(:#{callback}, :after, *args, &blk)
-              end
-            end_callbacks
-          end
-        end
-      end
-
-      module Running
-        def run_paperclip_callbacks(callback, opts = nil, &block)
-          run_callbacks(callback, opts, &block)
-        end
-      end
-
-    end
-
-  end
-end

data/lib/paperclip/iostream.rb

@@ -1,45 +0,0 @@
-# Provides method that can be included on File-type objects (IO, StringIO, Tempfile, etc) to allow stream copying
-# and Tempfile conversion.
-module IOStream
-  # Returns a Tempfile containing the contents of the readable object.
-  def to_tempfile(object)
-    return object.to_tempfile if object.respond_to?(:to_tempfile)
-    name = object.respond_to?(:original_filename) ? object.original_filename : (object.respond_to?(:path) ? object.path : "stream")
-    tempfile = Paperclip::Tempfile.new(["stream", File.extname(name)])
-    tempfile.binmode
-    stream_to(object, tempfile)
-  end
-
-  # Copies one read-able object from one place to another in blocks, obviating the need to load
-  # the whole thing into memory. Defaults to 8k blocks. Returns a File if a String is passed
-  # in as the destination and returns the IO or Tempfile as passed in if one is sent as the destination.
-  def stream_to object, path_or_file, in_blocks_of = 8192
-    dstio = case path_or_file
-            when String   then File.new(path_or_file, "wb+")
-            when IO       then path_or_file
-            when Tempfile then path_or_file
-            end
-    buffer = ""
-    object.rewind
-    while object.read(in_blocks_of, buffer) do
-      dstio.write(buffer)
-    end
-    dstio.rewind
-    dstio
-  end
-end
-
-# Corrects a bug in Windows when asking for Tempfile size.
-if defined?(Tempfile) && RUBY_PLATFORM !~ /java/
-  class Tempfile
-    def size
-      if @tmpfile
-        @tmpfile.fsync
-        @tmpfile.flush
-        @tmpfile.stat.size
-      else
-        0
-      end
-    end
-  end
-end

data/lib/paperclip/upfile.rb

@@ -1,64 +0,0 @@
-require 'mime/types'
-
-module Paperclip
-  # The Upfile module is a convenience module for adding uploaded-file-type methods
-  # to the +File+ class. Useful for testing.
-  #   user.avatar = File.new("test/test_avatar.jpg")
-  module Upfile
-    # Infer the MIME-type of the file from the extension.
-    def content_type
-      types = MIME::Types.type_for(self.original_filename)
-      if types.length == 0
-        type_from_file_command
-      elsif types.length == 1
-        types.first.content_type
-      else
-        iterate_over_array_to_find_best_option(types)
-      end
-    end
-
-    def iterate_over_array_to_find_best_option(types)
-      types.reject {|type| type.content_type.match(/\/x-/) }.first
-    end
-
-    def type_from_file_command
-      #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
-      type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
-      mime_type = (Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;]\s+/)[0] rescue "application/x-#{type}")
-      mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
-      mime_type
-    end
-
-    # Returns the file's normal name.
-    def original_filename
-      File.basename(self.path)
-    end
-
-    # Returns the size of the file.
-    def size
-      File.size(self)
-    end
-  end
-end
-
-if defined? StringIO
-  class StringIO
-    attr_accessor :original_filename, :content_type, :fingerprint
-
-    def original_filename
-      @original_filename ||= "stringio.txt"
-    end
-
-    def content_type
-      @content_type ||= "text/plain"
-    end
-
-    def fingerprint
-      @fingerprint ||= Digest::MD5.hexdigest(self.string)
-    end
-  end
-end
-
-class File #:nodoc:
-  include Paperclip::Upfile
-end

data/rails/init.rb

@@ -1,2 +0,0 @@
-require 'paperclip/railtie'
-Paperclip::Railtie.insert

data/test/iostream_test.rb

@@ -1,71 +0,0 @@
-require './test/helper'
-
-class IOStreamTest < Test::Unit::TestCase
-  include IOStream
-  context "A file" do
-    setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
-    end
-
-    teardown { @file.close }
-
-    context "that is sent #stream_to" do
-
-      context "and given a String" do
-        setup do
-          FileUtils.mkdir_p(File.join(ROOT, 'tmp'))
-          assert @result = stream_to(@file, File.join(ROOT, 'tmp', 'iostream.string.test'))
-        end
-
-        should "return a File" do
-          assert @result.is_a?(File)
-        end
-
-        should "contain the same data as the original file" do
-          @file.rewind; @result.rewind
-          assert_equal @file.read, @result.read
-        end
-      end
-
-      context "and given a Tempfile" do
-        setup do
-          tempfile = Tempfile.new('iostream.test')
-          tempfile.binmode
-          assert @result = stream_to(@file, tempfile)
-        end
-
-        should "return a Tempfile" do
-          assert @result.is_a?(Tempfile)
-        end
-
-        should "contain the same data as the original file" do
-          @file.rewind; @result.rewind
-          assert_equal @file.read, @result.read
-        end
-      end
-
-    end
-
-    context "that is converted #to_tempfile" do
-      setup do
-        assert @tempfile = to_tempfile(@file)
-      end
-
-      should "convert it to a Paperclip Tempfile" do
-        assert @tempfile.is_a?(Paperclip::Tempfile)
-      end
-
-      should "have the name be based on the original_filename" do
-        name = File.basename(@file.path)
-        extension = File.extname(name)
-        basename = File.basename(name, extension)
-        assert_match %r[^stream.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
-      end
-
-      should "have the Tempfile contain the same data as the file" do
-        @file.rewind; @tempfile.rewind
-        assert_equal @file.read, @tempfile.read
-      end
-    end
-  end
-end

data/test/upfile_test.rb

@@ -1,53 +0,0 @@
-require './test/helper'
-
-class UpfileTest < Test::Unit::TestCase
-  { %w(jpg jpe jpeg) => 'image/jpeg',
-    %w(tif tiff)     => 'image/tiff',
-    %w(png)          => 'image/png',
-    %w(gif)          => 'image/gif',
-    %w(bmp)          => 'image/bmp',
-    %w(svg)          => 'image/svg+xml',
-    %w(txt)          => 'text/plain',
-    %w(htm html)     => 'text/html',
-    %w(csv)          => 'text/csv',
-    %w(xml)          => 'application/xml',
-    %w(css)          => 'text/css',
-    %w(js)           => 'application/javascript',
-    %w(foo)          => 'application/x-foo'
-  }.each do |extensions, content_type|
-    extensions.each do |extension|
-      should "return a content_type of #{content_type} for a file with extension .#{extension}" do
-        file = stub('file', :path => "basename.#{extension}")
-        class << file
-          include Paperclip::Upfile
-        end
-
-        assert_equal content_type, file.content_type
-      end
-    end
-  end
-
-  should "return a content_type of text/plain on a real file whose content_type is determined with the file command" do
-    file = File.new(File.join(File.dirname(__FILE__), "..", "LICENSE"))
-    class << file
-      include Paperclip::Upfile
-    end
-    assert_equal 'text/plain', file.content_type
-  end
-
-  { '5k.png'       => 'image/png',
-    'animated.gif' => 'image/gif',
-    'text.txt'     => 'text/plain',
-    'twopage.pdf'  => 'application/pdf'
-  }.each do |filename, content_type|
-    should "return a content type of #{content_type} from a file command for file #{filename}" do
-      file = File.new(File.join(File.dirname(__FILE__), "fixtures", filename))
-      class << file
-        include Paperclip::Upfile
-      end
-
-      assert_equal content_type, file.type_from_file_command
-    end
-  end
-
-end