actionpack 4.1.16 → 4.2.0.beta1

data/lib/action_dispatch/journey/formatter.rb

@@ -12,12 +12,12 @@ module ActionDispatch
         @cache  = nil
       end
 
-      def generate(type, name, options, recall = {}, parameterize = nil)
-        constraints = recall.merge(options)
+      def generate(name, options, path_parameters, parameterize = nil)
+        constraints = path_parameters.merge(options)
         missing_keys = []
 
         match_route(name, constraints) do |route|
-          parameterized_parts = extract_parameterized_parts(route, options, recall, parameterize)
+          parameterized_parts = extract_parameterized_parts(route, options, path_parameters, parameterize)
 
           # Skip this route unless a name has been provided or it is a
           # standard Rails route since we can't determine whether an options
@@ -30,11 +30,17 @@ module ActionDispatch
             parameterized_parts.key?(key) || route.defaults.key?(key)
           end
 
+          defaults       = route.defaults
+          required_parts = route.required_parts
+          parameterized_parts.delete_if do |key, value|
+            value.to_s == defaults[key].to_s && !required_parts.include?(key)
+          end
+
           return [route.format(parameterized_parts), params]
         end
 
         message = "No route matches #{Hash[constraints.sort].inspect}"
-        message << " missing required keys: #{missing_keys.sort.inspect}" unless missing_keys.empty?
+        message << " missing required keys: #{missing_keys.sort.inspect}" if name
 
         raise ActionController::UrlGenerationError, message
       end
@@ -74,12 +80,12 @@ module ActionDispatch
           if named_routes.key?(name)
             yield named_routes[name]
           else
-            routes = non_recursive(cache, options.to_a)
+            routes = non_recursive(cache, options)
 
             hash = routes.group_by { |_, r| r.score(options) }
 
             hash.keys.sort.reverse_each do |score|
-              next if score < 0
+              break if score < 0
 
               hash[score].sort_by { |i, _| i }.each do |_, route|
                 yield route
@@ -90,14 +96,14 @@ module ActionDispatch
 
         def non_recursive(cache, options)
           routes = []
-          stack  = [cache]
+          queue  = [cache]
 
-          while stack.any?
-            c = stack.shift
+          while queue.any?
+            c = queue.shift
             routes.concat(c[:___routes]) if c.key?(:___routes)
 
             options.each do |pair|
-              stack << c[pair] if c.key?(pair)
+              queue << c[pair] if c.key?(pair)
             end
           end
 
@@ -121,14 +127,9 @@ module ActionDispatch
         def possibles(cache, options, depth = 0)
           cache.fetch(:___routes) { [] } + options.find_all { |pair|
             cache.key?(pair)
-          }.map { |pair|
+          }.flat_map { |pair|
             possibles(cache[pair], options, depth + 1)
-          }.flatten(1)
-        end
-
-        # Returns +true+ if no missing keys are present, otherwise +false+.
-        def verify_required_parts!(route, parts)
-          missing_keys(route, parts).empty?
+          }
         end
 
         def build_cache

data/lib/action_dispatch/journey/gtg/builder.rb

@@ -27,7 +27,7 @@ module ActionDispatch
             marked[s] = true # mark s
 
             s.group_by { |state| symbol(state) }.each do |sym, ps|
-              u = ps.map { |l| followpos(l) }.flatten
+              u = ps.flat_map { |l| followpos(l) }
               next if u.empty?
 
               if u.uniq == [DUMMY]
@@ -90,7 +90,7 @@ module ActionDispatch
               firstpos(node.left)
             end
           when Nodes::Or
-            node.children.map { |c| firstpos(c) }.flatten.uniq
+            node.children.flat_map { |c| firstpos(c) }.uniq
           when Nodes::Unary
             firstpos(node.left)
           when Nodes::Terminal
@@ -105,7 +105,7 @@ module ActionDispatch
           when Nodes::Star
             firstpos(node.left)
           when Nodes::Or
