carrierwave 0.4.10 → 0.5.0.beta2

data/README.rdoc

@@ -14,6 +14,7 @@ upload files.
 * Please {report any issues}[http://github.com/jnicklas/carrierwave/issues] on GitHub
 * Please direct any questions at the {mailing list}[http://groups.google.com/group/carrierwave]
 * Check out the {example app}[http://github.com/jnicklas/carrierwave-example-app]
+* Instructions for setting up a development environment are at the bottom of this file
 
 == Getting Started
 
@@ -275,7 +276,7 @@ It's a good idea to test you uploaders in isolation. In order to speed up your
 tests, it's recommended to switch off processing in your tests, and to use the
 file storage. In Rails you could do that by adding an initializer with:
 
-    if Rails.env.test?
+    if Rails.env.test? or Rails.env.cucumber?
       CarrierWave.configure do |config|
         config.storage = :file
         config.enable_processing = false
@@ -302,7 +303,7 @@ CarrierWave comes with some RSpec matchers which you may find useful:
 
       context 'the thumb version' do
         it "should scale down a landscape image to be exactly 64 by 64 pixels" do
-          @uploader.thumb.should have_dimensions(200, 200)
+          @uploader.thumb.should have_dimensions(64, 64)
         end
       end
 
@@ -313,7 +314,7 @@ CarrierWave comes with some RSpec matchers which you may find useful:
       end
 
       it "should make the image readable only to the owner and not executable" do
-        @uploader.should have_premissions(0600)
+        @uploader.should have_permissions(0600)
       end
     end
 
@@ -507,6 +508,9 @@ These people have contributed their time and effort to CarrierWave:
 * Trevor Turk
 * Nicklas Ramhöj
 * Matt Hooks
+* Andreas Haller
+* Lars Pind
+* Ramon Soares
 
 == License
 
@@ -533,14 +537,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 == Development
 
-If you want to run the tests (and you should) it might be convenient to install
-the development dependencies, you can do that with:
+In order to setup a development environment and run the specs, you'll
+need to install bundler:
 
-    sudo gem install carrierwave --development
+    gem install bundler --pre
 
-CarrierWave is still young, but most of it is pretty well documented. It is also
-extensively specced, and there are cucumber features for some common use cases.
-Just dig in and look at the source for more in-depth explanation of what things
-are doing.
+And then install the dependencies:
+
+    bundle install
+
+You should now be able to run the tests:
+
+    bundle exec rake spec
 
 Issues are reported on GitHub, pull requests are very welcome!

data/lib/carrierwave.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
 require 'fileutils'
-require 'carrierwave/core_ext/blank'
-require 'carrierwave/core_ext/module_setup'
-require 'carrierwave/core_ext/inheritable_attributes'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/concern'
 
 module CarrierWave
 
-  VERSION = "0.4.10"
+  VERSION = "0.4.5"
 
   class << self
     attr_accessor :root
@@ -80,8 +80,13 @@ if defined?(Merb)
 
 elsif defined?(Rails)
 
-  CarrierWave.root = File.join(Rails.root, 'public')
-  ActiveSupport::Dependencies.load_paths << File.join(Rails.root, "app", "uploaders")
+  module CarrierWave
+    class Railtie < Rails::Railtie
+      initializer "carrierwave.setup_paths" do
+        CarrierWave.root = Rails.root.join(Rails.public_path).to_s
+      end
+    end
+  end
 
 elsif defined?(Sinatra)
 

data/lib/carrierwave/orm/activerecord.rb

@@ -15,6 +15,8 @@ module CarrierWave
 
       alias_method :read_uploader, :read_attribute
       alias_method :write_uploader, :write_attribute
+      public :read_uploader
+      public :write_uploader
 
       validates_integrity_of column if uploader_option(column.to_sym, :validate_integrity)
       validates_processing_of column if uploader_option(column.to_sym, :validate_processing)

data/lib/carrierwave/processing/image_science.rb

@@ -4,6 +4,21 @@ require "image_science"
 
 module CarrierWave
   module ImageScience
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def resize_to_limit(width, height)
+        process :resize_to_limit => [width, height]
+      end
+
+      def resize_to_fit(width, height)
+        process :resize_to_fit => [width, height]
+      end
+
+      def resize_to_fill(width, height)
+        process :resize_to_fill => [width, height]
+      end
+    end
 
     ##
     # Resize the image to fit within the specified dimensions while retaining

data/lib/carrierwave/processing/mini_magick.rb

@@ -56,11 +56,7 @@ module CarrierWave
   #
   #
   module MiniMagick
-
-    def self.included(base)
-      super
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def convert(format)
@@ -103,7 +99,7 @@ module CarrierWave
     #
     def convert(format)
       manipulate! do |img|
-        img.format(format.to_s.upcase)
+        img.format(format.to_s.downcase)
         img = yield(img) if block_given?
         img
       end

data/lib/carrierwave/processing/rmagick.rb

@@ -68,11 +68,7 @@ module CarrierWave
   # http://rubyforge.org/forum/forum.php?thread_id=1374&forum_id=1618
   #
   module RMagick
-
-    def self.included(base)
-      super
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def convert(format)

data/lib/carrierwave/test/matchers.rb

@@ -111,10 +111,10 @@ module CarrierWave
 
       class ImageLoader # :nodoc:
         def self.load_image(filename)
-          if defined? MiniMagick
+          if defined? ::MiniMagick
             MiniMagickWrapper.new(filename)
           else
-            unless defined? Magick
+            unless defined? ::Magick
               begin
                 require 'rmagick'
               rescue LoadError

data/lib/carrierwave/uploader.rb

@@ -25,19 +25,19 @@ module CarrierWave
     class Base
       attr_reader :file
 
-      use CarrierWave::Uploader::Callbacks
-      use CarrierWave::Uploader::Proxy
-      use CarrierWave::Uploader::Url
-      use CarrierWave::Uploader::Mountable
-      use CarrierWave::Uploader::Cache
-      use CarrierWave::Uploader::Store
-      use CarrierWave::Uploader::Download
-      use CarrierWave::Uploader::Remove
-      use CarrierWave::Uploader::ExtensionWhitelist
-      use CarrierWave::Uploader::Processing
-      use CarrierWave::Uploader::Versions
-      use CarrierWave::Uploader::DefaultUrl
-      use CarrierWave::Uploader::Configuration
+      include CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Proxy
+      include CarrierWave::Uploader::Url
+      include CarrierWave::Uploader::Mountable
+      include CarrierWave::Uploader::Cache
+      include CarrierWave::Uploader::Store
+      include CarrierWave::Uploader::Download
+      include CarrierWave::Uploader::Remove
+      include CarrierWave::Uploader::ExtensionWhitelist
+      include CarrierWave::Uploader::Processing
+      include CarrierWave::Uploader::Versions
+      include CarrierWave::Uploader::DefaultUrl
+      include CarrierWave::Uploader::Configuration
     end # Base
 
   end # Uploader

data/lib/carrierwave/uploader/cache.rb

@@ -21,9 +21,10 @@ module CarrierWave
 
   module Uploader
     module Cache
+      extend ActiveSupport::Concern
 
-      depends_on CarrierWave::Uploader::Callbacks
-      depends_on CarrierWave::Uploader::Configuration
+      include CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Configuration
 
       module ClassMethods
 
@@ -38,7 +39,7 @@ module CarrierWave
         # === Note
         # 
         # This only works as long as you haven't done anything funky with your cache_dir.
-        # It's recommended that you keen cache files in one place only.
+        # It's recommended that you keep cache files in one place only.
         #
         def clean_cached_files!
           Dir.glob(File.expand_path(File.join(cache_dir, '*'), CarrierWave.root)).each do |dir|

data/lib/carrierwave/uploader/callbacks.rb

@@ -3,9 +3,10 @@
 module CarrierWave
   module Uploader
     module Callbacks
+      extend ActiveSupport::Concern
 
-      setup do
-        extlib_inheritable_accessor :_before_callbacks, :_after_callbacks
+      included do
+        class_inheritable_accessor :_before_callbacks, :_after_callbacks
       end
 
       def with_callbacks(kind, *args)
@@ -17,26 +18,24 @@ module CarrierWave
       module ClassMethods
         
         def _before_callbacks_for(kind) #:nodoc:
-          self._before_callbacks ||= {}
-          self._before_callbacks[kind] ||= []
-          self._before_callbacks[kind]
+          (self._before_callbacks || { kind => [] })[kind] || []
         end
 
         def _after_callbacks_for(kind) #:nodoc:
-          self._after_callbacks ||= {}
-          self._after_callbacks[kind] ||= []
-          self._after_callbacks[kind]
+          (self._after_callbacks || { kind => [] })[kind] || []
         end
 
-        def before(kind, callback)
-          _before_callbacks_for(kind) << callback
+        def before(kind, callback)          
+          self._before_callbacks ||= {}
+          self._before_callbacks[kind] = _before_callbacks_for(kind) + [callback]
         end
 
         def after(kind, callback)
-          _after_callbacks_for(kind) << callback
+          self._after_callbacks ||= {}
+          self._after_callbacks[kind] = _after_callbacks_for(kind) + [callback]
         end
       end # ClassMethods
 
     end # Callbacks
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/configuration.rb

@@ -2,7 +2,9 @@ module CarrierWave
 
   module Uploader
     module Configuration
-      setup do
+      extend ActiveSupport::Concern
+
+      included do
         add_config :root
         add_config :permissions
         add_config :storage_engines

data/lib/carrierwave/uploader/download.rb

@@ -5,10 +5,11 @@ require 'net/http'
 module CarrierWave
   module Uploader
     module Download
+      extend ActiveSupport::Concern
 
-      depends_on CarrierWave::Uploader::Callbacks
-      depends_on CarrierWave::Uploader::Configuration
-      depends_on CarrierWave::Uploader::Cache
+      include CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Configuration
+      include CarrierWave::Uploader::Cache
 
       class RemoteFile
         def initialize(uri)

data/lib/carrierwave/uploader/extension_whitelist.rb

@@ -3,8 +3,9 @@
 module CarrierWave
   module Uploader
     module ExtensionWhitelist
+      extend ActiveSupport::Concern
 
-      setup do
+      included do
         before :cache, :check_whitelist!
       end
 
@@ -34,4 +35,4 @@ module CarrierWave
 
     end # ExtensionWhitelist
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/processing.rb

@@ -3,10 +3,11 @@
 module CarrierWave
   module Uploader
     module Processing
+      extend ActiveSupport::Concern
 
-      depends_on CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Callbacks
 
-      setup do
+      included do
         after :cache, :process!
         after :recreate_versions, :process!
       end
@@ -81,4 +82,4 @@ module CarrierWave
 
     end # Processing
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/remove.rb

@@ -3,8 +3,9 @@
 module CarrierWave
   module Uploader
     module Remove
+      extend ActiveSupport::Concern
 
-      depends_on CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Callbacks
 
       ##
       # Removes the file and reset it
@@ -19,4 +20,4 @@ module CarrierWave
 
     end # Remove
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/store.rb

@@ -3,10 +3,11 @@
 module CarrierWave
   module Uploader
     module Store
+      extend ActiveSupport::Concern
 
-      depends_on CarrierWave::Uploader::Callbacks
-      depends_on CarrierWave::Uploader::Configuration
-      depends_on CarrierWave::Uploader::Cache
+      include CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Configuration
+      include CarrierWave::Uploader::Cache
 
       ##
       # Override this in your Uploader to change the filename.
@@ -86,4 +87,4 @@ module CarrierWave
 
     end # Store
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/versions.rb

@@ -3,10 +3,11 @@
 module CarrierWave
   module Uploader
     module Versions
+      extend ActiveSupport::Concern
 
-      depends_on CarrierWave::Uploader::Callbacks
+      include CarrierWave::Uploader::Callbacks
 
-      setup do
+      included do
         after :cache, :cache_versions!
         after :store, :store_versions!
         after :remove, :remove_versions!
@@ -153,4 +154,4 @@ module CarrierWave
 
     end # Versions
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/generators/uploader_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+require 'rails/generators/named_base'
+
+class UploaderGenerator < Rails::Generators::NamedBase
+  def create_uploader_file
+    template 'uploader.rb', File.join('app/uploaders', class_path, "#{file_name}.rb")
+  end
+  
+  def self.source_root
+    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 4
-  - 10
-  version: 0.4.10
+  - 5
+  - 0
+  - beta2
+  version: 0.5.0.beta2
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
+  type: :runtime
+  version_requirements: *id001
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -29,9 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/carrierwave/compatibility/paperclip.rb
-- lib/carrierwave/core_ext/blank.rb
-- lib/carrierwave/core_ext/inheritable_attributes.rb
-- lib/carrierwave/core_ext/module_setup.rb
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/datamapper.rb
@@ -63,12 +76,9 @@ files:
 - lib/carrierwave/uploader/versions.rb
 - lib/carrierwave/uploader.rb
 - lib/carrierwave.rb
-- rails_generators/uploader/templates/uploader.rb
-- rails_generators/uploader/uploader_generator.rb
-- rails_generators/uploader/USAGE
-- merb_generators/uploader_generator.rb
+- lib/generators/templates/uploader.rb
+- lib/generators/uploader_generator.rb
 - README.rdoc
-- Generators
 has_rdoc: true
 homepage: http://carrierwave.rubyforge.org
 licenses: []
@@ -90,11 +100,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: carrierwave

data/Generators

@@ -1,4 +0,0 @@
-scope 'merb-gen' do
-  dir = File.join(File.dirname(__FILE__), 'merb_generators/')
-  Merb.add_generators dir + 'uploader_generator'
-end

data/lib/carrierwave/core_ext/blank.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-
-unless "".respond_to?(:blank?)
-  # blank? methods for several different class types
-  class Object
-    # Returns true if the object is nil or empty (if applicable)
-    def blank?
-      nil? || (respond_to?(:empty?) && empty?)
-    end
-  end # class Object
-
-  class Numeric
-    # Numerics can't be blank
-    def blank?
-      false
-    end
-  end # class Numeric
-
-  class NilClass
-    # Nils are always blank
-    def blank?
-      true
-    end
-  end # class NilClass
-
-  class TrueClass
-    # True is not blank.
-    def blank?
-      false
-    end
-  end # class TrueClass
-
-  class FalseClass
-    # False is always blank.
-    def blank?
-      true
-    end
-  end # class FalseClass
-
-  class String
-    # Strips out whitespace then tests if the string is empty.
-    def blank?
-      strip.empty?
-    end
-  end # class String
-end

data/lib/carrierwave/core_ext/inheritable_attributes.rb

@@ -1,104 +0,0 @@
-# encoding: utf-8
-
-# Stolen from Rails 3
-
-# Copyright (c) 2005-2009 David Heinemeier Hansson
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# Retain for backward compatibility.  Methods are now included in Class.
-class Class
-  # Defines class-level inheritable attribute reader. Attributes are available to subclasses,
-  # each subclass has a copy of parent's attribute.
-  #
-  # @param *syms<Array[#to_s]> Array of attributes to define inheritable reader for.
-  # @return <Array[#to_s]> Array of attributes converted into inheritable_readers.
-  #
-  # @api public
-  #
-  # @todo Do we want to block instance_reader via :instance_reader => false
-  # @todo It would be preferable that we do something with a Hash passed in
-  #   (error out or do the same as other methods above) instead of silently
-  #   moving on). In particular, this makes the return value of this function
-  #   less useful.
-  def extlib_inheritable_reader(*ivars)
-    instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
-
-    ivars.each do |ivar|
-      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.#{ivar}
-          return @#{ivar} if self.object_id == #{self.object_id} || defined?(@#{ivar})
-          ivar = superclass.#{ivar}
-          return nil if ivar.nil? && !#{self}.instance_variable_defined?("@#{ivar}")
-          @#{ivar} = ivar && !ivar.is_a?(Module) && !ivar.is_a?(Numeric) && !ivar.is_a?(TrueClass) && !ivar.is_a?(FalseClass) ? ivar.dup : ivar
-        end
-      RUBY
-      unless instance_reader == false
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{ivar}
-            self.class.#{ivar}
-          end
-        RUBY
-      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.
-  #
-  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
-  #   define inheritable writer for.
-  # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
-  # @return <Array[#to_s]> An Array of the attributes that were made into inheritable writers.
-  #
-  # @api public
-  #
-  # @todo We need a style for class_eval <<-HEREDOC. I'd like to make it
-  #   class_eval(<<-RUBY, __FILE__, __LINE__), but we should codify it somewhere.
-  def extlib_inheritable_writer(*ivars)
-    instance_writer = ivars.pop[:writer] if ivars.last.is_a?(Hash)
-    ivars.each do |ivar|
-      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.#{ivar}=(obj)
-          @#{ivar} = obj
-        end
-      RUBY
-      unless instance_writer == false
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{ivar}=(obj) self.class.#{ivar} = obj end
-        RUBY
-      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.
-  #
-  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
-  #   define inheritable accessor for.
-  # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
-  # @return <Array[#to_s]> An Array of attributes turned into inheritable accessors.
-  #
-  # @api public
-  def extlib_inheritable_accessor(*syms)
-    extlib_inheritable_reader(*syms)
-    extlib_inheritable_writer(*syms)
-  end unless Class.respond_to?(:extlib_inheritable_accessor)
-end

data/lib/carrierwave/core_ext/module_setup.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-# Stolen from Rails 3
-
-# Copyright (c) 2005-2009 David Heinemeier Hansson
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class Module
-  attr_accessor :_setup_block
-  attr_accessor :_dependencies
-  
-  def setup(&blk)
-    @_setup_block = blk
-  end
-  
-  def use(mod)
-    return if self < mod
-    
-    (mod._dependencies || []).each do |dep|
-      use dep
-    end
-    # raise "Circular dependencies" if self < mod
-    include mod
-    extend mod.const_get("ClassMethods") if mod.const_defined?("ClassMethods")
-    class_eval(&mod._setup_block) if mod._setup_block
-  end
-  
-  def depends_on(mod)
-    return if self < mod
-    @_dependencies ||= []
-    @_dependencies << mod
-  end
-end

data/merb_generators/uploader_generator.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-module Merb
-  module Generators
-    class UploaderGenerator < NamedGenerator
-
-      def self.source_root
-        File.join(File.dirname(__FILE__), '..', '..', 'rails_generators', 'uploader', 'templates')
-      end
-
-      first_argument :name, :required => true, :desc => "The name of this uploader"
-
-      template :uploader do |t|
-        t.source = 'uploader.rb'
-        t.destination = "app/uploaders/#{file_name}_uploader.rb"
-      end
-    end
-
-    add :uploader, UploaderGenerator
-
-  end
-end

data/rails_generators/uploader/USAGE

@@ -1,2 +0,0 @@
-Description:
-    Generates a skeleton for a new uploader.

data/rails_generators/uploader/uploader_generator.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-
-class UploaderGenerator < Rails::Generator::NamedBase
-
-  def manifest
-    record do |m|
-      m.directory 'app/uploaders'
-      m.template  'uploader.rb', "app/uploaders/#{name.underscore}_uploader.rb"
-    end
-  end
-
-  def class_name
-    name.camelize
-  end
-
-  protected
-
-  def banner
-    "Usage: #{$0} uploader UploaderName"
-  end
-end