durran-carrierwave 0.3.2.3 → 0.4.3

data/Rakefile

@@ -2,26 +2,33 @@ require 'rubygems'
 gem 'hoe', '>= 2.1.0'
 require 'hoe'
 require 'fileutils'
-require './lib/carrierwave'
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+require 'carrierwave'
 
 Hoe.plugin :newgem
 # Hoe.plugin :website
 Hoe.plugin :cucumberfeatures
 
-$hoe = Hoe.spec 'carrierwave' do
+$hoe = Hoe.spec 'durran-carrierwave' do
   self.developer 'Jonas Nicklas', 'jonas.nicklas@gmail.com'
   self.rubyforge_name = self.name
   self.readme_file = 'README.rdoc'
   self.version = CarrierWave::VERSION
+  self.extra_dev_deps << ['newgem', '>=1.5.2']
   self.extra_dev_deps << ['rspec', '>=1.2.8']
   self.extra_dev_deps << ['cucumber', '>=0.3.96']
   self.extra_dev_deps << ['activerecord', '>=2.3.3']
+  self.extra_dev_deps << ['sqlite3-ruby', '>=1.2.5']
   self.extra_dev_deps << ['dm-core', '>=0.9.11']
+  self.extra_dev_deps << ['data_objects', '>=0.9.12']
+  self.extra_dev_deps << ['do_sqlite3', '>=0.9.11']
   self.extra_dev_deps << ['sequel', '>=3.2.0']
   self.extra_dev_deps << ['rmagick', '>=2.10.0']
-  self.extra_dev_deps << ['mongomapper', '>=0.3.3']
+  self.extra_dev_deps << ['mini_magick', '>=1.2.5']
+  self.extra_dev_deps << ['mongo_mapper', '>=0.6.8']
+  self.extra_dev_deps << ['mongoid', '>=0.10.4']
+  self.extra_dev_deps << ['aws-s3', '>=0.6.2']
   self.extra_rdoc_files << 'README.rdoc'
-  self.extra_rdoc_files << 'LICENSE'
 end
 
 require 'newgem/tasks'

data/features/grid_fs_storage.feature

@@ -0,0 +1,32 @@
+Feature: uploader with file storage
+  In order to be awesome
+  As a developer using CarrierWave
+  I want to upload files to the filesystem
+  
+  Background:
+    Given an uploader class that uses the 'grid_fs' storage
+    And an instance of that class    
+  
+  Scenario: store a file
+    When I store the file 'fixtures/bork.txt'
+    Then the contents of the file should be 'this is a file'
+  
+  Scenario: store two files in succession
+    When I store the file 'fixtures/bork.txt'
+    Then the contents of the file should be 'this is a file'
+    When I store the file 'fixtures/monkey.txt'
+    Then the contents of the file should be 'this is another file'
+  
+  Scenario: cache a file and then store it
+    When I cache the file 'fixtures/bork.txt'
+    Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
+    And the file called 'bork.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/bork.txt'
+    And there should not be a file at 'public/uploads/bork.txt'
+    When I store the file
+    Then the contents of the file should be 'this is a file'
+  
+  Scenario: retrieving a file from cache then storing
+    Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
+    When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache
+    And I store the file
+    Then the contents of the file should be 'this is a file'

data/features/step_definitions/general_steps.rb

@@ -1,13 +1,18 @@
 # encoding: utf-8
 
-Given /^an uploader class that uses the 'file' storage$/ do
+Given /^an uploader class that uses the '(.*?)' storage$/ do |kind|
   @klass = Class.new(CarrierWave::Uploader::Base)
+  @klass.storage = kind.to_sym
 end
 
 Given /^an instance of that class$/ do
   @uploader = @klass.new
 end
 
+Then /^the contents of the file should be '(.*?)'$/ do |contents|
+  @uploader.read.chomp.should == contents
+end
+
 Given /^that the uploader reverses the filename$/ do
   @klass.class_eval do
     def filename

data/features/support/activerecord.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'activerecord'
+require 'active_record'
 require 'carrierwave/mount'
 require 'carrierwave/orm/activerecord'
 

data/features/support/env.rb

@@ -1,34 +1,21 @@
 # encoding: utf-8
 
 $TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.expand_path(File.join('..', '..', 'lib'), File.dirname(__FILE__))
 
