rack-mount 0.3.0 → 0.3.1

data/lib/rack/mount/generatable_regexp.rb

@@ -32,17 +32,34 @@ module Rack::Mount
         obj.segments
       end
 
+      def defaults=(defaults)
+        @required_captures = nil
+        @required_params = nil
+        @required_defaults = nil
+        @defaults = defaults
+      end
+
+      def defaults
+        @defaults ||= {}
+      end
+
       def generatable?
         segments.any?
       end
 
-      def generate(params = {}, recall = {}, defaults = {}, options = {})
+      def generate(params = {}, recall = {}, options = {})
+        return nil unless generatable?
+
         merged = recall.merge(params)
-        generate_from_segments(segments, params, merged, defaults, options)
+        return nil unless required_params.all? { |p| merged.include?(p) }
+        return nil unless required_defaults.all? { |k, v| merged[k] == v }
+
+        generate_from_segments(segments, params, merged, options)
       end
 
       def segments
         @segments ||= begin
+          defaults
           segments = []
           catch(:halt) do
             expression = Utils.parse_regexp(self)
@@ -57,7 +74,32 @@ module Rack::Mount
       end
 
       def required_captures
-        segments.find_all { |s| s.is_a?(DynamicSegment) }
+        @required_captures ||= segments.find_all { |s|
+          s.is_a?(DynamicSegment) && !@defaults.include?(s.name)
+        }.freeze
+      end
+
+      def required_params
+        @required_params ||= required_captures.map { |s| s.name }.freeze
+      end
+
+      def required_defaults
+        @required_defaults ||= begin
+          required_defaults = @defaults.dup
+          captures.inject({}) { |h, s| h.merge!(s.to_hash) }.keys.each { |name|
+            required_defaults.delete(name)
+          }
+          required_defaults
+        end
+      end
+
+      def freeze
+        segments
+        captures
+        required_captures
+        required_params
+        required_defaults
+        super
       end
 
       private
@@ -93,7 +135,7 @@ module Rack::Mount
 
         EMPTY_STRING = ''.freeze
 
-        def generate_from_segments(segments, params, merged, defaults, options, optional = false)
+        def generate_from_segments(segments, params, merged, options, optional = false)
           if optional
             return EMPTY_STRING if segments.all? { |s| s.is_a?(String) }
             return EMPTY_STRING unless segments.flatten.any? { |s|
@@ -101,11 +143,11 @@ module Rack::Mount
             }
             return EMPTY_STRING if segments.any? { |segment|
               if segment.is_a?(DynamicSegment)
-                value = merged[segment.name] || defaults[segment.name]
+                value = merged[segment.name] || @defaults[segment.name]
                 value = parameterize(segment.name, value, options)
 
                 merged_value  = parameterize(segment.name, merged[segment.name], options)
-                default_value = parameterize(segment.name, defaults[segment.name], options)
+                default_value = parameterize(segment.name, @defaults[segment.name], options)
 
                 if value.nil? || segment !~ value
                   true
@@ -124,7 +166,7 @@ module Rack::Mount
             when String
               segment
             when DynamicSegment
-              value = params[segment.name] || merged[segment.name] || defaults[segment.name]
+              value = params[segment.name] || merged[segment.name] || @defaults[segment.name]
               value = parameterize(segment.name, value, options)
               if value && segment =~ value.to_s
                 value
@@ -132,7 +174,7 @@ module Rack::Mount
                 return
               end
             when Array
-              value = generate_from_segments(segment, params, merged, defaults, options, true)
+              value = generate_from_segments(segment, params, merged, options, true)
               if value == :clear_remaining_segments
                 segment.each { |s| params.delete(s.name) if s.is_a?(DynamicSegment) }
                 EMPTY_STRING

data/lib/rack/mount/generation/route.rb

@@ -3,29 +3,18 @@ require 'rack/mount/utils'
 module Rack::Mount
   module Generation
     module Route #:nodoc:
-      attr_reader :generation_keys
-
       def initialize(*args)
         super
 
-        @required_params = {}
-        @required_defaults = {}
-        @generation_keys = @defaults.dup
-
-        @conditions.each do |method, condition|
-          @required_params[method] = @conditions[method].required_captures.map { |s| s.name }.reject { |s| @defaults.include?(s) }.freeze
-          @required_defaults[method] = @defaults.dup
-          @conditions[method].captures.inject({}) { |h, s| h.merge!(s.to_hash) }.keys.each { |name|
-            @required_defaults[method].delete(name)
-            @generation_keys.delete(name) if @defaults.include?(name)
-          }
-          @required_defaults[method].freeze
-        end
-        @has_significant_params = (@required_params.any? { |k, v| v.any? } || @required_defaults.any? { |k, v| v.any? }) ? true : false
+        @has_significant_params = @conditions.any? { |method, condition|
+          condition.required_params.any? || condition.required_defaults.any?
+        }
+      end
 
-        @required_params.freeze
-        @required_defaults.freeze
-        @generation_keys.freeze
+      def generation_keys
+        @conditions.inject({}) { |keys, (method, condition)|
+          keys.merge!(condition.required_defaults)
+        }
       end
 
       def significant_params?
@@ -34,9 +23,9 @@ module Rack::Mount
 
       def generate(methods, params = {}, recall = {}, options = {})
         if methods.is_a?(Array)
-          result = methods.map { |m| generate_method(m, params, recall, @defaults, options) || (return nil) }
+          result = methods.map { |m| generate_method(m, params, recall, options) || (return nil) }
         else
-          result = generate_method(methods, params, recall, @defaults, options)
+          result = generate_method(methods, params, recall, options)
         end
 
         if result
@@ -49,13 +38,10 @@ module Rack::Mount
       end
 
       private
-        def generate_method(method, params, recall, defaults, options)
-          merged = recall.merge(params)
-          return nil unless condition = @conditions[method]
-          return nil if condition.segments.empty?
-          return nil unless @required_params[method].all? { |p| merged.include?(p) }
-          return nil unless @required_defaults[method].all? { |k, v| merged[k] == v }
-          condition.generate(params, recall, defaults, options)
+        def generate_method(method, params, recall, options)
+          if condition = @conditions[method]
+            condition.generate(params, recall, options)
+          end
         end
     end
   end

data/lib/rack/mount/route.rb

@@ -54,8 +54,11 @@ module Rack::Mount
 
         pattern = Regexp.compile("\\A#{Regexp.escape(pattern)}\\Z") if pattern.is_a?(String)
         pattern = Utils.normalize_extended_expression(pattern)
+
         pattern = RegexpWithNamedGroups.new(pattern)
         pattern.extend(GeneratableRegexp::InstanceMethods)
+        pattern.defaults = @defaults
+
         @conditions[method] = pattern.freeze
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -06:00
+date: 2009-12-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency