Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

2 files changed, 0 insertions, 58 deletions

diff --git a/railties/lib/generators/rails/resource/USAGE b/railties/lib/generators/rails/resource/USAGE
deleted file mode 100644
index e359cd574f..0000000000
--- a/railties/lib/generators/rails/resource/USAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-Description:
-    Stubs out a new resource including an empty model and controller suitable
-    for a restful, resource-oriented application. Pass the singular model name,
-    either CamelCased or under_scored, as the first argument, and an optional
-    list of attribute pairs.
-
-    Attribute pairs are field:type arguments specifying the
-    model's attributes. Timestamps are added by default, so you don't have to
-    specify them by hand as 'created_at:datetime updated_at:datetime'.
-
-    You don't have to think up every attribute up front, but it helps to
-    sketch out a few so you can start working with the model immediately.
-
-    This generator invokes your configured ORM and test framework, besides
-    creating helpers and add routes to config/routes.rb.
-
-    Unlike the scaffold generator, the resource generator does not create
-    views or add any methods to the generated controller.
-
-Examples:
-    `rails generate resource post` # no attributes
-    `rails generate resource post title:string body:text published:boolean`
-    `rails generate resource purchase order_id:integer amount:decimal`
diff --git a/railties/lib/generators/rails/resource/resource_generator.rb b/railties/lib/generators/rails/resource/resource_generator.rb
deleted file mode 100644
index 02c1c39209..0000000000
--- a/railties/lib/generators/rails/resource/resource_generator.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'rails/generators/resource_helpers'
-require 'generators/rails/model/model_generator'
-
-module Rails
-  module Generators
-    class ResourceGenerator < ModelGenerator #metagenerator
-      include ResourceHelpers
-
-      hook_for :resource_controller, :required => true do |controller|
-        invoke controller, [ controller_name, options[:actions] ]
-      end
-
-      class_option :actions, :type => :array, :banner => "ACTION ACTION", :default => [],
-                             :desc => "Actions for the resource controller"
-
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
-
-      def add_resource_route
-        return if options[:actions].present?
-        route "resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
-      end
-
-      protected
-
-        def pluralize?(name)
-          if options[:singleton]
-            name
-          else
-            name.pluralize
-          end
-        end
-
-    end
-  end
-end