rack-mount 0.4.3 → 0.4.4

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

@@ -7,13 +7,18 @@ module Rack::Mount
         super
 
         @has_significant_params = @conditions.any? { |method, condition|
-          condition.required_params.any? || condition.required_defaults.any?
+          (condition.respond_to?(:required_params) && condition.required_params.any?) ||
+            (condition.respond_to?(:required_defaults) && condition.required_defaults.any?)
         }
       end
 
       def generation_keys
         @conditions.inject({}) { |keys, (method, condition)|
-          keys.merge!(condition.required_defaults)
+          if condition.respond_to?(:required_defaults)
+            keys.merge!(condition.required_defaults)
+          else
+            keys
+          end
         }
       end
 

data/lib/rack/mount/recognition/code_generation.rb

@@ -44,10 +44,16 @@ module Rack::Mount
             conditions = []
             route.conditions.each do |method, condition|
               b = []
-              b << "if m = obj.#{method}.match(#{condition.inspect})"
-              b << 'matches = m.captures' if route.named_captures[method].any?
-              b << 'p = nil' if route.named_captures[method].any?
-              b << route.named_captures[method].map { |k, j| "params[#{k.inspect}] = p if p = matches[#{j}]" }.join('; ')
+              if condition.is_a?(Regexp)
+                b << "if m = obj.#{method}.match(#{condition.inspect})"
+                if (named_captures = route.named_captures[method]) && named_captures.any?
+                  b << 'matches = m.captures'
+                  b << 'p = nil'
+                  b << named_captures.map { |k, j| "params[#{k.inspect}] = p if p = matches[#{j}]" }.join('; ')
+                end
+              else
+                b << "if m = obj.#{method} == route.conditions[:#{method}]"
+              end
               b << 'true'
               b << 'end'
               conditions << "(#{b.join('; ')})"

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

@@ -10,6 +10,7 @@ module Rack::Mount
 
         @named_captures = {}
         @conditions.map { |method, condition|
+          next unless condition.respond_to?(:named_captures)
           @named_captures[method] = condition.named_captures.inject({}) { |named_captures, (k, v)|
             named_captures[k.to_sym] = v.last - 1
             named_captures
@@ -22,7 +23,7 @@ module Rack::Mount
         params = @defaults.dup
         if @conditions.all? { |method, condition|
           value = obj.send(method)
-          if m = value.match(condition)
+          if condition.is_a?(Regexp) && (m = value.match(condition))
             matches = m.captures
             @named_captures[method].each { |k, i|
               if v = matches[i]
@@ -30,6 +31,8 @@ module Rack::Mount
               end
             }
             true
+          elsif value == condition
+            true
           else
             false
           end

data/lib/rack/mount/route.rb

@@ -43,11 +43,13 @@ module Rack::Mount
         next unless method && pattern
 
         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
+        if pattern.is_a?(Regexp)
+          pattern = Utils.normalize_extended_expression(pattern)
+          pattern = RegexpWithNamedGroups.new(pattern)
+          pattern.extend(GeneratableRegexp::InstanceMethods)
+          pattern.defaults = @defaults
+        end
 
         @conditions[method] = pattern.freeze
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -06:00
+date: 2010-01-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,8 +71,6 @@ files:
 - LICENSE
 has_rdoc: true
 homepage: http://github.com/josh/rack-mount
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -93,9 +91,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Stackable dynamic tree based Rack router
 test_files: []