RubyGems - actionpack - Versions diffs - 3.2.19 → 4.0.0 - Mend

actionpack 3.2.19 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (263) hide show

checksums.yaml +7 -0
data/CHANGELOG.md +850 -401
data/MIT-LICENSE +1 -1
data/README.rdoc +5 -288
data/lib/abstract_controller/asset_paths.rb +2 -2
data/lib/abstract_controller/base.rb +39 -37
data/lib/abstract_controller/callbacks.rb +101 -82
data/lib/abstract_controller/collector.rb +7 -3
data/lib/abstract_controller/helpers.rb +25 -13
data/lib/abstract_controller/layouts.rb +74 -74
data/lib/abstract_controller/logger.rb +1 -2
data/lib/abstract_controller/rendering.rb +30 -13
data/lib/abstract_controller/translation.rb +16 -1
data/lib/abstract_controller/url_for.rb +6 -6
data/lib/abstract_controller/view_paths.rb +1 -1
data/lib/abstract_controller.rb +1 -8
data/lib/action_controller/base.rb +46 -22
data/lib/action_controller/caching/fragments.rb +23 -53
data/lib/action_controller/caching.rb +46 -33
data/lib/action_controller/deprecated/integration_test.rb +3 -0
data/lib/action_controller/deprecated.rb +5 -1
data/lib/action_controller/log_subscriber.rb +16 -8
data/lib/action_controller/metal/conditional_get.rb +76 -32
data/lib/action_controller/metal/data_streaming.rb +20 -26
data/lib/action_controller/metal/exceptions.rb +19 -6
data/lib/action_controller/metal/flash.rb +24 -9
data/lib/action_controller/metal/force_ssl.rb +70 -12
data/lib/action_controller/metal/head.rb +25 -4
data/lib/action_controller/metal/helpers.rb +5 -9
data/lib/action_controller/metal/hide_actions.rb +0 -1
data/lib/action_controller/metal/http_authentication.rb +107 -83
data/lib/action_controller/metal/implicit_render.rb +1 -1
data/lib/action_controller/metal/instrumentation.rb +2 -1
data/lib/action_controller/metal/live.rb +175 -0
data/lib/action_controller/metal/mime_responds.rb +161 -47
data/lib/action_controller/metal/params_wrapper.rb +112 -74
data/lib/action_controller/metal/rack_delegation.rb +9 -3
data/lib/action_controller/metal/redirecting.rb +15 -20
data/lib/action_controller/metal/renderers.rb +11 -9
data/lib/action_controller/metal/rendering.rb +9 -1
data/lib/action_controller/metal/request_forgery_protection.rb +112 -19
data/lib/action_controller/metal/responder.rb +20 -19
data/lib/action_controller/metal/streaming.rb +12 -18
data/lib/action_controller/metal/strong_parameters.rb +520 -0
data/lib/action_controller/metal/testing.rb +13 -18
data/lib/action_controller/metal/url_for.rb +28 -25
data/lib/action_controller/metal.rb +17 -32
data/lib/action_controller/model_naming.rb +12 -0
data/lib/action_controller/railtie.rb +33 -17
data/lib/action_controller/railties/helpers.rb +22 -0
data/lib/action_controller/record_identifier.rb +18 -72
data/lib/action_controller/test_case.rb +251 -131
data/lib/action_controller/vendor/html-scanner.rb +4 -19
data/lib/action_controller.rb +15 -6
data/lib/action_dispatch/http/cache.rb +63 -11
data/lib/action_dispatch/http/filter_parameters.rb +18 -8
data/lib/action_dispatch/http/filter_redirect.rb +37 -0
data/lib/action_dispatch/http/headers.rb +49 -17
data/lib/action_dispatch/http/mime_negotiation.rb +24 -1
data/lib/action_dispatch/http/mime_type.rb +154 -100
data/lib/action_dispatch/http/mime_types.rb +1 -1
data/lib/action_dispatch/http/parameter_filter.rb +44 -46
data/lib/action_dispatch/http/parameters.rb +28 -28
data/lib/action_dispatch/http/rack_cache.rb +2 -3
data/lib/action_dispatch/http/request.rb +64 -18
data/lib/action_dispatch/http/response.rb +130 -35
data/lib/action_dispatch/http/upload.rb +63 -20
data/lib/action_dispatch/http/url.rb +98 -35
data/lib/action_dispatch/journey/backwards.rb +5 -0
data/lib/action_dispatch/journey/formatter.rb +146 -0
data/lib/action_dispatch/journey/gtg/builder.rb +162 -0
data/lib/action_dispatch/journey/gtg/simulator.rb +44 -0
data/lib/action_dispatch/journey/gtg/transition_table.rb +156 -0
data/lib/action_dispatch/journey/nfa/builder.rb +76 -0
data/lib/action_dispatch/journey/nfa/dot.rb +36 -0
data/lib/action_dispatch/journey/nfa/simulator.rb +47 -0
data/lib/action_dispatch/journey/nfa/transition_table.rb +163 -0
data/lib/action_dispatch/journey/nodes/node.rb +124 -0
data/lib/action_dispatch/journey/parser.rb +206 -0
data/lib/action_dispatch/journey/parser.y +47 -0
data/lib/action_dispatch/journey/parser_extras.rb +23 -0
data/lib/action_dispatch/journey/path/pattern.rb +196 -0
data/lib/action_dispatch/journey/route.rb +124 -0
data/lib/action_dispatch/journey/router/strexp.rb +24 -0
data/lib/action_dispatch/journey/router/utils.rb +54 -0
data/lib/action_dispatch/journey/router.rb +166 -0
data/lib/action_dispatch/journey/routes.rb +75 -0
data/lib/action_dispatch/journey/scanner.rb +61 -0
data/lib/action_dispatch/journey/visitors.rb +197 -0
data/lib/action_dispatch/journey/visualizer/fsm.css +34 -0
data/lib/action_dispatch/journey/visualizer/fsm.js +134 -0
data/lib/action_dispatch/journey/visualizer/index.html.erb +52 -0
data/lib/action_dispatch/journey.rb +5 -0
data/lib/action_dispatch/middleware/callbacks.rb +9 -4
data/lib/action_dispatch/middleware/cookies.rb +259 -114
data/lib/action_dispatch/middleware/debug_exceptions.rb +26 -17
data/lib/action_dispatch/middleware/exception_wrapper.rb +29 -3
data/lib/action_dispatch/middleware/flash.rb +58 -58
data/lib/action_dispatch/middleware/params_parser.rb +14 -29
data/lib/action_dispatch/middleware/public_exceptions.rb +30 -14
data/lib/action_dispatch/middleware/reloader.rb +6 -6
data/lib/action_dispatch/middleware/remote_ip.rb +145 -39
data/lib/action_dispatch/middleware/request_id.rb +2 -6
data/lib/action_dispatch/middleware/session/abstract_store.rb +22 -20
data/lib/action_dispatch/middleware/session/cookie_store.rb +82 -28
data/lib/action_dispatch/middleware/session/mem_cache_store.rb +8 -3
data/lib/action_dispatch/middleware/show_exceptions.rb +12 -45
data/lib/action_dispatch/middleware/ssl.rb +70 -0
data/lib/action_dispatch/middleware/stack.rb +6 -1
data/lib/action_dispatch/middleware/static.rb +2 -1
data/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb +14 -11
data/lib/action_dispatch/middleware/templates/rescues/_source.erb +25 -0
data/lib/action_dispatch/middleware/templates/rescues/_trace.erb +7 -9
data/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb +15 -9
data/lib/action_dispatch/middleware/templates/rescues/layout.erb +127 -5
data/lib/action_dispatch/middleware/templates/rescues/missing_template.erb +7 -2
data/lib/action_dispatch/middleware/templates/rescues/routing_error.erb +30 -15
data/lib/action_dispatch/middleware/templates/rescues/template_error.erb +39 -13
data/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb +6 -2
data/lib/action_dispatch/middleware/templates/routes/_route.html.erb +16 -0
data/lib/action_dispatch/middleware/templates/routes/_table.html.erb +144 -0
data/lib/action_dispatch/railtie.rb +16 -6
data/lib/action_dispatch/request/session.rb +181 -0
data/lib/action_dispatch/routing/inspector.rb +240 -0
data/lib/action_dispatch/routing/mapper.rb +540 -291
data/lib/action_dispatch/routing/polymorphic_routes.rb +16 -20
data/lib/action_dispatch/routing/redirection.rb +46 -29
data/lib/action_dispatch/routing/route_set.rb +207 -164
data/lib/action_dispatch/routing/routes_proxy.rb +2 -0
data/lib/action_dispatch/routing/url_for.rb +48 -33
data/lib/action_dispatch/routing.rb +48 -83
data/lib/action_dispatch/testing/assertions/dom.rb +3 -13
data/lib/action_dispatch/testing/assertions/response.rb +32 -40
data/lib/action_dispatch/testing/assertions/routing.rb +42 -41
data/lib/action_dispatch/testing/assertions/selector.rb +17 -22
data/lib/action_dispatch/testing/assertions/tag.rb +20 -23
data/lib/action_dispatch/testing/integration.rb +65 -51
data/lib/action_dispatch/testing/test_process.rb +9 -6
data/lib/action_dispatch/testing/test_request.rb +7 -3
data/lib/action_dispatch.rb +21 -15
data/lib/action_pack/version.rb +7 -6
data/lib/action_pack.rb +1 -1
data/lib/action_view/base.rb +15 -34
data/lib/action_view/buffers.rb +7 -1
data/lib/action_view/context.rb +4 -4
data/lib/action_view/dependency_tracker.rb +93 -0
data/lib/action_view/digestor.rb +85 -0
data/lib/action_view/flows.rb +1 -4
data/lib/action_view/helpers/active_model_helper.rb +3 -4
data/lib/action_view/helpers/asset_tag_helper.rb +215 -352
data/lib/action_view/helpers/asset_url_helper.rb +355 -0
data/lib/action_view/helpers/atom_feed_helper.rb +13 -10
data/lib/action_view/helpers/cache_helper.rb +150 -18
data/lib/action_view/helpers/capture_helper.rb +44 -31
data/lib/action_view/helpers/csrf_helper.rb +0 -2
data/lib/action_view/helpers/date_helper.rb +269 -248
data/lib/action_view/helpers/debug_helper.rb +10 -11
data/lib/action_view/helpers/form_helper.rb +931 -537
data/lib/action_view/helpers/form_options_helper.rb +341 -166
data/lib/action_view/helpers/form_tag_helper.rb +190 -90
data/lib/action_view/helpers/javascript_helper.rb +23 -16
data/lib/action_view/helpers/number_helper.rb +148 -329
data/lib/action_view/helpers/output_safety_helper.rb +3 -3
data/lib/action_view/helpers/record_tag_helper.rb +17 -22
data/lib/action_view/helpers/rendering_helper.rb +2 -2
data/lib/action_view/helpers/sanitize_helper.rb +3 -6
data/lib/action_view/helpers/tag_helper.rb +46 -33
data/lib/action_view/helpers/tags/base.rb +147 -0
data/lib/action_view/helpers/tags/check_box.rb +64 -0
data/lib/action_view/helpers/tags/checkable.rb +16 -0
data/lib/action_view/helpers/tags/collection_check_boxes.rb +43 -0
data/lib/action_view/helpers/tags/collection_helpers.rb +83 -0
data/lib/action_view/helpers/tags/collection_radio_buttons.rb +36 -0
data/lib/action_view/helpers/tags/collection_select.rb +28 -0
data/lib/action_view/helpers/tags/color_field.rb +25 -0
data/lib/action_view/helpers/tags/date_field.rb +13 -0
data/lib/action_view/helpers/tags/date_select.rb +72 -0
data/lib/action_view/helpers/tags/datetime_field.rb +22 -0
data/lib/action_view/helpers/tags/datetime_local_field.rb +19 -0
data/lib/action_view/helpers/tags/datetime_select.rb +8 -0
data/lib/action_view/helpers/tags/email_field.rb +8 -0
data/lib/action_view/helpers/tags/file_field.rb +8 -0
data/lib/action_view/helpers/tags/grouped_collection_select.rb +29 -0
data/lib/action_view/helpers/tags/hidden_field.rb +8 -0
data/lib/action_view/helpers/tags/label.rb +65 -0
data/lib/action_view/helpers/tags/month_field.rb +13 -0
data/lib/action_view/helpers/tags/number_field.rb +18 -0
data/lib/action_view/helpers/tags/password_field.rb +12 -0
data/lib/action_view/helpers/tags/radio_button.rb +31 -0
data/lib/action_view/helpers/tags/range_field.rb +8 -0
data/lib/action_view/helpers/tags/search_field.rb +24 -0
data/lib/action_view/helpers/tags/select.rb +40 -0
data/lib/action_view/helpers/tags/tel_field.rb +8 -0
data/lib/action_view/helpers/tags/text_area.rb +18 -0
data/lib/action_view/helpers/tags/text_field.rb +29 -0
data/lib/action_view/helpers/tags/time_field.rb +13 -0
data/lib/action_view/helpers/tags/time_select.rb +8 -0
data/lib/action_view/helpers/tags/time_zone_select.rb +20 -0
data/lib/action_view/helpers/tags/url_field.rb +8 -0
data/lib/action_view/helpers/tags/week_field.rb +13 -0
data/lib/action_view/helpers/tags.rb +39 -0
data/lib/action_view/helpers/text_helper.rb +130 -114
data/lib/action_view/helpers/translation_helper.rb +32 -16
data/lib/action_view/helpers/url_helper.rb +211 -270
data/lib/action_view/helpers.rb +2 -4
data/lib/action_view/locale/en.yml +1 -105
data/lib/action_view/log_subscriber.rb +6 -4
data/lib/action_view/lookup_context.rb +15 -28
data/lib/action_view/model_naming.rb +12 -0
data/lib/action_view/path_set.rb +8 -20
data/lib/action_view/railtie.rb +6 -22
data/lib/action_view/record_identifier.rb +84 -0
data/lib/action_view/renderer/abstract_renderer.rb +25 -19
data/lib/action_view/renderer/partial_renderer.rb +158 -81
data/lib/action_view/renderer/renderer.rb +8 -12
data/lib/action_view/renderer/streaming_template_renderer.rb +2 -5
data/lib/action_view/renderer/template_renderer.rb +12 -10
data/lib/action_view/routing_url_for.rb +107 -0
data/lib/action_view/template/error.rb +22 -12
data/lib/action_view/template/handlers/builder.rb +1 -1
data/lib/action_view/template/handlers/erb.rb +40 -19
data/lib/action_view/template/handlers/raw.rb +11 -0
data/lib/action_view/template/handlers.rb +12 -9
data/lib/action_view/template/resolver.rb +107 -53
data/lib/action_view/template/text.rb +12 -8
data/lib/action_view/template/types.rb +57 -0
data/lib/action_view/template.rb +25 -23
data/lib/action_view/test_case.rb +67 -42
data/lib/{action_controller → action_view}/vendor/html-scanner/html/document.rb +0 -0
data/lib/{action_controller → action_view}/vendor/html-scanner/html/node.rb +12 -12
data/lib/{action_controller → action_view}/vendor/html-scanner/html/sanitizer.rb +13 -2
data/lib/{action_controller → action_view}/vendor/html-scanner/html/selector.rb +9 -9
data/lib/{action_controller → action_view}/vendor/html-scanner/html/tokenizer.rb +1 -1
data/lib/{action_controller → action_view}/vendor/html-scanner/html/version.rb +0 -0
data/lib/action_view/vendor/html-scanner.rb +20 -0
data/lib/action_view.rb +17 -8
metadata +184 -214
data/lib/action_controller/caching/actions.rb +0 -185
data/lib/action_controller/caching/pages.rb +0 -187
data/lib/action_controller/caching/sweeping.rb +0 -97
data/lib/action_controller/deprecated/performance_test.rb +0 -1
data/lib/action_controller/metal/compatibility.rb +0 -65
data/lib/action_controller/metal/session_management.rb +0 -14
data/lib/action_controller/railties/paths.rb +0 -25
data/lib/action_dispatch/middleware/best_standards_support.rb +0 -30
data/lib/action_dispatch/middleware/body_proxy.rb +0 -30
data/lib/action_dispatch/middleware/head.rb +0 -18
data/lib/action_dispatch/middleware/rescue.rb +0 -26
data/lib/action_dispatch/testing/performance_test.rb +0 -10
data/lib/action_view/asset_paths.rb +0 -142
data/lib/action_view/helpers/asset_paths.rb +0 -7
data/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb +0 -146
data/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb +0 -93
data/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb +0 -193
data/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb +0 -148
data/lib/sprockets/assets.rake +0 -99
data/lib/sprockets/bootstrap.rb +0 -37
data/lib/sprockets/compressors.rb +0 -83
data/lib/sprockets/helpers/isolated_helper.rb +0 -13
data/lib/sprockets/helpers/rails_helper.rb +0 -182
data/lib/sprockets/helpers.rb +0 -6
data/lib/sprockets/railtie.rb +0 -62
data/lib/sprockets/static_compiler.rb +0 -56

