RubyGems - railties - Versions diffs - 4.0.13 → 4.1.0.beta1 - Mend

railties 4.0.13 → 4.1.0.beta1

Files changed (129) hide show

data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt CHANGED

@@ -1,4 +1,4 @@
-<%= app_const %>.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
   # In the development environment your application's code is reloaded on
@@ -20,7 +20,7 @@
   config.active_support.deprecation = :log
   <%- unless options.skip_active_record? -%>
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
   <%- end -%>
@@ -30,7 +30,4 @@
   # number of complex assets.
   config.assets.debug = true
   <%- end -%>
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
 end

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt CHANGED

@@ -1,4 +1,4 @@
-<%= app_const %>.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
   # Code is not reloaded between requests.

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt CHANGED

@@ -1,4 +1,4 @@
-<%= app_const %>.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
   # The test environment is used exclusively to run your application's
@@ -33,7 +33,4 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
 end

data/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt CHANGED

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
-<%= app_const %>.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>
+Rails.application.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>

data/lib/rails/generators/rails/app/templates/config/routes.rb CHANGED

@@ -1,4 +1,4 @@
-<%= app_const %>.routes.draw do
+Rails.application.routes.draw do
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

data/lib/rails/generators/rails/app/templates/config/{initializers/secret_token.rb.tt → secrets.yml} RENAMED

@@ -7,6 +7,14 @@
 # no regular words or you'll be exposed to dictionary attacks.
 # You can use `rake secret` to generate a secure secret key.
-# Make sure your secret_key_base is kept private
+# Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
-<%= app_const %>.config.secret_key_base = '<%= app_secret %>'
+development:
+  secret_key_base: <%= app_secret %>
+test:
+  secret_key_base: <%= app_secret %>
+production:
+  secret_key_base: <%= app_secret %>

data/lib/rails/generators/rails/app/templates/public/404.html CHANGED

@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,9 +57,11 @@
 <body>
   <!-- This file lives in public/404.html -->
   <div class="dialog">
-    <h1>The page you were looking for doesn't exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/lib/rails/generators/rails/app/templates/public/422.html CHANGED

@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,9 +57,11 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/lib/rails/generators/rails/app/templates/public/500.html CHANGED

@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,8 +57,10 @@
 <body>
   <!-- This file lives in public/500.html -->
   <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/lib/rails/generators/rails/controller/USAGE CHANGED

@@ -16,3 +16,4 @@ Example:
         Test:       test/controllers/credit_cards_controller_test.rb
         Views:      app/views/credit_cards/debit.html.erb [...]
         Helper:     app/helpers/credit_cards_helper.rb
+        Test:       test/helpers/credit_cards_helper_test.rb

data/lib/rails/generators/rails/controller/controller_generator.rb CHANGED

@@ -10,11 +10,45 @@ module Rails
       def add_routes
         actions.reverse.each do |action|
-          route %{get "#{file_name}/#{action}"}
+          route generate_routing_code(action)
         end
       end
       hook_for :template_engine, :test_framework, :helper, :assets
+      private
+        # This method creates nested route entry for namespaced resources.
+        # For eg. rails g controller foo/bar/baz index
+        # Will generate -
+        # namespace :foo do
+        #   namespace :bar do
+        #     get "baz/index"
+        #   end
+        # end
+        def generate_routing_code(action)
+          depth = class_path.length
+          # Create 'namespace' ladder
+          # namespace :foo do
+          #   namespace :bar do
+          namespace_ladder = class_path.each_with_index.map do |ns, i|
+            indent("namespace :#{ns} do\n", i * 2)
+          end.join
+          # Create route
+          #     get "baz/index"
+          route = indent(%{get "#{file_name}/#{action}"\n}, depth * 2)
+          # Create `end` ladder
+          #   end
+          # end
+          end_ladder = (1..depth).reverse_each.map do |i|
+            indent("end\n", i * 2)
+          end.join
+          # Combine the 3 parts to generate complete route entry
+          namespace_ladder + route + end_ladder
+        end
     end
   end
 end