-            node.children.map { |c| lastpos(c) }.flatten.uniq
+            node.children.flat_map { |c| lastpos(c) }.uniq
           when Nodes::Cat
             if nullable?(node.right)
               lastpos(node.left) | lastpos(node.right)

data/lib/action_dispatch/journey/gtg/simulator.rb

@@ -19,6 +19,14 @@ module ActionDispatch
         end
 
         def simulate(string)
+          ms = memos(string) { return }
+          MatchData.new(ms)
+        end
+
+        alias :=~    :simulate
+        alias :match :simulate
+
+        def memos(string)
           input = StringScanner.new(string)
           state = [0]
           while sym = input.scan(%r([/.?]|[^/.?]+))
@@ -29,15 +37,10 @@ module ActionDispatch
             tt.accepting? s
           }
 
-          return if acceptance_states.empty?
+          return yield if acceptance_states.empty?
 
-          memos = acceptance_states.map { |x| tt.memo(x) }.flatten.compact
-
-          MatchData.new(memos)
+          acceptance_states.flat_map { |x| tt.memo(x) }.compact
         end
-
-        alias :=~    :simulate
-        alias :match :simulate
       end
     end
   end

data/lib/action_dispatch/journey/gtg/transition_table.rb

@@ -40,7 +40,19 @@ module ActionDispatch
         end
 
         def move(t, a)
-          move_string(t, a).concat(move_regexp(t, a))
+          return [] if t.empty?
+
+          regexps = []
+
+          t.map { |s|
+            if states = @regexp_states[s]
+              regexps.concat states.map { |re, v| re === a ? v : nil }
+            end
+
+            if states = @string_states[s]
+              states[a]
+            end
+          }.compact.concat regexps
         end
 
         def as_json(options = nil)
@@ -114,17 +126,17 @@ module ActionDispatch
         end
 
         def states
-          ss = @string_states.keys + @string_states.values.map(&:values).flatten
-          rs = @regexp_states.keys + @regexp_states.values.map(&:values).flatten
+          ss = @string_states.keys + @string_states.values.flat_map(&:values)
+          rs = @regexp_states.keys + @regexp_states.values.flat_map(&:values)
           (ss + rs).uniq
         end
 
         def transitions
-          @string_states.map { |from, hash|
+          @string_states.flat_map { |from, hash|
             hash.map { |s, to| [from, s, to] }
-          }.flatten(1) + @regexp_states.map { |from, hash|
+          } + @regexp_states.flat_map { |from, hash|
             hash.map { |s, to| [from, s, to] }
-          }.flatten(1)
+          }
         end
 
         private
@@ -139,26 +151,6 @@ module ActionDispatch
               raise ArgumentError, 'unknown symbol: %s' % sym.class
             end
           end
-
-          def move_regexp(t, a)
-            return [] if t.empty?
-
-            t.map { |s|
-              if states = @regexp_states[s]
-                states.map { |re, v| re === a ? v : nil }
-              end
-            }.flatten.compact.uniq
-          end
-
-          def move_string(t, a)
-            return [] if t.empty?
-
-            t.map do |s|
-              if states = @string_states[s]
-                states[a]
-              end
-            end.compact
-          end
       end
     end
   end

data/lib/action_dispatch/journey/nfa/dot.rb

@@ -16,9 +16,9 @@ module ActionDispatch
           #  end
           #  "  #{n.object_id} [label=\"#{label}\", shape=box];"
           #}
-          #memo_edges = memos.map { |k, memos|
+          #memo_edges = memos.flat_map { |k, memos|
           #  (memos || []).map { |v| "  #{k} -> #{v.object_id};" }