-require 'rubygems'
 require File.join(File.dirname(__FILE__), 'activerecord')
 require File.join(File.dirname(__FILE__), 'datamapper')
 
-if ENV["AS"]
-  puts "--> using ActiveSupport"
-  require 'activesupport'
-elsif ENV["EXTLIB"]
-  puts "--> using Extlib"
-  require 'extlib'
-end
-
-require 'tempfile'
-#require 'ruby-debug'
 require 'spec'
-
 require 'carrierwave'
 
 alias :running :lambda
 
 def file_path( *paths )
-  File.expand_path(File.join(File.dirname(__FILE__), '..', *paths))
+  File.expand_path(File.join('..', *paths), File.dirname(__FILE__))
 end
 
-CarrierWave.config[:public] = file_path('public')
-CarrierWave.config[:root] = file_path
+CarrierWave.root = file_path('public')
 
 After do
   FileUtils.rm_rf(file_path("public"))

data/lib/carrierwave.rb

@@ -7,50 +7,33 @@ require 'carrierwave/core_ext/inheritable_attributes'
 
 module CarrierWave
 
-  VERSION = "0.3.2.3"
+  VERSION = "0.4.3"
 
   class << self
-    attr_accessor :config, :logger
+    attr_accessor :root
 
-    def logger
-      return @logger if @logger
-      require 'logger'
-      @logger = Logger.new(STDOUT)
-    end
-
-    ##
-    # Generates a unique cache id for use in the caching system
-    #
-    # === Returns
-    #
-    # [String] a cache id in the format YYYYMMDD-HHMM-PID-RND
-    #
-    def generate_cache_id
-      Time.now.strftime('%Y%m%d-%H%M') + '-' + Process.pid.to_s + '-' + ("%04d" % rand(9999))
+    def configure(&block)
+      CarrierWave::Uploader::Base.configure(&block)
     end
   end
 
   class UploadError < StandardError; end
-  class NoFileError < UploadError; end
-  class FormNotMultipart < UploadError
-    def message
-      "You tried to assign a String or a Pathname to an uploader, for security reasons, this is not allowed.\n\n If this is a file upload, please check that your upload form is multipart encoded."
-    end
-  end
   class IntegrityError < UploadError; end
   class InvalidParameter < UploadError; end
-  # Should be used by methods used as process callbacks.
   class ProcessingError < UploadError; end
 
   autoload :SanitizedFile, 'carrierwave/sanitized_file'
   autoload :Mount, 'carrierwave/mount'
   autoload :RMagick, 'carrierwave/processing/rmagick'
   autoload :ImageScience, 'carrierwave/processing/image_science'
+  autoload :MiniMagick, 'carrierwave/processing/mini_magick'
 
   module Storage
     autoload :Abstract, 'carrierwave/storage/abstract'
     autoload :File, 'carrierwave/storage/file'
     autoload :S3, 'carrierwave/storage/s3'
+    autoload :GridFS, 'carrierwave/storage/grid_fs'
+    autoload :RightS3, 'carrierwave/storage/right_s3'
   end
 
   module Uploader
@@ -61,12 +44,12 @@ module CarrierWave
     autoload :Processing, 'carrierwave/uploader/processing'
     autoload :Versions, 'carrierwave/uploader/versions'
     autoload :Remove, 'carrierwave/uploader/remove'
-    autoload :Paths, 'carrierwave/uploader/paths'
     autoload :ExtensionWhitelist, 'carrierwave/uploader/extension_whitelist'
-    autoload :DefaultPath, 'carrierwave/uploader/default_path'
+    autoload :DefaultUrl, 'carrierwave/uploader/default_url'
     autoload :Proxy, 'carrierwave/uploader/proxy'
     autoload :Url, 'carrierwave/uploader/url'
     autoload :Mountable, 'carrierwave/uploader/mountable'
+    autoload :Configuration, 'carrierwave/uploader/configuration'
   end
 
   module Compatibility
@@ -79,67 +62,29 @@ module CarrierWave
 
 end
 