data/lib/rails/generators/rails/generator/USAGE CHANGED

@@ -10,3 +10,4 @@ Example:
         lib/generators/awesome/awesome_generator.rb
         lib/generators/awesome/USAGE
         lib/generators/awesome/templates/
+        test/lib/generators/awesome_generator_test.rb

data/lib/rails/generators/rails/generator/generator_generator.rb CHANGED

@@ -10,6 +10,8 @@ module Rails
         directory '.', generator_dir
       end
+      hook_for :test_framework
       protected
         def generator_dir

data/lib/rails/generators/rails/model/USAGE CHANGED

@@ -46,18 +46,18 @@ Available field types:
         `rails generate model photo title:string album:references`
-    It will generate an album_id column. You should generate this kind of fields when
-    you will use a `belongs_to` association for instance. `references` also support
-    the polymorphism, you could enable the polymorphism like this:
+    It will generate an `album_id` column. You should generate these kinds of fields when
+    you will use a `belongs_to` association, for instance. `references` also supports
+    polymorphism, you can enable polymorphism like this:
         `rails generate model product supplier:references{polymorphic}`
-    For integer, string, text and binary fields an integer in curly braces will
+    For integer, string, text and binary fields, an integer in curly braces will
     be set as the limit:
         `rails generate model user pseudo:string{30}`
-    For decimal two integers separated by a comma in curly braces will be used
+    For decimal, two integers separated by a comma in curly braces will be used
     for precision and scale:
         `rails generate model product 'price:decimal{10,2}'`

data/lib/rails/generators/rails/{plugin_new → plugin}/USAGE RENAMED

File without changes

data/lib/rails/generators/rails/{plugin_new/plugin_new_generator.rb → plugin/plugin_generator.rb} RENAMED

@@ -154,7 +154,7 @@ task default: :test
   end
   module Generators
-    class PluginNewGenerator < AppBase # :nodoc:
+    class PluginGenerator < AppBase # :nodoc:
       add_shared_options_for "plugin"
       alias_method :plugin_path, :app_path
@@ -176,12 +176,16 @@ task default: :test
                                                  "skip adding entry to Gemfile"
       def initialize(*args)
-        raise Error, "Options should be given after the plugin name. For details run: rails plugin new --help" if args[0].blank?
         @dummy_path = nil
         super
+        unless plugin_path
+          raise Error, "Plugin name should be provided in arguments. For details run: rails plugin new --help"
+        end
       end
+      public_task :set_default_accessors!
+      public_task :apply_rails_template
       public_task :create_root
       def create_root_files
@@ -238,7 +242,6 @@ task default: :test
         build(:leftovers)
       end
-      public_task :apply_rails_template, :run_bundle
       def name
         @name ||= begin
@@ -252,6 +255,9 @@ task default: :test
         end
       end
+      public_task :run_bundle
+      public_task :replay_template
     protected
       def app_templates_dir

data/lib/rails/generators/rails/{plugin_new → plugin}/templates/%name%.gemspec RENAMED

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = "TODO"
   s.summary     = "TODO: Summary of <%= camelized %>."
   s.description = "TODO: Description of <%= camelized %>."
+  s.license     = "MIT"
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
 <% unless options.skip_test_unit? -%>

data/lib/rails/generators/rails/{plugin_new → plugin}/templates/Gemfile RENAMED

@@ -23,8 +23,23 @@ end
 <% if options.dev? || options.edge? -%>
 # Your gem is dependent on dev or edge Rails. Once you can lock this
 # dependency down to a specific version, move it to your gemspec.
-<%= rails_gemfile_entry -%>
+<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
+<% gemfile_entries.each do |gem| -%>
+<% if gem.comment -%>
+# <%= gem.comment %>
 <% end -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
+, '<%= gem.version %>'
+<% elsif gem.options.any? -%>
+,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
+  "#{k}: #{v.inspect}" }.join(', ') %>
+<% else %>
+<% end -%>
+<% end -%>
+<% end -%>
+<% unless defined?(JRUBY_VERSION) -%>
 # To use debugger
 # gem 'debugger'
+<% end -%>