rails 0.14.2 → 0.14.3

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -11,7 +11,7 @@ class AppGenerator < Rails::Generator::Base
     super
     usage if args.empty?
     @destination_root = args.shift
-    @socket = MYSQL_SOCKET_LOCATIONS.find {|f| File.exists?(f) }
+    @socket = MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) }
     @socket = '/path/to/your/mysql.sock' if @socket.blank?
   end
 
@@ -26,7 +26,6 @@ class AppGenerator < Rails::Generator::Base
       # Root
       m.file "fresh_rakefile", "Rakefile"
       m.file "README",         "README"
-      m.file "CHANGELOG",      "CHANGELOG"
 
       # Application
       m.template "helpers/application.rb",        "app/controllers/application.rb"
@@ -38,8 +37,8 @@ class AppGenerator < Rails::Generator::Base
         :app_name => File.basename(File.expand_path(@destination_root)),
         :socket => @socket
       }
-      m.template "configs/routes.rb",    "config/routes.rb"
-      m.template "configs/apache.conf",  "public/.htaccess"
+      m.template "configs/routes.rb",     "config/routes.rb"
+      m.template "configs/apache.conf",   "public/.htaccess"
 
       # Environments
       m.file "environments/boot.rb",        "config/boot.rb"
@@ -49,7 +48,7 @@ class AppGenerator < Rails::Generator::Base
       m.file "environments/test.rb",        "config/environments/test.rb"
 
       # Scripts
-      %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server ).each do |file|
+      %w( about breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server plugin ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
 
@@ -68,11 +67,9 @@ class AppGenerator < Rails::Generator::Base
 
       # Javascripts
       m.file "html/javascripts/prototype.js",     "public/javascripts/prototype.js"
-      m.file "html/javascripts/scriptaculous.js", "public/javascripts/scriptaculous.js"
       m.file "html/javascripts/effects.js",       "public/javascripts/effects.js"
       m.file "html/javascripts/dragdrop.js",      "public/javascripts/dragdrop.js"
       m.file "html/javascripts/controls.js",      "public/javascripts/controls.js"
-      m.file "html/javascripts/slider.js",        "public/javascripts/slider.js"
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
@@ -103,7 +100,6 @@ class AppGenerator < Rails::Generator::Base
   # Installation skeleton.  Intermediate directories are automatically
   # created so don't sweat their absence here.
   BASEDIRS = %w(
-    app/apis
     app/controllers
     app/helpers
     app/models
@@ -129,8 +125,14 @@ class AppGenerator < Rails::Generator::Base
     vendor/plugins
   )
 
-  MYSQL_SOCKET_LOCATIONS = [ "/tmp/mysql.sock", #default
-                             "/var/run/mysqld/mysqld.sock", #debian/gentoo
-                             "/var/tmp/mysql.sock", # freebsd
-                             "/var/lib/mysql/mysql.sock" ]  #fedora
+  MYSQL_SOCKET_LOCATIONS = [
+    "/tmp/mysql.sock",                        # default
+    "/var/run/mysqld/mysqld.sock",            # debian/gentoo
+    "/var/tmp/mysql.sock",                    # freebsd
+    "/var/lib/mysql/mysql.sock",              # fedora
+    "/opt/local/lib/mysql/mysql.sock",        # fedora
+    "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
+    "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
+    "/opt/local/var/run/mysql5/mysqld.sock"   # mac + darwinports + mysql5
+  ]
 end

data/lib/rails_generator/generators/components/migration/migration_generator.rb

@@ -1,11 +1,58 @@
 class MigrationGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
-      m.directory File.join('db/migrate')
-      existing_migrations = Dir.glob("db/migrate/[0-9]*_#{file_name}.rb")
-      raise "Another migration already exists with the same name" unless existing_migrations.empty?
-      next_migration_number = Dir.glob("db/migrate/[0-9]*.rb").size + 1
-      m.template 'migration.rb', File.join('db/migrate', "#{next_migration_number}_#{file_name}.rb")
+      m.directory 'db/migrate'
+      m.migration_template 'migration.rb', 'db/migrate'
+    end
+  end
+
+  protected
+    def existing_migrations(file_name)
+      Dir.glob("db/migrate/[0-9]*_#{file_name}.rb")
+    end
+
+    def migration_exists?(file_name)
+      not existing_migrations(file_name).empty?
+    end
+
+    def current_migration_number
+      Dir.glob('db/migrate/[0-9]*.rb').inject(0) do |max, file_path|
+        n = File.basename(file_path).split('_', 2).first.to_i
+        if n > max then n else max end
+      end
+    end
+
+    def next_migration_number
+      current_migration_number + 1
+    end
+
+    def next_migration_string(padding = 3)
+      "%.#{padding}d" % next_migration_number
+    end
+end
+
+module Rails::Generator::Commands
+  # When creating, it knows to find the first available file in db/migrate and use the migration.rb template.
+  class Create
+    def migration_template(relative_source, relative_destination, template_options = {})
+      raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name)
+      template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options)
+    end
+  end
+
+  # When deleting, it knows to delete every file named "[0-9]*_#{file_name}".
+  class Destroy
+    def migration_template(relative_source, relative_destination, template_options = {})
+      raise "There is no migration named #{file_name}" unless migration_exists?(file_name)
+      existing_migrations(file_name).each do |file_path|
+        file(relative_source, file_path, template_options)
+      end
+    end
+  end
+
+  class List
+    def migration_template(relative_source, relative_destination, options = {})
+      logger.migration_template file_name
     end
   end
 end

