rails 0.9.5 → 0.10.0

data/lib/rails_generator/scripts.rb

@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/options'
+
+module Rails
+  module Generator
+    module Scripts
+
+      # Generator scripts handle command-line invocation.  Each script
+      # responds to an invoke! class method which handles option parsing
+      # and generator invocation.
+      class Base
+        include Options
+        default_options :collision => :ask, :quiet => false
+
+        # Run the generator script.  Takes an array of unparsed arguments
+        # and a hash of parsed arguments, takes the generator as an option
+        # or first remaining argument, and invokes the requested command.
+        def run(args = [], runtime_options = {})
+          begin
+            parse!(args.dup, runtime_options)
+          rescue OptionParser::InvalidOption => e
+            # Don't cry, script. Generators want what you think is invalid.
+          end
+
+          # Generator name is the only required option.
+          unless options[:generator]
+            usage if args.empty?
+            options[:generator] ||= args.shift
+          end
+
+          # Look up generator instance and invoke command on it.
+          Rails::Generator::Base.instance(options[:generator], args, options).command(options[:command]).invoke!
+        rescue => e
+          puts e
+          puts "  #{e.backtrace.join("\n  ")}\n" if options[:backtrace]
+          raise SystemExit
+        end
+
+        protected
+          # Override with your own script usage banner.
+          def banner
+            "Usage: #{$0} [options] generator [args]"
+          end
+
+          def usage_message
+            usage = "\nInstalled Generators\n"
+            Rails::Generator::Base.sources.each do |source|
+              label = source.label.to_s.capitalize
+              names = source.names
+              usage << "  #{label}: #{names.join(', ')}\n" unless names.empty?
+            end
+
+            usage << <<end_blurb
+
+More are available at http://rubyonrails.org/show/Generators
+  1. Download, for example, login_generator.zip
+  2. Unzip to directory #{Dir.user_home}/.rails/generators/login
+     to use the generator with all your Rails apps
+end_blurb
+
+            if Object.const_defined?(:RAILS_ROOT)
+              usage << <<end_blurb
+     or to #{File.expand_path(RAILS_ROOT)}/script/generators/login
+     to use with this app only.
+end_blurb
+            end
+
+            usage << <<end_blurb
+  3. Run generate with no arguments for usage information
+       #{$0} login
+
+Generator gems are also available:
+  1. gem list generator -s http://gems.rubyonrails.org
+  2. gem install login_generator -s http://gems.rubyonrails.org
+  3. #{$0} login
+
+end_blurb
+            return usage
+          end
+      end # Base
+
+    end
+  end
+end

data/lib/rails_generator/scripts/destroy.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../scripts'
+
+module Rails::Generator::Scripts
+  class Destroy < Base
+    mandatory_options :command => :destroy
+  end
+end

data/lib/rails_generator/scripts/generate.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../scripts'
+
+module Rails::Generator::Scripts
+  class Generate < Base
+    mandatory_options :command => :create
+  end
+end

data/lib/rails_generator/scripts/update.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../scripts'
+
+module Rails::Generator::Scripts
+  class Update < Base
+    mandatory_options :command => :update
+
+    protected
+      def banner
+        "Usage: #{$0} [options] scaffold"
+      end
+  end
+end

data/lib/rails_generator/simple_logger.rb

@@ -0,0 +1,46 @@
+module Rails
+  module Generator
+    class SimpleLogger # :nodoc:
+      attr_reader :out
+      attr_accessor :quiet
+
+      def initialize(out = $stdout)
+        @out = out
+        @quiet = false
+        @level = 0
+      end
+
+      def log(status, message, &block)
+        @out.print("%12s  %s%s\n" % [status, '  ' * @level, message]) unless quiet
+        indent(&block) if block_given?
+      end
+
+      def indent(&block)
+        @level += 1
+        if block_given?
+          begin
+            block.call
+          ensure
+            outdent
+          end
+        end
+      end
+
+      def outdent
+        @level -= 1
+        if block_given?
+          begin
+            block.call
+          ensure
+            indent
+          end
+        end
+      end
+
+      private
+        def method_missing(method, *args, &block)
+          log(method.to_s, args.first, &block)
+        end
+    end
+  end
+end