data/lib/action_dispatch/middleware/templates/rescues/layout.erb CHANGED Viewed

@@ -4,7 +4,11 @@
   <meta charset="utf-8" />
   <title>Action Controller: Exception caught</title>
   <style>
-    body { background-color: #fff; color: #333; }
+    body {
+      background-color: #FAFAFA;
+      color: #333;
+      margin: 0px;
+    }
     body, p, ol, ul, td {
       font-family: helvetica, verdana, arial, sans-serif;
@@ -13,16 +17,134 @@
     }
     pre {
-      background-color: #eee;
-      padding: 10px;
       font-size: 11px;
       white-space: pre-wrap;
     }
-    a { color: #000; }
+    pre.box {
+      border: 1px solid #EEE;
+      padding: 10px;
+      margin: 0px;
+      width: 958px;
+    }
+    header {
+      color: #F0F0F0;
+      background: #C52F24;
+      padding: 0.5em 1.5em;
+    }
+    h1 {
+      margin: 0.2em 0;
+      line-height: 1.1em;
+      font-size: 2em;
+    }
+    h2 {
+      color: #C52F24;
+      line-height: 25px;
+    }
+    .details {
+      border: 1px solid #D0D0D0;
+      border-radius: 4px;
+      margin: 1em 0px;
+      display: block;
+      width: 978px;
+    }
+    .summary {
+      padding: 8px 15px;
+      border-bottom: 1px solid #D0D0D0;
+      display: block;
+    }
+    .details pre {
+      margin: 5px;
+      border: none;
+    }
+    #container {
+      box-sizing: border-box;
+      width: 100%;
+      padding: 0 1.5em;
+    }
+    .source * {
+      margin: 0px;
+      padding: 0px;
+    }
+    .source {
+      border: 1px solid #D9D9D9;
+      background: #ECECEC;
+      width: 978px;
+    }
+    .source pre {
+      padding: 10px 0px;
+      border: none;
+    }
+    .source .data {
+      font-size: 80%;
+      overflow: auto;
+      background-color: #FFF;
+    }
+    .info {
+      padding: 0.5em;
+    }
+    .source .data .line_numbers {
+      background-color: #ECECEC;
+      color: #AAA;
+      padding: 1em .5em;
+      border-right: 1px solid #DDD;
+      text-align: right;
+    }
+    .line {
+      padding-left: 10px;
+    }
+    .line:hover {
+      background-color: #F6F6F6;
+    }
+    .line.active {
+      background-color: #FFCCCC;
+    }
+    a { color: #980905; }
     a:visited { color: #666; }
-    a:hover { color: #fff; background-color:#000; }
+    a:hover { color: #C52F24; }
+    <%= yield :style %>
   </style>
+  <script>
+    var toggle = function(id) {
+      var s = document.getElementById(id).style;
+      s.display = s.display == 'none' ? 'block' : 'none';
+      return false;
+    }
+    var show = function(id) {
+      document.getElementById(id).style.display = 'block';
+    }
+    var hide = function(id) {
+      document.getElementById(id).style.display = 'none';
+    }
+    var toggleTrace = function() {
+      return toggle('blame_trace');
+    }
+    var toggleSessionDump = function() {
+      return toggle('session_dump');
+    }
+    var toggleEnvDump = function() {
+      return toggle('env_dump');
+    }
+  </script>
 </head>
 <body>

data/lib/action_dispatch/middleware/templates/rescues/missing_template.erb CHANGED Viewed

@@ -1,2 +1,7 @@
-<h1>Template is missing</h1>
-<p><%=h @exception.message %></p>
+<header>
+  <h1>Template is missing</h1>
+</header>
+<div id="container">
+  <h2><%= @exception.message %></h2>
+</div>

data/lib/action_dispatch/middleware/templates/rescues/routing_error.erb CHANGED Viewed

@@ -1,15 +1,30 @@
-<h1>Routing Error</h1>
-<p><pre><%=h @exception.message %></pre></p>
-<% unless @exception.failures.empty? %>
-  <p>
-    <h2>Failure reasons:</h2>
-    <ol>
-    <% @exception.failures.each do |route, reason| %>
-      <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
-    <% end %>
-    </ol>
-  </p>
-<% end %>
-<p>
-  Try running <code>rake routes</code> for more information on available routes.
-</p>
+<header>
+  <h1>Routing Error</h1>
+</header>
+<div id="container">
+  <h2><%= @exception.message %></h2>
+  <% unless @exception.failures.empty? %>
+    <p>
+      <h2>Failure reasons:</h2>
+      <ol>
+      <% @exception.failures.each do |route, reason| %>
+        <li><code><%= route.inspect.delete('\\') %></code> failed because <%= reason.downcase %></li>
+      <% end %>
+      </ol>
+    </p>
+  <% end %>
+  <%= render template: "rescues/_trace" %>
+  <% if @routes_inspector %>
+    <h2>
+      Routes
+    </h2>
+    <p>
+      Routes match in priority from top to bottom
+    </p>
+    <%= @routes_inspector.format(ActionDispatch::Routing::HtmlTableFormatter.new(self)) %>
+  <% end %>
+</div>

data/lib/action_dispatch/middleware/templates/rescues/template_error.erb CHANGED Viewed

@@ -1,17 +1,43 @@
-<h1>
-  <%=h @exception.original_exception.class.to_s %> in
-  <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
-</h1>
+<% @source_extract = @exception.source_extract(0, :html) %>
+<header>
+  <h1>
+    <%= @exception.original_exception.class.to_s %> in
+    <%= @request.parameters["controller"].camelize if @request.parameters["controller"] %>#<%= @request.parameters["action"] %>
+  </h1>
+</header>
-<p>
-  Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised:
-  <pre><code><%=h @exception.message %></code></pre>
-</p>
+<div id="container">
+  <p>
+    Showing <i><%= @exception.file_name %></i> where line <b>#<%= @exception.line_number %></b> raised:
+  </p>
+  <pre><code><%= @exception.message %></code></pre>
-<p>Extracted source (around line <b>#<%=h @exception.line_number %></b>):
-<pre><code><%=h @exception.source_extract %></code></pre></p>
+  <div class="source">
+    <div class="info">
+      <p>Extracted source (around line <strong>#<%= @exception.line_number %></strong>):</p>
+    </div>
+    <div class="data">
+    <table cellpadding="0" cellspacing="0" class="lines">
+      <tr>
+        <td>
+          <pre class="line_numbers">
+            <% @source_extract.keys.each do |line_number| %>
+<span><%= line_number -%></span>
+            <% end %>
+          </pre>
+        </td>
+<td width="100%">
+<pre>
+<% @source_extract.each do |line, source| -%><div class="line<%= " active" if line == @exception.line_number -%>"><%= source -%></div><% end -%>
+</pre>
+</td>
+    </tr>
+  </table>
+</div>
+</div>
-<p><%=h @exception.sub_template_message %></p>
+  <p><%= @exception.sub_template_message %></p>
-<%= render :template => "rescues/_trace" %>
-<%= render :template => "rescues/_request_and_response" %>
+  <%= render template: "rescues/_trace" %>
+  <%= render template: "rescues/_request_and_response" %>
+</div>

data/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb CHANGED Viewed

@@ -1,2 +1,6 @@
-<h1>Unknown action</h1>
-<p><%=h @exception.message %></p>
+<header>
+  <h1>Unknown action</h1>
+</header>
+<div id="container">
+  <h2><%= @exception.message %></h2>
+</div>

data/lib/action_dispatch/middleware/templates/routes/_route.html.erb ADDED Viewed

@@ -0,0 +1,16 @@
+<tr class='route_row' data-helper='path'>
+  <td data-route-name='<%= route[:name] %>'>
+    <% if route[:name].present? %>
+      <%= route[:name] %><span class='helper'>_path</span>
+    <% end %>
+  </td>
+  <td data-route-verb='<%= route[:verb] %>'>
+    <%= route[:verb] %>
+  </td>
+  <td data-route-path='<%= route[:path] %>' data-regexp='<%= route[:regexp] %>'>
+    <%= route[:path] %>
+  </td>
+  <td data-route-reqs='<%= route[:reqs] %>'>
+    <%= route[:reqs] %>
+  </td>
+</tr>

data/lib/action_dispatch/middleware/templates/routes/_table.html.erb ADDED Viewed

@@ -0,0 +1,144 @@
+<% content_for :style do %>
+  #route_table {
+    margin: 0 auto 0;
+    border-collapse: collapse;
+  }
+  #route_table td {
+    padding: 0 30px;
+  }
+  #route_table tr.bottom th {
+    padding-bottom: 10px;
+    line-height: 15px;
+  }
+  #route_table .matched_paths {
+    background-color: LightGoldenRodYellow;
+  }
+  #route_table .matched_paths {
+    border-bottom: solid 3px SlateGrey;
+  }
+  #path_search {
+    width: 80%;
+    font-size: inherit;
+  }
+<% end %>
+<table id='route_table' class='route_table'>
+  <thead>
+    <tr>
+      <th>Helper</th>
+      <th>HTTP Verb</th>
+      <th>Path</th>
+      <th>Controller#Action</th>
+    </tr>
+    <tr class='bottom'>
+      <th><%# Helper %>
+        <%= link_to "Path", "#", 'data-route-helper' => '_path',
+                    title: "Returns a relative path (without the http or domain)" %> /
+        <%= link_to "Url", "#", 'data-route-helper' => '_url',
+                    title: "Returns an absolute url (with the http and domain)"   %>
+      </th>
+      <th><%# HTTP Verb %>
+      </th>
+      <th><%# Path %>
+        <%= search_field(:path, nil, id: 'path_search', placeholder: "Path Match") %>
+      </th>
+      <th><%# Controller#action %>
+      </th>
+    </tr>
+  </thead>
+  <tbody class='matched_paths' id='matched_paths'>
+  </tbody>
+  <tbody>
+    <%= yield %>
+  </tbody>
+</table>
+<script type='text/javascript'>
+  function each(elems, func) {
+    if (!elems instanceof Array) { elems = [elems]; }
+    for (var i = 0, len = elems.length; i < len; i++) {
+      func(elems[i]);
+    }
+  }
+  function setValOn(elems, val) {
+    each(elems, function(elem) {
+      elem.innerHTML = val;
+    });
+  }
+  function onClick(elems, func) {
+    each(elems, function(elem) {
+      elem.onclick = func;
+    });
+  }
+  // Enables functionality to toggle between `_path` and `_url` helper suffixes
+  function setupRouteToggleHelperLinks() {
+    var toggleLinks = document.querySelectorAll('#route_table [data-route-helper]');
+    onClick(toggleLinks, function(){
+      var helperTxt   = this.getAttribute("data-route-helper"),
+          helperElems = document.querySelectorAll('[data-route-name] span.helper');
+      setValOn(helperElems, helperTxt);
+    });
+  }
+  // takes an array of elements with a data-regexp attribute and
+  // passes their their parent <tr> into the callback function
+  // if the regexp matchs a given path
+  function eachElemsForPath(elems, path, func) {
+    each(elems, function(e){
+      var reg = e.getAttribute("data-regexp");
+      if (path.match(RegExp(reg))) {
+        func(e.parentNode.cloneNode(true));
+      }
+    })
+  }
+  // Ensure path always starts with a slash "/" and remove params or fragments
+  function sanitizePath(path) {
+    var path = path.charAt(0) == '/' ? path : "/" + path;
+    return path.replace(/\#.*|\?.*/, '');
+  }
+  // Enables path search functionality
+  function setupMatchPaths() {
+    var regexpElems     = document.querySelectorAll('#route_table [data-regexp]'),
+        pathElem        = document.querySelector('#path_search'),
+        selectedSection = document.querySelector('#matched_paths'),
+        noMatchText     = '<tr><th colspan="4">None</th></tr>';
+    // Remove matches if no path is present
+    pathElem.onblur = function(e) {
+      if (pathElem.value === "") selectedSection.innerHTML = "";
+    }
+    // On key press perform a search for matching paths
+    pathElem.onkeyup = function(e){
+      var path        = sanitizePath(pathElem.value),
+          defaultText = '<tr><th colspan="4">Paths Matching (' + path + '):</th></tr>';
+      // Clear out results section
+      selectedSection.innerHTML= defaultText;
+      // Display matches if they exist
+      eachElemsForPath(regexpElems, path, function(e){
+        selectedSection.appendChild(e);
+      });
+      // If no match present, tell the user
+      if (selectedSection.innerHTML === defaultText) {
+        selectedSection.innerHTML = selectedSection.innerHTML + noMatchText;
+      }
+    }
+  }
+  setupMatchPaths();
+  setupRouteToggleHelperLinks();
+</script>

data/lib/action_dispatch/railtie.rb CHANGED Viewed

@@ -1,34 +1,44 @@
 require "action_dispatch"
 module ActionDispatch
-  class Railtie < Rails::Railtie
+  class Railtie < Rails::Railtie # :nodoc:
     config.action_dispatch = ActiveSupport::OrderedOptions.new
     config.action_dispatch.x_sendfile_header = nil
     config.action_dispatch.ip_spoofing_check = true
     config.action_dispatch.show_exceptions = true
-    config.action_dispatch.best_standards_support = true
     config.action_dispatch.tld_length = 1
     config.action_dispatch.ignore_accept_header = false
     config.action_dispatch.rescue_templates = { }
     config.action_dispatch.rescue_responses = { }
     config.action_dispatch.default_charset = nil
+    config.action_dispatch.rack_cache = false
+    config.action_dispatch.http_auth_salt = 'http authentication'
+    config.action_dispatch.signed_cookie_salt = 'signed cookie'
+    config.action_dispatch.encrypted_cookie_salt = 'encrypted cookie'
+    config.action_dispatch.encrypted_signed_cookie_salt = 'signed encrypted cookie'
-    config.action_dispatch.rack_cache = {
-      :metastore => "rails:/",
-      :entitystore => "rails:/",
-      :verbose => false
+    config.action_dispatch.default_headers = {
+      'X-Frame-Options' => 'SAMEORIGIN',
+      'X-XSS-Protection' => '1; mode=block',
+      'X-Content-Type-Options' => 'nosniff',
+      'X-UA-Compatible' => 'chrome=1'
     }
+    config.eager_load_namespaces << ActionDispatch
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
       ActionDispatch::Response.default_charset = app.config.action_dispatch.default_charset || app.config.encoding
+      ActionDispatch::Response.default_headers = app.config.action_dispatch.default_headers
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
       ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)
       config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
       ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
+      ActionDispatch.test_app = app
     end
   end
 end

data/lib/action_dispatch/request/session.rb ADDED Viewed

@@ -0,0 +1,181 @@
+require 'rack/session/abstract/id'
+module ActionDispatch
+  class Request < Rack::Request
+    # Session is responsible for lazily loading the session from store.
+    class Session # :nodoc:
+      ENV_SESSION_KEY         = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc:
+      ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc:
+      def self.create(store, env, default_options)
+        session_was = find env
+        session     = Request::Session.new(store, env)
+        session.merge! session_was if session_was
+        set(env, session)
+        Options.set(env, Request::Session::Options.new(store, env, default_options))
+        session
+      end
+      def self.find(env)
+        env[ENV_SESSION_KEY]
+      end
+      def self.set(env, session)
+        env[ENV_SESSION_KEY] = session
+      end
+      class Options #:nodoc:
+        def self.set(env, options)
+          env[ENV_SESSION_OPTIONS_KEY] = options
+        end
+        def self.find(env)
+          env[ENV_SESSION_OPTIONS_KEY]
+        end
+        def initialize(by, env, default_options)
+          @by       = by
+          @env      = env
+          @delegate = default_options.dup
+        end
+        def [](key)
+          if key == :id
+            @delegate.fetch(key) {
+              @delegate[:id] = @by.send(:extract_session_id, @env)
+            }
+          else
+            @delegate[key]
+          end
+        end
+        def []=(k,v);         @delegate[k] = v; end
+        def to_hash;          @delegate.dup; end
+        def values_at(*args); @delegate.values_at(*args); end
+      end
+      def initialize(by, env)
+        @by       = by
+        @env      = env
+        @delegate = {}
+        @loaded   = false
+        @exists   = nil # we haven't checked yet
+      end
+      def id
+        options[:id]
+      end
+      def options
+        Options.find @env
+      end
+      def destroy
+        clear
+        options = self.options || {}
+        new_sid = @by.send(:destroy_session, @env, options[:id], options)
+        options[:id] = new_sid # Reset session id with a new value or nil
+        # Load the new sid to be written with the response
+        @loaded = false
+        load_for_write!
+      end
+      def [](key)
+        load_for_read!
+        @delegate[key.to_s]
+      end
+      def has_key?(key)
+        load_for_read!
+        @delegate.key?(key.to_s)
+      end
+      alias :key? :has_key?
+      alias :include? :has_key?
+      def keys
+        @delegate.keys
+      end
+      def values
+        @delegate.values
+      end
+      def []=(key, value)
+        load_for_write!
+        @delegate[key.to_s] = value
+      end
+      def clear
+        load_for_write!
+        @delegate.clear
+      end
+      def to_hash
+        load_for_read!
+        @delegate.dup.delete_if { |_,v| v.nil? }
+      end
+      def update(hash)
+        load_for_write!
+        @delegate.update stringify_keys(hash)
+      end
+      def delete(key)
+        load_for_write!
+        @delegate.delete key.to_s
+      end
+      def inspect
+        if loaded?
+          super
+        else
+          "#<#{self.class}:0x#{(object_id << 1).to_s(16)} not yet loaded>"
+        end
+      end
+      def exists?
+        return @exists unless @exists.nil?
+        @exists = @by.send(:session_exists?, @env)
+      end
+      def loaded?
+        @loaded
+      end
+      def empty?
+        load_for_read!
+        @delegate.empty?
+      end
+      def merge!(other)
+        load_for_write!
+        @delegate.merge!(other)
+      end
+      private
+      def load_for_read!
+        load! if !loaded? && exists?
+      end
+      def load_for_write!
+        load! unless loaded?
+      end
+      def load!
+        id, session = @by.load_session @env
+        options[:id] = id
+        @delegate.replace(stringify_keys(session))
+        @loaded = true
+      end
+      def stringify_keys(other)
+        other.each_with_object({}) { |(key, value), hash|
+          hash[key.to_s] = value
+        }
+      end
+    end
+  end
+end