data/lib/rails_generator/generators/components/model/templates/fixtures.yml

@@ -1,5 +1,5 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first_<%= singular_name %>:
+first:
   id: 1
-another_<%= singular_name %>:
+another:
   id: 2

data/lib/rails_generator/generators/components/model/templates/unit_test.rb

@@ -3,12 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 class <%= class_name %>Test < Test::Unit::TestCase
   fixtures :<%= table_name %>
 
-  def setup
-    @<%= singular_name %> = <%= class_name %>.find(1)
-  end
-
   # Replace this with your real tests.
   def test_truth
-    assert_kind_of <%= class_name %>,  @<%= singular_name %>
+    assert_kind_of <%= class_name %>, <%= table_name %>(:first)
   end
 end

data/lib/rails_generator/generators/components/plugin/USAGE

@@ -0,0 +1,33 @@
+Description:
+    The plugin generator creates stubs for a new plugin.
+
+    The generator takes a plugin name as its argument.  The plugin name may be
+    given in CamelCase or under_score and should not be suffixed with 'Plugin'.
+
+    The generator creates a plugin directory in vendor/plugins that includes
+    both init.rb and README files as well as lib, task, and test directories.
+
+    It's also possible to generate stub files for a generator to go with the 
+    plugin by using --with-generator
+
+Example:
+    ./script/generate plugin BrowserFilters
+
+    This will create:
+        vendor/plugins/browser_filters/README
+        vendor/plugins/browser_filters/init.rb
+        vendor/plugins/browser_filters/lib/browser_filters.rb
+        vendor/plugins/browser_filters/test/browser_filters_test.rb
+        vendor/plugins/browser_filters/tasks/browser_filters_tasks.rake
+
+    ./script/generate plugin BrowserFilters --with-generator
+
+    This will create:
+        vendor/plugins/browser_filters/README
+        vendor/plugins/browser_filters/init.rb
+        vendor/plugins/browser_filters/lib/browser_filters.rb
+        vendor/plugins/browser_filters/test/browser_filters_test.rb
+        vendor/plugins/browser_filters/tasks/browser_filters_tasks.rake
+        vendor/plugins/browser_filters/generators/browser_filters/browser_filters_generator.rb
+        vendor/plugins/browser_filters/generators/browser_filters/USAGE
+        vendor/plugins/browser_filters/generators/browser_filters/templates/

data/lib/rails_generator/generators/components/plugin/plugin_generator.rb

@@ -0,0 +1,33 @@
+class PluginGenerator < Rails::Generator::NamedBase
+  attr_reader :plugin_path
+
+  def initialize(runtime_args, runtime_options = {})
+    @with_generator = runtime_args.delete("--with-generator")
+    super
+    @plugin_path = "vendor/plugins/#{file_name}"
+  end
+
+  def manifest
+    record do |m|
+      m.directory "#{plugin_path}/lib"
+      m.directory "#{plugin_path}/tasks"
+      m.directory "#{plugin_path}/test"
+
+      m.template 'README',        "#{plugin_path}/README"
+      m.template 'Rakefile',      "#{plugin_path}/Rakefile"
+      m.template 'init.rb',       "#{plugin_path}/init.rb"
+      m.template 'plugin.rb',     "#{plugin_path}/lib/#{file_name}.rb"
+      m.template 'tasks.rake',    "#{plugin_path}/tasks/#{file_name}_tasks.rake"
+      m.template 'unit_test.rb',  "#{plugin_path}/test/#{file_name}_test.rb"
+      
+      if @with_generator
+        m.directory "#{plugin_path}/generators"
+        m.directory "#{plugin_path}/generators/#{file_name}"
+        m.directory "#{plugin_path}/generators/#{file_name}/templates"
+
+        m.template 'generator.rb', "#{plugin_path}/generators/#{file_name}/#{file_name}_generator.rb"
+        m.template 'USAGE',        "#{plugin_path}/generators/#{file_name}/USAGE"
+      end
+    end
+  end
+end

data/lib/rails_generator/generators/components/plugin/templates/README

@@ -0,0 +1,4 @@
+<%= class_name %>
+<%= "=" * class_name.size %>
+
+Description goes here

data/lib/rails_generator/generators/components/plugin/templates/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the <%= file_name %> plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the <%= file_name %> plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = '<%= class_name %>'
+  rdoc.options << '--line-numbers --inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/rails_generator/generators/components/plugin/templates/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    ./script/generate <%= file_name %> Thing
+
+    This will create:
+        what/will/it/create