-          #}.flatten.uniq
+          #}.uniq
 
         <<-eodot
 digraph nfa {

data/lib/action_dispatch/journey/nfa/simulator.rb

@@ -34,7 +34,7 @@ module ActionDispatch
 
           return if acceptance_states.empty?
 
-          memos = acceptance_states.map { |x| tt.memo(x) }.flatten.compact
+          memos = acceptance_states.flat_map { |x| tt.memo(x) }.compact
 
           MatchData.new(memos)
         end

data/lib/action_dispatch/journey/nfa/transition_table.rb

@@ -42,7 +42,7 @@ module ActionDispatch
         end
 
         def states
-          (@table.keys + @table.values.map(&:keys).flatten).uniq
+          (@table.keys + @table.values.flat_map(&:keys)).uniq
         end
 
         # Returns a generalized transition graph with reduced states. The states
@@ -93,7 +93,7 @@ module ActionDispatch
         # Returns set of NFA states to which there is a transition on ast symbol
         # +a+ from some state +s+ in +t+.
         def following_states(t, a)
-          Array(t).map { |s| inverted[s][a] }.flatten.uniq
+          Array(t).flat_map { |s| inverted[s][a] }.uniq
         end
 
         # Returns set of NFA states to which there is a transition on ast symbol
@@ -107,7 +107,7 @@ module ActionDispatch
         end
 
         def alphabet
-          inverted.values.map(&:keys).flatten.compact.uniq.sort_by { |x| x.to_s }
+          inverted.values.flat_map(&:keys).compact.uniq.sort_by { |x| x.to_s }
         end
 
         # Returns a set of NFA states reachable from some NFA state +s+ in set
@@ -131,9 +131,9 @@ module ActionDispatch
         end
 
         def transitions
-          @table.map { |to, hash|
+          @table.flat_map { |to, hash|
             hash.map { |from, sym| [from, sym, to] }
-          }.flatten(1)
+          }
         end
 
         private

data/lib/action_dispatch/journey/nodes/node.rb

@@ -93,6 +93,10 @@ module ActionDispatch
 
       class Star < Unary # :nodoc:
         def type; :STAR; end
+
+        def name
+          left.name.tr '*:', ''
+        end
       end
 
       class Binary < Node # :nodoc:

data/lib/action_dispatch/journey/parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
-# from Racc grammar file "".
+# This file is automatically generated by Racc 1.4.11
+# from Racc grammer file "".
 #
 
 require 'racc/parser.rb'
@@ -9,42 +9,38 @@ require 'racc/parser.rb'
 
 require 'action_dispatch/journey/parser_extras'
 module ActionDispatch
-  module Journey # :nodoc:
-    class Parser < Racc::Parser # :nodoc:
+  module Journey
+    class Parser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-    17,    21,    13,    15,    14,     7,   nil,    16,     8,    19,
-    13,    15,    14,     7,    23,    16,     8,    19,    13,    15,
-    14,     7,   nil,    16,     8,    13,    15,    14,     7,   nil,
-    16,     8,    13,    15,    14,     7,   nil,    16,     8 ]
+    13,    15,    14,     7,    21,    16,     8,    19,    13,    15,
+    14,     7,    17,    16,     8,    13,    15,    14,     7,    24,
+    16,     8,    13,    15,    14,     7,    19,    16,     8 ]
 
 racc_action_check = [
-     1,    17,     1,     1,     1,     1,   nil,     1,     1,     1,
-    20,    20,    20,    20,    20,    20,    20,    20,     7,     7,
-     7,     7,   nil,     7,     7,    19,    19,    19,    19,   nil,
-    19,    19,     0,     0,     0,     0,   nil,     0,     0 ]
+     2,     2,     2,     2,    17,     2,     2,     2,     0,     0,
+     0,     0,     1,     0,     0,    19,    19,    19,    19,    20,
+    19,    19,     7,     7,     7,     7,    22,     7,     7 ]
 
 racc_action_pointer = [
-    30,     0,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,   nil,    23,
-     8,   nil,   nil,   nil ]
+     6,    12,    -2,   nil,   nil,   nil,   nil,    20,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,    13,
+    13,   nil,    17,   nil,   nil ]
 
 racc_action_default = [
-   -18,   -18,    -2,    -3,    -4,    -5,    -6,   -18,    -9,   -10,
-   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,    -1,   -18,
-   -18,    24,    -8,    -7 ]
+   -19,   -19,    -2,    -3,    -4,    -5,    -6,   -19,   -10,   -11,
+   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -19,    -1,   -19,
+   -19,    25,    -8,    -9,    -7 ]
 
 racc_goto_table = [
-    18,     1,   nil,   nil,   nil,   nil,   nil,   nil,    20,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,    18 ]
+     1,    22,    18,    23,   nil,   nil,   nil,    20 ]
 
 racc_goto_check = [
-     2,     1,   nil,   nil,   nil,   nil,   nil,   nil,     1,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,     2 ]
+     1,     2,     1,     3,   nil,   nil,   nil,     1 ]
 
 racc_goto_pointer = [
-   nil,     1,    -1,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     0,   -18,   -16,   nil,   nil,   nil,   nil,   nil,   nil,
    nil ]
 
 racc_goto_default = [
@@ -61,19 +57,20 @@ racc_reduce_table = [
   1, 12, :_reduce_none,
   3, 15, :_reduce_7,
   3, 13, :_reduce_8,
-  1, 16, :_reduce_9,
+  3, 13, :_reduce_9,
+  1, 16, :_reduce_10,
   1, 14, :_reduce_none,
   1, 14, :_reduce_none,
   1, 14, :_reduce_none,
   1, 14, :_reduce_none,
-  1, 19, :_reduce_14,
-  1, 17, :_reduce_15,
-  1, 18, :_reduce_16,
-  1, 20, :_reduce_17 ]
+  1, 19, :_reduce_15,
+  1, 17, :_reduce_16,
+  1, 18, :_reduce_17,
+  1, 20, :_reduce_18 ]
 