-CarrierWave.config = {
-  :permissions => 0644,
-  :storage => :file,
-  :use_cache => true,
-  :storage_engines => {
-    :file => "CarrierWave::Storage::File",
-    :s3 => "CarrierWave::Storage::S3"
-  },
-  :s3 => {
-    :access => :public_read
-  },
-  :store_dir => 'uploads',
-  :cache_dir => 'uploads/tmp',
-  :cache_to_cache_dir => true,
-  :mount => {
-    :ignore_integrity_errors => true,
-    :ignore_processing_errors => true,
-    :validate_integrity => true,
-    :validate_processing => true
-  }
-}
-
-if defined?(Merb::Plugins)
-  CarrierWave.config[:root] = Merb.root
-  CarrierWave.config[:public] = Merb.dir_for(:public)
+if defined?(Merb)
 
+  CarrierWave.root = Merb.dir_for(:public)
   Merb::BootLoader.before_app_loads do
-    # Set logger
-    CarrierWave.logger ||= Merb.logger
     # Setup path for uploaders and load all of them before classes are loaded
     Merb.push_path(:uploaders, Merb.root / 'app' / 'uploaders', '*.rb')
     Dir.glob(File.join(Merb.load_paths[:uploaders])).each {|f| require f }
   end
 
-  orm_path = File.dirname(__FILE__) / 'carrierwave' / 'orm' / Merb.orm
-  require orm_path if File.exist?(orm_path + '.rb')
-
-  Merb.add_generators File.dirname(__FILE__) / 'generators' / 'uploader_generator'
-
 elsif defined?(Rails)
-  begin
-    CarrierWave.logger = Rails.logger
-  rescue
-    # Rails < 2.1
-    CarrierWave.logger = RAILS_DEFAULT_LOGGER
-  end
-  CarrierWave.config[:root] = Rails.root
-  CarrierWave.config[:public] = File.join(Rails.root, 'public')
-
-  require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'activerecord')
 
+  CarrierWave.root = File.join(Rails.root, 'public')
   ActiveSupport::Dependencies.load_paths << File.join(Rails.root, "app", "uploaders")
 
 elsif defined?(Sinatra)
 
-  CarrierWave.config[:root] = Sinatra::Application.root
-  CarrierWave.config[:public] = Sinatra::Application.public
+  CarrierWave.root = Sinatra::Application.public
 
 end
 
-# MongoMapper is framework agnostic so we could need this in any environment.
-if defined?(MongoMapper)
-  require File.join(File.dirname(__FILE__), "carrierwave", "orm", "mongomapper")
-end
+
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'activerecord') if defined?(ActiveRecord)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'datamapper') if defined?(DataMapper)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'sequel') if defined?(Sequel)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", "mongomapper") if defined?(MongoMapper)
+require File.join(File.dirname(__FILE__), "carrierwave", "orm", "mongoid") if defined?(Mongoid)

data/lib/carrierwave/compatibility/paperclip.rb

