railties 3.2.5 → 3.2.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 3.2.6 (Jun 12, 2012)
+
+*   No changes.
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   Add hook for resource route's generator. *Santiago Pastorino*

data/lib/rails/generators/erb/scaffold/templates/index.html.erb

@@ -17,7 +17,7 @@
 <% end -%>
     <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
     <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :confirm, "'Are you sure?'" %>, <%= key_value :method, ":delete" %> %></td>
+    <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :method, ":delete" %>, <%= key_value :data, "{ #{key_value :confirm, "'Are you sure?'"} }" %> %></td>
   </tr>
 <%% end %>
 </table>

data/lib/rails/generators/rails/controller/templates/controller.rb

@@ -1,7 +1,7 @@
 <% if namespaced? -%>
 require_dependency "<%= namespaced_file_path %>/application_controller"
-<% end -%>
 
+<% end -%>
 <% module_namespacing do -%>
 class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>

data/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
 <% if full? && !options[:skip_javascript] -%>
   # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
 <% end -%>
+<% unless options[:skip_active_record] -%>
 
   s.add_development_dependency "<%= gem_for_database %>"
+<% end -%>
 end

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

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-<% if full? && !options[:skip_active_record] -%>
+<% if full? && !options[:skip_active_record] && !options[:skip_test_unit] -%>
 APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 <% end %>

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

@@ -1,7 +1,7 @@
 <% if namespaced? -%>
 require_dependency "<%= namespaced_file_path %>/application_controller"
-<% end -%>
 
+<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
   # GET <%= route_url %>

data/lib/rails/tasks/framework.rake

@@ -20,7 +20,7 @@ namespace :rails do
       project_templates = "#{Rails.root}/lib/templates"
 
       default_templates = { "erb"   => %w{controller mailer scaffold},
-                            "rails" => %w{controller helper scaffold_controller stylesheets} }
+                            "rails" => %w{controller helper scaffold_controller assets} }
 
       default_templates.each do |type, names|
         local_template_type_dir = File.join(project_templates, type)

data/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 2
-  - 5
-  version: 3.2.5
+  - 6
+  version: 3.2.6
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -95,12 +95,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 3
         - 2
-        - 5
-        version: 3.2.5
+        - 6
+        version: 3.2.6
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -111,12 +111,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 3
         - 2
-        - 5
-        version: 3.2.5
+        - 6
+        version: 3.2.6
   type: :runtime
   version_requirements: *id006
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."