railties 3.1.0.rc4 → 3.1.0.rc5

data/lib/rails/tasks/engine.rake

@@ -67,3 +67,5 @@ def find_engine_path(path)
     find_engine_path(File.expand_path('..', path))
   end
 end
+
+Rake.application.invoke_task(:load_app)

data/lib/rails/tasks/framework.rake

@@ -2,14 +2,14 @@ namespace :rails do
   desc "Update configs and some other initially generated files (or use just update:configs, update:scripts, or update:application_controller)"
   task :update => [ "update:configs", "update:scripts", "update:application_controller" ]
 
-  desc "Applies the template supplied by LOCATION=/path/to/template"
+  desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
   task :template do
     template = ENV["LOCATION"]
+    raise "No LOCATION value given. Please set LOCATION either as path to a file or a URL" if template.blank?
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
-
     require 'rails/generators'
     require 'rails/generators/rails/app/app_generator'
-    generator = Rails::Generators::AppGenerator.new [ Rails.root ], {}, :destination_root => Rails.root
+    generator = Rails::Generators::AppGenerator.new [Rails.root], {}, :destination_root => Rails.root
     generator.apply template, :verbose => false
   end
 

data/lib/rails/tasks/tmp.rake

@@ -4,7 +4,7 @@ namespace :tmp do
 
   desc "Creates tmp directories for sessions, cache, sockets, and pids"
   task :create do
-    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids ))
+    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids tmp/cache/assets ))
   end
 
   namespace :sessions do

data/lib/rails/test_unit/testing.rake

@@ -104,9 +104,9 @@ namespace :test do
   Rake::TestTask.new(:uncommitted => "test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
-        changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
+        changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
       elsif File.directory?(".git")
-        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.map { |path| path.chomp }
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
       else
         abort "Not a Subversion or Git checkout."
       end

data/lib/rails/version.rb

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

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 15424109
-  prerelease: 6
+  prerelease: true
   segments: 
   - 3
   - 1
   - 0
-  - rc
-  - 4
-  version: 3.1.0.rc4
+  - rc5
+  version: 3.1.0.rc5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,17 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-07-25 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -39,11 +36,9 @@ dependencies:
   name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 14
@@ -55,11 +50,9 @@ dependencies:
   name: rack-ssl
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 3
@@ -71,11 +64,9 @@ dependencies:
   name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 3
         - 4
@@ -86,42 +77,36 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 4
-        version: 3.1.0.rc4
+        - rc5
+        version: 3.1.0.rc5
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 4
-        version: 3.1.0.rc4
+        - rc5
+        version: 3.1.0.rc5
   type: :runtime
   version_requirements: *id006
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
-executables: []
-
+executables: 
+- rails
 extensions: []
 
 extra_rdoc_files: []
@@ -129,6 +114,7 @@ extra_rdoc_files: []
 files: 
 - CHANGELOG
 - README.rdoc
+- bin/rails
 - guides/assets/images/belongs_to.png
 - guides/assets/images/book_icon.gif
 - guides/assets/images/bullet.gif
@@ -267,6 +253,7 @@ files:
 - guides/source/active_support_core_extensions.textile
 - guides/source/ajax_on_rails.textile
 - guides/source/api_documentation_guidelines.textile
+- guides/source/asset_pipeline.textile
 - guides/source/association_basics.textile
 - guides/source/caching_with_rails.textile
 - guides/source/command_line.textile
@@ -342,6 +329,8 @@ files:
 - lib/rails/generators/erb/scaffold/templates/show.html.erb
 - lib/rails/generators/erb.rb
 - lib/rails/generators/generated_attribute.rb
+- lib/rails/generators/js/assets/assets_generator.rb
+- lib/rails/generators/js/assets/templates/javascript.js
 - lib/rails/generators/migration.rb
 - lib/rails/generators/named_base.rb
 - lib/rails/generators/rails/app/app_generator.rb
@@ -355,6 +344,7 @@ files:
 - lib/rails/generators/rails/app/templates/config/boot.rb
 - lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
 - lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
@@ -393,7 +383,6 @@ files:
 - lib/rails/generators/rails/app/USAGE
 - lib/rails/generators/rails/assets/assets_generator.rb
 - 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/USAGE
 - lib/rails/generators/rails/controller/controller_generator.rb
@@ -430,6 +419,7 @@ files:
 - lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
 - lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt
 - lib/rails/generators/rails/plugin_new/templates/app/helpers/%name%/application_helper.rb.tt
+- lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt
 - lib/rails/generators/rails/plugin_new/templates/config/routes.rb
 - lib/rails/generators/rails/plugin_new/templates/Gemfile
 - lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -500,7 +490,6 @@ files:
 - lib/rails/script_rails_loader.rb
 - lib/rails/source_annotation_extractor.rb
 - lib/rails/tasks/annotations.rake
-- lib/rails/tasks/assets.rake
 - lib/rails/tasks/documentation.rake
 - lib/rails/tasks/engine.rake
 - lib/rails/tasks/framework.rake
@@ -525,6 +514,7 @@ 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: []
 
@@ -535,22 +525,18 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   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
@@ -559,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.

data/lib/rails/generators/rails/assets/templates/javascript.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

data/lib/rails/tasks/assets.rake

@@ -1,21 +0,0 @@
-namespace :assets do
-  desc "Compile all the assets named in config.assets.precompile"
-  task :precompile => :environment do
-    # Give assets access to asset_path
-    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