rack-mount 0.6.0 → 0.6.1

data/lib/rack/mount/analysis/frequency.rb

@@ -36,10 +36,10 @@ module Rack::Mount
       def process_key(requirements, method, requirement)
         if requirement.is_a?(Regexp)
           expression = Utils.parse_regexp(requirement)
-          expression = expression.reject { |e| e.is_a?(Reginald::Anchor) }
 
-          if expression.is_a?(Reginald::Expression) && expression.literal?
-            return requirements[method] = expression.to_s
+          if expression.is_a?(Reginald::Expression) && expression.anchored_to_line?
+            expression = expression.reject { |e| e.is_a?(Reginald::Anchor) }
+            return requirements[method] = expression.to_s if expression.literal?
           end
         end
 

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

@@ -26,12 +26,17 @@ module Rack::Mount
         @has_significant_params
       end
 
-      def generate(methods, params = {}, recall = {}, options = {})
-        if methods.is_a?(Array)
-          result = methods.map { |m| generate_method(m, params, recall, options) }
-          return nil if result.all? { |e| e.nil? }
+      def generate(method, params = {}, recall = {}, options = {})
+        if method.nil?
+          result = @conditions.inject({}) { |h, (method, condition)|
+            if condition.respond_to?(:generate)
+              h[method] = condition.generate(params, recall, options)
+            end
+            h
+          }
+          return nil if result.values.compact.empty?
         else
-          result = generate_method(methods, params, recall, options)
+          result = generate_method(method, params, recall, options)
         end
 
         if result

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

@@ -51,7 +51,7 @@ module Rack::Mount
         only_path = params.delete(:only_path)
         recall = env[@parameters_key] || {}
 