-racc_reduce_n = 18
+racc_reduce_n = 19
 
-racc_shift_n = 24
+racc_shift_n = 25
 
 racc_token_table = {
   false => 0,
@@ -89,7 +86,7 @@ racc_token_table = {
 
 racc_nt_base = 10
 
-racc_use_result_var = true
+racc_use_result_var = false
 
 Racc_arg = [
   racc_action_table,
@@ -136,14 +133,12 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-def _reduce_1(val, _values, result)
- result = Cat.new(val.first, val.last)
-    result
+def _reduce_1(val, _values)
+ Cat.new(val.first, val.last)
 end
 
-def _reduce_2(val, _values, result)
- result = val.first
-    result
+def _reduce_2(val, _values)
+ val.first
 end
 
 # reduce 3 omitted
@@ -154,22 +149,21 @@ end
 
 # reduce 6 omitted
 
-def _reduce_7(val, _values, result)
- result = Group.new(val[1])
-    result
+def _reduce_7(val, _values)
+ Group.new(val[1])
 end
 
-def _reduce_8(val, _values, result)
- result = Or.new([val.first, val.last])
-    result
+def _reduce_8(val, _values)
+ Or.new([val.first, val.last])
 end
 
-def _reduce_9(val, _values, result)
- result = Star.new(Symbol.new(val.last))
-    result
+def _reduce_9(val, _values)
+ Or.new([val.first, val.last])
 end
 
-# reduce 10 omitted
+def _reduce_10(val, _values)
+ Star.new(Symbol.new(val.last))
+end
 
 # reduce 11 omitted
 
@@ -177,27 +171,25 @@ end
 
 # reduce 13 omitted
 
-def _reduce_14(val, _values, result)
- result = Slash.new('/')
-    result
+# reduce 14 omitted
+
+def _reduce_15(val, _values)
+ Slash.new('/')
 end
 
-def _reduce_15(val, _values, result)
- result = Symbol.new(val.first)
-    result
+def _reduce_16(val, _values)
+ Symbol.new(val.first)
 end
 
-def _reduce_16(val, _values, result)
- result = Literal.new(val.first)
-    result
+def _reduce_17(val, _values)
+ Literal.new(val.first)
 end
 
-def _reduce_17(val, _values, result)
- result = Dot.new(val.first)
-    result
+def _reduce_18(val, _values)
+ Dot.new(val.first)
 end
 
-def _reduce_none(val, _values, result)
+def _reduce_none(val, _values)
   val[0]
 end