data/lib/rails_generator/generators/components/plugin/templates/generator.rb

@@ -0,0 +1,8 @@
+class <%= class_name %>Generator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      # m.directory "lib"
+      # m.template 'README', "README"
+    end
+  end
+end

data/lib/rails_generator/generators/components/plugin/templates/init.rb

@@ -0,0 +1 @@
+# Include hook code here

data/lib/rails_generator/generators/components/plugin/templates/plugin.rb

@@ -0,0 +1 @@
+# <%= class_name %>

data/lib/rails_generator/generators/components/plugin/templates/tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :<%= file_name %> do
+#   # Task goes here
+# end

data/lib/rails_generator/generators/components/plugin/templates/unit_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  # Replace this with your real tests.
+  def test_this_plugin
+    flunk
+  end
+end

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -46,9 +46,14 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
   def initialize(runtime_args, runtime_options = {})
     super
-    @controller_name = args.shift or (ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name)
+
+    # Take controller name from the next argument.  Default to the pluralized model name.
+    @controller_name = args.shift
+    @controller_name ||= ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
+
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
     @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
+
     if @controller_class_nesting.empty?
       @controller_class_name = @controller_class_name_without_nesting
     else

data/lib/rails_generator/generators/components/scaffold/templates/controller.rb

@@ -12,7 +12,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
 <% end -%>
   def list<%= suffix %>
-    @<%= singular_name %>_pages, @<%= plural_name %> = paginate :<%= singular_name %>, :per_page => 10
+    @<%= singular_name %>_pages, @<%= plural_name %> = paginate :<%= plural_name %>, :per_page => 10
   end
 
   def show<%= suffix %>

data/lib/rails_generator/generators/components/scaffold/templates/style.css

@@ -24,7 +24,7 @@ a:hover { color: #fff; background-color:#000; }
 
 #ErrorExplanation {
   width: 400px;
-  border: 2px solid 'red';
+  border: 2px solid red;
   padding: 7px;
   padding-bottom: 12px;
   margin-bottom: 20px;

data/lib/rails_generator/lookup.rb

@@ -99,6 +99,7 @@ module Rails
         def use_component_sources!
           reset_sources
           sources << PathSource.new(:app, "#{::RAILS_ROOT}/lib/generators") if defined? ::RAILS_ROOT
+          sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/**/generators") if defined? ::RAILS_ROOT
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
           sources << GemSource.new if Object.const_defined?(:Gem)
           sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")

data/lib/rails_info.rb

@@ -0,0 +1,94 @@
+require 'rails_version'
+
+module Rails
+  module Info
+    mattr_accessor :properties
+    class << (@@properties = [])
+      def names
+        map {|(name, )| name}
+      end
+      
+      def value_for(property_name)
+        find {|(name, )| name == property_name}.last rescue nil
+      end
+    end
+  
+    class << self #:nodoc:
+      def property(name, value = nil)
+        value ||= yield
+        properties << [name, value] if value 
+      rescue Exception
+      end
+
+      def components
+        %w( active_record action_pack action_web_service action_mailer active_support )
+      end
+      
+      def component_version(component)
+        require "#{component}/version"
+        "#{component.classify}::Version::STRING".constantize
+      end
+    
+      def edge_rails_revision(info = svn_info)
+        info[/^Revision: (\d+)/, 1]
+      end
+    
+      def to_s
+        column_width = properties.names.map {|name| name.length}.max
+        ["About your application's environment", *properties.map do |property|
+          "%-#{column_width}s   %s" % property
+        end] * "\n"
+      end
+
+      alias inspect to_s
+      
+    protected
+      def svn_info
+        Dir.chdir("#{RAILS_ROOT}/vendor/rails") do
+          silence_stderr { `svn info` }
+        end
+      end
+    end
+
+    # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)".
+    property 'Ruby version', "#{RUBY_VERSION} (#{RUBY_PLATFORM})"
+
+    # The RubyGems version, if it's installed.
+    property 'RubyGems version' do
+      Gem::RubyGemsVersion
+    end
+  
+    # The Rails version.
+    property 'Rails version' do
+      Rails::Version::STRING
+    end
+  
+    # Versions of each Rails component (Active Record, Action Pack, 
+    # Action Web Service, Action Mailer, and Active Support).
+    components.each do |component|
+      property "#{component.titlecase} version" do 
+        component_version(component)
+      end
+    end
+  
+    # The Rails SVN revision, if it's checked out into vendor/rails.
+    property 'Edge Rails revision' do
+      edge_rails_revision
+    end
+  
+    # The application's location on the filesystem.
+    property 'Application root' do
+      File.expand_path(RAILS_ROOT)
+    end
+
+    # The current Rails environment (development, test, or production).
+    property 'Environment' do
+      RAILS_ENV
+    end
+    
+    # The name of the database adapter for the current environment.
+    property 'Database adapter' do
+      ActiveRecord::Base.configurations[RAILS_ENV]['adapter']
+    end
+  end
+end

data/lib/rails_version.rb

@@ -2,7 +2,7 @@ module Rails
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 14
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end