-        unless result = generate([:host, :path_info], named_route, params, recall,
+        unless result = generate(:all, named_route, params, recall,
             :parameterize => lambda { |name, param| Utils.escape_uri(param) })
           return
         end
@@ -67,16 +67,15 @@ module Rack::Mount
           end
         end
 
-        req = @request_class.new(env)
-        uri = only_path ? '' : "#{req.scheme}://#{parts[0] || req.host}"
-        uri = "#{uri}#{req.script_name}#{parts[1]}"
-        uri << "?#{Utils.build_nested_query(params)}" if params.any?
-        uri
+        req = stubbed_request_class.new(env)
+        req._stubbed_values = parts.merge(:query_string => Utils.build_nested_query(params))
+        only_path ? req.fullpath : req.url
       end
 
       def generate(method, *args) #:nodoc:
         raise 'route set not finalized' unless @generation_graph
 
+        method = nil if method == :all
         named_route, params, recall, options = extract_params!(*args)
         merged = recall.merge(params)
         route = nil
@@ -176,6 +175,26 @@ module Rack::Mount
 
           [named_route, params.dup, recall.dup, options.dup]
         end
+
+        def instance_variables_to_serialize
+          super - [:@stubbed_request_class]
+        end
+
+        def stubbed_request_class
+          @stubbed_request_class ||= begin
+            klass = Class.new(@request_class)
+            klass.public_instance_methods.each do |method|
+              next if method =~ /^__|object_id/
+              klass.class_eval <<-RUBY
+                def #{method}(*args, &block)
+                  @_stubbed_values[:#{method}] || super
+                end
+              RUBY
+            end
+            klass.class_eval { attr_accessor :_stubbed_values }
+            klass
+          end
+        end
     end
   end
 end

data/lib/rack/mount/strexp/parser.y

@@ -0,0 +1,33 @@
+class Rack::Mount::StrexpParser
+rule
+  target: expr { result = anchor ? "\\A#{val.join}\\Z" : "\\A#{val.join}" }
+
+  expr: expr token { result = val.join }
+      | token
+
+  token: PARAM {
+           name = val[0].to_sym
+           requirement = requirements[name]
+           result = REGEXP_NAMED_CAPTURE % [name, requirement]
+         }
+       | GLOB {
+           name = val[0].to_sym
+           result = REGEXP_NAMED_CAPTURE % [name, '.+']
+         }
+       | LPAREN expr RPAREN { result = "(?:#{val[1]})?" }
+       | CHAR { result = Regexp.escape(val[0]) }
+end
+
+---- header ----
+require 'rack/mount/utils'
+require 'rack/mount/strexp/tokenizer'
+
+---- inner
+
+if Reginald.regexp_supports_named_captures?
+  REGEXP_NAMED_CAPTURE = '(?<%s>%s)'.freeze
+else
+  REGEXP_NAMED_CAPTURE = '(?:<%s>%s)'.freeze
+end
+
+attr_accessor :anchor, :requirements

data/lib/rack/mount/strexp/tokenizer.rex

@@ -0,0 +1,12 @@
+class Rack::Mount::StrexpParser
+macro
+  RESERVED  \(|\)|:|\*
+  ALPHA_U   [a-zA-Z_]
+rule
+  \\({RESERVED})   { [:CHAR,  @ss[1]] }
+  \:({ALPHA_U}\w*) { [:PARAM, @ss[1]] }
+  \*({ALPHA_U}\w*) { [:GLOB,  @ss[1]] }
+  \(               { [:LPAREN, text]  }
+  \)               { [:RPAREN, text]  }
+  .                { [:CHAR,   text]  }
+end

data/lib/rack/mount/vendor/reginald/reginald/expression.rb

@@ -41,6 +41,30 @@ module Reginald
       !ignorecase && all? { |e| e.literal? }
     end
 
+    def anchored?
+      anchored_to_start? && anchored_to_end?
+    end
+
+    def anchored_to_start?
+      first.is_a?(Anchor) && first == '\A'
+    end
+
+    def anchored_to_end?
+      last.is_a?(Anchor) && last == '\Z'
+    end
+
+    def anchored_to_line?
+      anchored_to_start_of_line? && anchored_to_end_of_line?
+    end
+
+    def anchored_to_start_of_line?
+      anchored_to_start? || (first.is_a?(Anchor) && first == '^')
+    end
+
+    def anchored_to_end_of_line?
+      anchored_to_end? || (last.is_a?(Anchor) && last == '$')
+    end
+
     def options
       flag = 0
       flag |= Regexp::MULTILINE if multiline

data/lib/rack/mount/vendor/reginald/reginald/parser.rb

@@ -298,7 +298,7 @@ end
 def _reduce_3(val, _values, result)
             val[1].quantifier = val[2]
             result = Expression.reduce(val[0], val[1])
-          
+
     result
 end
 
@@ -310,7 +310,7 @@ end
 def _reduce_5(val, _values, result)
             val[0].quantifier = val[1]
             result = val[0]
-          
+
     result
 end
 
@@ -356,7 +356,7 @@ end
 def _reduce_15(val, _values, result)
           result = Group.new(val[1])
           result.index = @capture_index_stack.pop
-        
+
     result
 end
 
@@ -368,14 +368,14 @@ def _reduce_16(val, _values, result)
           result.expression.ignorecase = options[:ignorecase];
           result.expression.extended   = options[:extended];
           @options_stack.pop
-        
+
     result
 end
 
 def _reduce_17(val, _values, result)
           result = Group.new(val[3]);
           result.capture = false;
-        
+
     result
 end
 
@@ -383,7 +383,7 @@ def _reduce_18(val, _values, result)
           result = Group.new(val[3]);
           result.name = val[2];
           result.index = @capture_index_stack.pop
-        
+
     result
 end
 
@@ -493,25 +493,25 @@ end
 
 def _reduce_44(val, _values, result)
             @options_stack << result = { val[1] => false, val[2] => false, val[3] => false }
-          
+
     result
 end
 
 def _reduce_45(val, _values, result)
             @options_stack << result = { val[0] => true, val[2] => false, val[3] => false }
-          
+
     result
 end
 
 def _reduce_46(val, _values, result)
             @options_stack << result = { val[0] => true, val[1] => true, val[3] => false }
-          
+
     result
 end
 
 def _reduce_47(val, _values, result)
             @options_stack << result = { val[0] => true, val[1] => true, val[2] => true }
-          
+
     result
 end
 
@@ -538,3 +538,4 @@ end
 end   # module Reginald
 
 require 'reginald/tokenizer'
+

data/lib/rack/mount/version.rb

@@ -0,0 +1,3 @@
+module Rack::Mount
+  Version = '0.6.1'
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,19 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -06:00
+date: 2010-03-06 00:00:00 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+dependencies: []
+
 description: Stackable dynamic tree based Rack router
 email: josh@joshpeek.com
 executables: []
@@ -29,9 +25,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
+- README.rdoc
 files: 
+- lib/rack/mount.rb
 - lib/rack/mount/analysis/frequency.rb
 - lib/rack/mount/analysis/histogram.rb
 - lib/rack/mount/analysis/splitting.rb
@@ -48,13 +45,16 @@ files:
 - lib/rack/mount/regexp_with_named_groups.rb
 - lib/rack/mount/route.rb
 - lib/rack/mount/route_set.rb
+- lib/rack/mount/strexp.rb
 - lib/rack/mount/strexp/parser.rb
+- lib/rack/mount/strexp/parser.y
 - lib/rack/mount/strexp/tokenizer.rb
-- lib/rack/mount/strexp.rb
+- lib/rack/mount/strexp/tokenizer.rex
 - lib/rack/mount/utils.rb
 - lib/rack/mount/vendor/multimap/multimap.rb
 - lib/rack/mount/vendor/multimap/multiset.rb
 - lib/rack/mount/vendor/multimap/nested_multimap.rb
+- lib/rack/mount/vendor/reginald/reginald.rb
 - lib/rack/mount/vendor/reginald/reginald/alternation.rb
 - lib/rack/mount/vendor/reginald/reginald/anchor.rb
 - lib/rack/mount/vendor/reginald/reginald/atom.rb
@@ -65,10 +65,7 @@ files:
 - lib/rack/mount/vendor/reginald/reginald/group.rb
 - lib/rack/mount/vendor/reginald/reginald/parser.rb
 - lib/rack/mount/vendor/reginald/reginald/tokenizer.rb
-- lib/rack/mount/vendor/reginald/reginald.rb
-- lib/rack/mount.rb
-- README.rdoc
-- LICENSE
+- lib/rack/mount/version.rb
 has_rdoc: true
 homepage: http://github.com/josh/rack-mount
 licenses: []
@@ -82,18 +79,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Stackable dynamic tree based Rack router