data/lib/rails_generator/spec.rb

@@ -0,0 +1,44 @@
+module Rails
+  module Generator
+    # A spec knows where a generator was found and how to instantiate it.
+    # Metadata include the generator's name, its base path, and the source
+    # which yielded it (PathSource, GemSource, etc.)
+    class Spec
+      attr_reader :name, :path, :source
+
+      def initialize(name, path, source)
+        @name, @path, @source = name, path, source
+      end
+
+      # Look up the generator class.  Require its class file, find the class
+      # in ObjectSpace, tag it with this spec, and return.
+      def klass
+        unless @klass
+          require class_file
+          @klass = lookup_class
+          @klass.spec = self
+        end
+        @klass
+      end
+
+      def class_file
+        "#{path}/#{name}_generator.rb"
+      end
+
+      def class_name
+        "#{name.camelize}Generator"
+      end
+
+      private
+        # Search for the first Class descending from Rails::Generator::Base
+        # whose name matches the requested class name.
+        def lookup_class
+          ObjectSpace.each_object(Class) do |obj|
+            return obj if obj.ancestors.include?(Rails::Generator::Base) and
+                          obj.name.split('::').last == class_name
+          end
+          raise NameError, "Missing #{class_name} class in #{class_file}"
+        end
+    end
+  end
+end

data/lib/webrick_server.rb

@@ -6,6 +6,7 @@ require 'stringio'
 
 include WEBrick
 
+
 class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
   REQUEST_MUTEX = Mutex.new
 
@@ -17,6 +18,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
     trap("INT") { server.shutdown }
     server.start
+    Dir::chdir(OPTIONS['working_directory']) if OPTIONS['working_directory']
   end
 
   def initialize(server, options)
@@ -27,14 +29,10 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def do_GET(req, res)
     begin
-      unless handle_index(req, res)
+      unless handle_file(req, res)
+        REQUEST_MUTEX.lock
         unless handle_dispatch(req, res)
-          unless handle_file(req, res)
-            REQUEST_MUTEX.lock
-            unless handle_mapped(req, res)
-              raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
-            end
-          end
+          raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
         end
       end
     ensure
@@ -44,48 +42,31 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   alias :do_POST :do_GET
 
-  def handle_index(req, res)
-    if req.request_uri.path == "/"
-      if @server_options[:index_controller]
-        res.set_redirect WEBrick::HTTPStatus::MovedPermanently, "/#{@server_options[:index_controller]}/"
-      else
-        res.set_redirect WEBrick::HTTPStatus::MovedPermanently, "/_doc/"
-      end
-
-      return true
-    else
-      return false
-    end
-  end
-
   def handle_file(req, res)
     begin
+      add_dot_html(req)
       @file_handler.send(:do_GET, req, res)
+      remove_dot_html(req)
       return true
     rescue HTTPStatus::PartialContent, HTTPStatus::NotModified => err
       res.set_error(err)
       return true
     rescue => err
       return false
+    ensure
+      remove_dot_html(req)
     end
   end
 
-  def handle_mapped(req, res)
-    if mappings = DispatchServlet.parse_uri(req.request_uri.path)
-      query = mappings.collect { |pair| "#{pair.first}=#{pair.last}" }.join("&")
-      query << "&#{req.request_uri.query}" if req.request_uri.query
-      origin = req.request_uri.path + "?" + query
-      req.request_uri.path = "/dispatch.rb"
-      req.request_uri.query = query
-      handle_dispatch(req, res, origin)
-    else
-      return false
-    end
+  def add_dot_html(req)
+    if /^([^.]+)$/ =~ req.path && req.path != "/" then req.instance_variable_set(:@path_info, "#{$1}.html") end
+  end
+  
+  def remove_dot_html(req)
+    if /^([^.]+).html$/ =~ req.path && req.path != "/" then req.instance_variable_set(:@path_info, $1) end
   end
 
   def handle_dispatch(req, res, origin = nil)
-    return false unless /^\/dispatch\.(?:cgi|rb|fcgi)$/.match(req.request_uri.path)
-
     env = req.meta_vars.clone
     env["QUERY_STRING"] = req.request_uri.query
     env["REQUEST_URI"] = origin if origin