@@ -78,8 +78,8 @@ module CarrierWave
 
       def mappings
         {
-          :rails_root   => lambda{|u, f| CarrierWave.config[:root] },
-          :rails_env    => lambda{|u, f| CarrierWave.config[:env] },
+          :rails_root   => lambda{|u, f| Rails.root },
+          :rails_env    => lambda{|u, f| Rails.env },
           :class        => lambda{|u, f| u.model.class.name.underscore.pluralize},
           :id           => lambda{|u, f| u.model.id },
           :id_partition => lambda{|u, f| ("%09d" % u.model.id).scan(/\d{3}/).join("/")},

data/lib/carrierwave/core_ext/inheritable_attributes.rb

@@ -58,7 +58,7 @@ class Class
         RUBY
       end
     end
-  end
+  end unless Class.respond_to?(:extlib_inheritable_reader)
 
   # Defines class-level inheritable attribute writer. Attributes are available to subclasses,
   # each subclass has a copy of parent's attribute.
@@ -86,7 +86,7 @@ class Class
         RUBY
       end
     end
-  end
+  end unless Class.respond_to?(:extlib_inheritable_writer)
 
   # Defines class-level inheritable attribute accessor. Attributes are available to subclasses,
   # each subclass has a copy of parent's attribute.
@@ -100,5 +100,5 @@ class Class
   def extlib_inheritable_accessor(*syms)
     extlib_inheritable_reader(*syms)
     extlib_inheritable_writer(*syms)
-  end
+  end unless Class.respond_to?(:extlib_inheritable_accessor)
 end

data/lib/carrierwave/mount.rb

@@ -26,11 +26,6 @@ module CarrierWave
       @uploaders
     end
 
-    ##
-    # === Returns
-    #
-    # [Hash{Symbol => Hash}] options for mounted uploaders
-    #
     def uploader_options
       @uploader_options ||= {}
       @uploader_options = superclass.uploader_options.merge(@uploader_options)
@@ -38,6 +33,26 @@ module CarrierWave
       @uploader_options
     end
 
+    ##
+    # Return a particular option for a particular uploader
+    #
+    # === Parameters
+    #
+    # [column (Symbol)] The column the uploader is mounted at
+    # [option (Symbol)] The option, e.g. validate_integrity
+    #
+    # === Returns
+    #
+    # [Object] The option value
+    #
+    def uploader_option(column, option)
+      if uploader_options[column].has_key?(option)
+        uploader_options[column][option]
+      else
+        uploaders[column].send(option)
+      end
+    end
+
     ##
     # Mounts the given uploader on the given column. This means that assigning
     # and reading from the column will upload and retrieve files. Supposing
@@ -70,9 +85,6 @@ module CarrierWave
     # [image_cache]             Returns a string that identifies the cache location of the file 
     # [image_cache=]            Retrieves the file from the cache based on the given cache name
     #
-    # [image_uploader]          Returns an instance of the uploader
-    # [image_uploader=]         Sets the uploader (be careful!)
-    #
     # [remove_image]            An attribute reader that can be used with a checkbox to mark a file for removal
     # [remove_image=]           An attribute writer that can be used with a checkbox to mark a file for removal
     # [remove_image?]           Whether the file should be removed when store_image! is called.
@@ -131,7 +143,7 @@ module CarrierWave
       end
 
       uploaders[column.to_sym] = uploader
-      uploader_options[column.to_sym] = CarrierWave.config[:mount].merge(options)
+      uploader_options[column.to_sym] = options
 
       include CarrierWave::Mount::Extension
 
@@ -165,14 +177,6 @@ module CarrierWave
           _mounter(:#{column}).url(*args)
         end
 
-        def #{column}_uploader
-          _mounter(:#{column}).uploader
-        end
-
-        def #{column}_uploader=(uploader)
-          _mounter(:#{column}).uploader = uploader
-        end
-
         def #{column}_cache
           _mounter(:#{column}).cache_name
         end
@@ -232,6 +236,8 @@ module CarrierWave
     private
 
       def _mounter(column)
+        # We cannot memoize in frozen objects :(
+        return Mounter.new(self, column) if frozen?
         @_mounters ||= {}
         @_mounters[column] ||= Mounter.new(self, column)
       end
@@ -242,9 +248,8 @@ module CarrierWave
     # we don't pollute the model with a lot of methods.
     class Mounter #:nodoc:
 
-      attr_reader :column, :record, :options
-
-      attr_accessor :uploader, :integrity_error, :processing_error, :remove
+      attr_reader :column, :record, :integrity_error, :processing_error
+      attr_accessor :remove
 
       def initialize(record, column, options={})
         @record = record
@@ -275,14 +280,14 @@ module CarrierWave
 
       def cache(new_file)
         uploader.cache!(new_file)
-        self.integrity_error = nil
-        self.processing_error = nil
+        @integrity_error = nil
+        @processing_error = nil
       rescue CarrierWave::IntegrityError => e
-        self.integrity_error = e
-        raise e unless options[:ignore_integrity_errors]
+        @integrity_error = e
+        raise e unless option(:ignore_integrity_errors)
       rescue CarrierWave::ProcessingError => e
-        self.processing_error = e
-        raise e unless options[:ignore_processing_errors]
+        @processing_error = e
+        raise e unless option(:ignore_processing_errors)
       end
 
       def cache_name
@@ -321,9 +326,13 @@ module CarrierWave
       end
 
     private
+      
+      def option(name)
+        record.class.uploader_option(column, name)
+      end
 
       def serialization_column
-        options[:mount_on] || column
+        option(:mount_on) || column
       end
 
     end # Mounter