rack-mount 0.8.1 → 0.8.2

data/lib/rack/mount/code_generation.rb

@@ -71,8 +71,11 @@ module Rack::Mount
       def optimize_recognize!
         Utils.debug "optimizing recognize"
 
+        uses_cache = false
+
         keys = @recognition_keys.map { |key|
           if key.respond_to?(:call_source)
+            uses_cache = true
             key.call_source(:cache, :obj)
           else
             "obj.#{key}"
@@ -85,7 +88,7 @@ module Rack::Mount
 
         instance_eval(<<-RUBY, __FILE__, __LINE__)
           def recognize(obj)
-            cache = {}
+            #{"cache = {}" if uses_cache}
             container = @recognition_graph[#{keys}]
             optimize_container_iterator(container) unless container.respond_to?(:optimized_each)
 

data/lib/rack/mount/route.rb

@@ -82,7 +82,7 @@ module Rack::Mount
 
 
     def generation_keys
-      @conditions.inject({}) { |keys, (method, condition)|
+      @conditions.inject({}) { |keys, (_, condition)|
         if condition.respond_to?(:required_defaults)
           keys.merge!(condition.required_defaults)
         else

data/lib/rack/mount/route_set.rb

@@ -269,6 +269,7 @@ module Rack::Mount
     def freeze
       unless frozen?
         rehash
+        stubbed_request_class
 
         @recognition_key_analyzer = nil
         @generation_route_keys    = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2011-08-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rexical
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,6 +62,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rexical
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: "    A stackable dynamic tree based Rack router.\n"
 email: josh@joshpeek.com
 executables: []
@@ -71,7 +85,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/rack/mount.rb
+- README.rdoc
+- LICENSE
 - lib/rack/mount/analysis/histogram.rb
 - lib/rack/mount/analysis/splitting.rb
 - lib/rack/mount/code_generation.rb
@@ -81,13 +96,10 @@ 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/tokenizer.rex
+- lib/rack/mount/strexp.rb
 - lib/rack/mount/utils.rb
-- lib/rack/mount/vendor/regin/regin.rb
 - lib/rack/mount/vendor/regin/regin/alternation.rb
 - lib/rack/mount/vendor/regin/regin/anchor.rb
 - lib/rack/mount/vendor/regin/regin/atom.rb
@@ -100,9 +112,9 @@ files:
 - lib/rack/mount/vendor/regin/regin/parser.rb
 - lib/rack/mount/vendor/regin/regin/tokenizer.rb
 - lib/rack/mount/vendor/regin/regin/version.rb
+- lib/rack/mount/vendor/regin/regin.rb
 - lib/rack/mount/version.rb
-- LICENSE
-- README.rdoc
+- lib/rack/mount.rb
 has_rdoc: true
 homepage: https://github.com/josh/rack-mount
 licenses: []
@@ -132,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: rack-mount
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Stackable dynamic tree based Rack router

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

@@ -1,34 +0,0 @@
-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
-           requirement = requirements.key?(name) ? requirements[name] : '.+'
-           result = REGEXP_NAMED_CAPTURE % [name, requirement]
-         }
-       | 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 Regin.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

@@ -1,12 +0,0 @@
-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