@@ -120,35 +101,4 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
     p err, err.backtrace
     return false
   end
-  
-  def self.parse_uri(path)
-    component, id = /([-_a-zA-Z0-9]+)/, /([0-9]+)/
-
-    case path.sub(%r{^/(?:fcgi|mruby|cgi)/}, "/")
-      when %r{^/#{component}/?$} then
-        { :controller => $1, :action => "index" }
-      when %r{^/#{component}/#{component}$} then
-        { :controller => $1, :action => $2 }
-      when %r{^/#{component}/#{component}/#{id}$} then
-        { :controller => $1, :action => $2, :id => $3 }
-
-      when %r{^/#{component}/#{component}/$} then
-        { :module => $1, :controller => $2, :action => "index" }
-      when %r{^/#{component}/#{component}/#{component}$} then
-        if DispatchServlet.modules(component).include?($1)
-          { :module => $1, :controller => $2, :action => $3 }
-        else
-          { :controller => $1, :action => $2, :id => $3 }
-        end
-      when %r{^/#{component}/#{component}/#{component}/#{id}$} then
-        { :module => $1, :controller => $2, :action => $3, :id => $4 }
-      else
-        false
-    end
-  end  
-
-  def self.modules(module_pattern = '[^.]+')
-    path = RAILS_ROOT + '/app/controllers'
-    Dir.entries(path).grep(/^#{module_pattern}$/).find_all {|e| File.directory?("#{path}/#{e}")}
-  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2005-01-25
+  version: 0.10.0
+date: 2005-02-24
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -36,7 +36,6 @@ files:
   - doc
   - environments
   - fresh_rakefile
-  - generators
   - helpers
   - html
   - lib
@@ -48,13 +47,16 @@ files:
   - bin/breakpointer
   - bin/breakpointer_for_gem
   - bin/console
+  - bin/console_sandbox.rb
+  - bin/destroy
   - bin/generate
   - bin/rails
   - bin/server
+  - bin/update
   - configs/apache.conf
   - configs/database.yml
-  - doc/apache_protection
-  - doc/index.html
+  - configs/empty.log
+  - configs/routes.rb
   - doc/README_FOR_APP
   - dispatches/dispatch.fcgi
   - dispatches/dispatch.rb
@@ -66,42 +68,6 @@ files:
   - helpers/application.rb
   - helpers/application_helper.rb
   - helpers/test_helper.rb
-  - generators/controller
-  - generators/mailer
-  - generators/model
-  - generators/scaffold
-  - generators/controller/controller_generator.rb
-  - generators/controller/templates
-  - generators/controller/USAGE
-  - generators/controller/templates/controller.rb
-  - generators/controller/templates/functional_test.rb
-  - generators/controller/templates/helper.rb
-  - generators/controller/templates/view.rhtml
-  - generators/mailer/mailer_generator.rb
-  - generators/mailer/templates
-  - generators/mailer/USAGE
-  - generators/mailer/templates/fixture.rhtml
-  - generators/mailer/templates/mailer.rb
-  - generators/mailer/templates/unit_test.rb
-  - generators/mailer/templates/view.rhtml
-  - generators/model/model_generator.rb
-  - generators/model/templates
-  - generators/model/USAGE
-  - generators/model/templates/fixtures.yml
-  - generators/model/templates/model.rb
-  - generators/model/templates/unit_test.rb
-  - generators/scaffold/scaffold_generator.rb
-  - generators/scaffold/templates
-  - generators/scaffold/USAGE
-  - generators/scaffold/templates/controller.rb
-  - generators/scaffold/templates/fixtures.yml
-  - generators/scaffold/templates/functional_test.rb
-  - generators/scaffold/templates/layout.rhtml
-  - generators/scaffold/templates/style.css
-  - generators/scaffold/templates/view_edit.rhtml
-  - generators/scaffold/templates/view_list.rhtml
-  - generators/scaffold/templates/view_new.rhtml
-  - generators/scaffold/templates/view_show.rhtml
   - html/404.html
   - html/500.html
   - html/index.html
@@ -110,10 +76,68 @@ files:
   - lib/breakpoint_client.rb
   - lib/code_statistics.rb
   - lib/dispatcher.rb
+  - lib/rails_generator
   - lib/rails_generator.rb
   - lib/webrick_server.rb
+  - lib/rails_generator/base.rb
+  - lib/rails_generator/commands.rb
+  - lib/rails_generator/generators
+  - lib/rails_generator/lookup.rb
+  - lib/rails_generator/manifest.rb
+  - lib/rails_generator/options.rb
+  - lib/rails_generator/scripts
+  - lib/rails_generator/scripts.rb
+  - lib/rails_generator/simple_logger.rb
+  - lib/rails_generator/spec.rb
+  - lib/rails_generator/generators/applications
+  - lib/rails_generator/generators/components
+  - lib/rails_generator/generators/applications/app
+  - lib/rails_generator/generators/applications/app/app_generator.rb
+  - lib/rails_generator/generators/applications/app/USAGE
+  - lib/rails_generator/generators/components/controller
+  - lib/rails_generator/generators/components/mailer
+  - lib/rails_generator/generators/components/model
+  - lib/rails_generator/generators/components/scaffold
+  - lib/rails_generator/generators/components/controller/controller_generator.rb
+  - lib/rails_generator/generators/components/controller/templates
+  - lib/rails_generator/generators/components/controller/USAGE
+  - lib/rails_generator/generators/components/controller/templates/controller.rb
+  - lib/rails_generator/generators/components/controller/templates/functional_test.rb
+  - lib/rails_generator/generators/components/controller/templates/helper.rb
+  - lib/rails_generator/generators/components/controller/templates/view.rhtml
+  - lib/rails_generator/generators/components/mailer/mailer_generator.rb
+  - lib/rails_generator/generators/components/mailer/templates
+  - lib/rails_generator/generators/components/mailer/USAGE
+  - lib/rails_generator/generators/components/mailer/templates/fixture.rhtml
+  - lib/rails_generator/generators/components/mailer/templates/mailer.rb
+  - lib/rails_generator/generators/components/mailer/templates/unit_test.rb
+  - lib/rails_generator/generators/components/mailer/templates/view.rhtml
+  - lib/rails_generator/generators/components/model/model_generator.rb
+  - lib/rails_generator/generators/components/model/templates
+  - lib/rails_generator/generators/components/model/USAGE
+  - lib/rails_generator/generators/components/model/templates/fixtures.yml
+  - lib/rails_generator/generators/components/model/templates/model.rb
+  - lib/rails_generator/generators/components/model/templates/unit_test.rb
+  - lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+  - lib/rails_generator/generators/components/scaffold/templates
+  - lib/rails_generator/generators/components/scaffold/USAGE
+  - lib/rails_generator/generators/components/scaffold/templates/controller.rb
+  - lib/rails_generator/generators/components/scaffold/templates/form.rhtml
+  - lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
+  - lib/rails_generator/generators/components/scaffold/templates/helper.rb
+  - lib/rails_generator/generators/components/scaffold/templates/layout.rhtml
+  - lib/rails_generator/generators/components/scaffold/templates/style.css
+  - lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml
+  - lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
+  - lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
+  - lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml
+  - lib/rails_generator/scripts/destroy.rb
+  - lib/rails_generator/scripts/generate.rb
+  - lib/rails_generator/scripts/update.rb
 test_files: []
-rdoc_options: []
+rdoc_options: 
+  - "--exclude"
+  - "."
 extra_rdoc_files: []
 executables: 
   - rails
@@ -130,15 +154,25 @@ dependencies:
           - !ruby/object:Gem::Version 
             version: 0.4.15
       version: 
+  - !ruby/object:Gem::Dependency 
+    name: activesupport
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - "="
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+      version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
     version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "="
           - !ruby/object:Gem::Version 
-            version: 1.6.0
+            version: 1.7.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -146,9 +180,9 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "="
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: 1.5.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer
@@ -156,7 +190,17 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "="
+          - !ruby/object:Gem::Version 
+            version: 0.7.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: actionwebservice
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - "="
           - !ruby/object:Gem::Version 
-            version: 0.6.1
+            version: 0.5.0
       version: