railties 3.1.0.rc1 → 3.1.0.rc2

data/lib/rails/generators/rails/assets/USAGE

@@ -7,7 +7,7 @@ Description:
 
     This generates a JavaScript stub in app/assets/javascripts and a stylesheet
     stub in app/assets/stylesheets.
-    
+
     If CoffeeScript is available, JavaScripts will be generated with the .coffee extension.
     If Sass 3 is available, stylesheets will be generated with the .scss extension.
 

data/lib/rails/generators/rails/assets/assets_generator.rb

@@ -13,12 +13,6 @@ module Rails
           File.join('app/assets/javascripts', class_path, "#{asset_name}.#{javascript_extension}")
       end
 
-      def create_stylesheet_files
-        return unless options.stylesheets?
-        copy_file "stylesheet.#{stylesheet_extension}",
-          File.join('app/assets/stylesheets', class_path, "#{asset_name}.#{stylesheet_extension}")
-      end
-
       protected
 
       def asset_name
@@ -30,9 +24,8 @@ module Rails
           "js.#{options.javascript_engine}" : "js"
       end
 
-      def stylesheet_extension
-        options.stylesheet_engine.present? ?
-          "css.#{options.stylesheet_engine}" : "css"
+      hook_for :stylesheet_engine do |stylesheet_engine|
+        invoke stylesheet_engine, [name] if options[:stylesheets]
       end
     end
   end

data/lib/rails/generators/rails/plugin/templates/Rakefile.tt

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -14,10 +14,10 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Generate documentation for the <%= file_name %> plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.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
+end

data/lib/rails/generators/rails/plugin_new/templates/Rakefile

@@ -4,10 +4,15 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
-require 'rake/rdoctask'
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = '<%= camelized %>'
   rdoc.options << '--line-numbers' << '--inline-source'

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -11,21 +11,12 @@ module Rails
 
       hook_for :scaffold_controller, :required => true
 
-      def copy_stylesheets_file
-        if behavior == :invoke && options.stylesheets?
-          template "scaffold.#{stylesheet_extension}", "app/assets/stylesheets/scaffold.#{stylesheet_extension}"
-        end
-      end
-
       hook_for :assets do |assets|
         invoke assets, [controller_name]
       end
 
-      private
-
-      def stylesheet_extension
-        options.stylesheet_engine.present? ?
-          "css.#{options.stylesheet_engine}" : "css"
+      hook_for :stylesheet_engine do |stylesheet_engine|
+        invoke stylesheet_engine, [controller_name] if options[:stylesheets] && behavior == :invoke
       end
     end
   end

data/lib/rails/generators/test_unit/performance/templates/performance_test.rb

@@ -5,7 +5,7 @@ class <%= class_name %>Test < ActionDispatch::PerformanceTest
   # Refer to the documentation for all available options
   # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
   #                          :output => 'tmp/performance', :formats => [:flat] }
-  
+
   def test_homepage
     get '/'
   end

data/lib/rails/railtie.rb

@@ -173,24 +173,24 @@ module Rails
     def eager_load!
     end
 
-    def load_console(sandbox=false)
-      self.class.console.each { |block| block.call(sandbox) }
+    def load_console(app)
+      self.class.console.each { |block| block.call(app) }
     end
 
-    def load_tasks
+    def load_tasks(app)
       extend Rake::DSL if defined? Rake::DSL
-      self.class.rake_tasks.each(&:call)
+      self.class.rake_tasks.each { |block| block.call(app) }
 
       # load also tasks from all superclasses
       klass = self.class.superclass
       while klass.respond_to?(:rake_tasks)
-        klass.rake_tasks.each { |t| self.instance_exec(&t) }
+        klass.rake_tasks.each { |t| self.instance_exec(app, &t) }
         klass = klass.superclass
       end
     end
 
-    def load_generators
-      self.class.generators.each(&:call)
+    def load_generators(app)
+      self.class.generators.each { |block| block.call(app) }
     end
   end
 end

data/lib/rails/railtie/configurable.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module Rails
   class Railtie
     module Configurable

data/lib/rails/tasks/assets.rake

@@ -2,9 +2,20 @@ namespace :assets do
   desc "Compile all the assets named in config.assets.precompile"
   task :precompile => :environment do
     # Give assets access to asset_path
-    ActionView::Helpers::SprocketsHelper
+    Sprockets::Helpers::RailsHelper
 
     assets = Rails.application.config.assets.precompile
     Rails.application.assets.precompile(*assets)
   end
+
+  desc "Remove compiled assets"
+  task :clean => :environment do
+    assets = Rails.application.config.assets
+    public_asset_path = Rails.public_path + assets.prefix
+    file_list = FileList.new("#{public_asset_path}/*.js", "#{public_asset_path}/*.css")
+    file_list.each do |file|
+      rm file
+      rm "#{file}.gz", :force => true
+    end
+  end
 end

data/lib/rails/tasks/documentation.rake

@@ -1,7 +1,13 @@
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
-class RDocTaskWithoutDescriptions < Rake::RDocTask
+class RDocTaskWithoutDescriptions < RDoc::Task
   def define
     task rdoc_task_name
 

data/lib/rails/tasks/misc.rake

@@ -10,7 +10,7 @@ end
 desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
 task :secret do
   require 'active_support/secure_random'
-  puts ActiveSupport::SecureRandom.hex(64)
+  puts SecureRandom.hex(64)
 end
 
 desc 'List versions of all Rails frameworks and the environment'

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
+  hash: 15424097
   prerelease: 6
-  version: 3.1.0.rc1
+  segments: 
+  - 3
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -10,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -05:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -21,6 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :runtime
   version_requirements: *id001
@@ -32,6 +43,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
   type: :runtime
   version_requirements: *id002
@@ -43,6 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
   version_requirements: *id003
@@ -54,7 +75,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -65,7 +93,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id005
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
@@ -136,6 +171,7 @@ files:
 - guides/assets/images/nav_arrow.gif
 - guides/assets/images/polymorphic.png
 - guides/assets/images/posts_index.png
+- guides/assets/images/radar.png
 - guides/assets/images/rails_guides_logo.gif
 - guides/assets/images/rails_logo_remix.gif
 - guides/assets/images/rails_welcome.png
@@ -147,6 +183,7 @@ files:
 - guides/assets/images/tab_yellow.gif
 - guides/assets/images/tab_yellow.png
 - guides/assets/images/validation_error_messages.png
+- guides/assets/images/vijaydev.jpg
 - guides/assets/javascripts/guides.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
@@ -275,6 +312,9 @@ files:
 - lib/rails/generators/active_model.rb
 - lib/rails/generators/app_base.rb
 - lib/rails/generators/base.rb
+- lib/rails/generators/css/assets/assets_generator.rb
+- lib/rails/generators/css/assets/templates/stylesheet.css
+- lib/rails/generators/css/scaffold/scaffold_generator.rb
 - lib/rails/generators/erb/controller/controller_generator.rb
 - lib/rails/generators/erb/controller/templates/view.html.erb
 - lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -340,7 +380,6 @@ files:
 - lib/rails/generators/rails/assets/templates/javascript.js
 - lib/rails/generators/rails/assets/templates/javascript.js.coffee
 - lib/rails/generators/rails/assets/templates/stylesheet.css
-- lib/rails/generators/rails/assets/templates/stylesheet.css.scss
 - lib/rails/generators/rails/assets/USAGE
 - lib/rails/generators/rails/controller/controller_generator.rb
 - lib/rails/generators/rails/controller/templates/controller.rb
@@ -397,7 +436,6 @@ files:
 - lib/rails/generators/rails/resource/USAGE
 - lib/rails/generators/rails/scaffold/scaffold_generator.rb
 - lib/rails/generators/rails/scaffold/templates/scaffold.css
-- lib/rails/generators/rails/scaffold/templates/scaffold.css.scss
 - lib/rails/generators/rails/scaffold/USAGE
 - lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
 - lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -472,7 +510,6 @@ files:
 - lib/rails/generators/rails/app/templates/test/unit/.empty_directory
 - lib/rails/generators/rails/generator/templates/templates/.empty_directory
 - lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -487,17 +524,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.

data/lib/rails/generators/rails/scaffold/templates/scaffold.css.scss

@@ -1,58 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a { 
-  color: #000;
-  &:visited { color: #666; }
-  &:hover { color: #fff; background-color:#000; }
-}
-
-div.field, div.actions {
-  margin-bottom: 10px;
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-  
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0px;
-    background-color: #c00;
-    color: #fff;
-  }
-  
-  ul li {
-    font-size: 12px;
-    list-style: square;
-  }
-}