rack-mount 0.3.3 → 0.4.0

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

@@ -54,6 +54,10 @@ module Rack::Mount
         end
       end
 
+      def expire!
+        @possible_keys = @report = nil
+      end
+
       private
         def parse_regexp(regexp)
           @parse_regexp_cache ||= {}

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

@@ -98,6 +98,7 @@ module Rack::Mount
       private
         def expire!
           @generation_keys = @generation_graph = nil
+          @generation_key_analyzer.expire!
           super
         end
 

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

@@ -1,6 +1,11 @@
 module Rack::Mount
   module Recognition
     module CodeGeneration #:nodoc:
+      def initialize(*args)
+        @optimized_recognize_defined = false
+        super
+      end
+
       def _expired_recognize(env) #:nodoc:
         raise 'route set not finalized'
       end
@@ -11,11 +16,19 @@ module Rack::Mount
       end
 
       private
+        def instance_variables_to_serialize
+          super - [:@optimized_recognize_defined]
+        end
+
         def expire!
-          remove_metaclass_method :recognize
+          if @optimized_recognize_defined
+            remove_metaclass_method :recognize
+
+            class << self
+              alias_method :recognize, :_expired_recognize
+            end
 
-          class << self
-            alias_method :recognize, :_expired_recognize
+            @optimized_recognize_defined = false
           end
 
           super
@@ -64,10 +77,12 @@ module Rack::Mount
             end
           }.join(', ')
 
+          @optimized_recognize_defined = true
+
           remove_metaclass_method :recognize
 
           instance_eval(<<-RUBY, __FILE__, __LINE__)
-            def recognize(obj, &block)
+            def recognize(obj)
               cache = {}
               container = @recognition_graph[#{keys}]
               optimize_container_iterator(container) unless container.respond_to?(:optimized_each)

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

@@ -45,7 +45,8 @@ module Rack::Mount
         nil
       end
 
-      EXPECT    = 'Expect'.freeze
+      X_CASCADE = 'X-Cascade'.freeze
+      PASS      = 'pass'.freeze
       PATH_INFO = 'PATH_INFO'.freeze
 
       # Rack compatible recognition and dispatching method. Routes are
@@ -57,11 +58,9 @@ module Rack::Mount
       def call(env)
         raise 'route set not finalized' unless @recognition_graph
 
-        set_expectation = env[EXPECT] != '100-continue'
-        env[EXPECT] = '100-continue' if set_expectation
-
         env[PATH_INFO] = Utils.normalize_path(env[PATH_INFO])
 
+        request = nil
         req = @request_class.new(env)
         recognize(req) do |route, params|
           # TODO: We only want to unescape params from uri related methods
@@ -69,12 +68,10 @@ module Rack::Mount
 
           env[@parameters_key] = params
           result = route.app.call(env)
-          return result unless result[0].to_i == 417
+          return result unless result[1][X_CASCADE] == PASS
         end
 
-        set_expectation ? [404, {'Content-Type' => 'text/html'}, ['Not Found']] : [417, {'Content-Type' => 'text/html'}, ['Expectation failed']]
-      ensure
-        env.delete(EXPECT) if set_expectation
+        request || [404, {'Content-Type' => 'text/html', 'X-Cascade' => 'pass'}, ['Not Found']]
       end
 
       def rehash #:nodoc:
@@ -84,22 +81,15 @@ module Rack::Mount
         super
       end
 
-      def valid_conditions #:nodoc:
-        @valid_conditions ||= begin
-          conditions = @request_class.instance_methods(false)
-          conditions.map! { |m| m.to_sym }
-          conditions.freeze
-        end
-      end
-
       private
         def expire!
           @recognition_keys = @recognition_graph = nil
+          @recognition_key_analyzer.expire!
           super
         end
 
         def flush!
-          @recognition_key_analyzer = @valid_conditions = nil
+          @recognition_key_analyzer = nil
           super
         end
 

data/lib/rack/mount/route.rb

@@ -27,9 +27,7 @@ module Rack::Mount
     # Symbol identifier for the route used with named route generations
     attr_reader :name
 
-    def initialize(set, app, conditions, defaults, name)
-      @set = set
-
+    def initialize(app, conditions, defaults, name)
       unless app.respond_to?(:call)
         raise ArgumentError, 'app must be a valid rack application' \
           ' and respond to call'
@@ -39,19 +37,11 @@ module Rack::Mount
       @name = name ? name.to_sym : nil
       @defaults = (defaults || {}).freeze
 
-      unless conditions.is_a?(Hash)
-        raise ArgumentError, 'conditions must be a Hash'
-      end
       @conditions = {}
 
       conditions.each do |method, pattern|
         next unless method && pattern
 
-        unless @set.valid_conditions.include?(method)
-          raise ArgumentError, 'conditions may only include ' +
-            @set.valid_conditions.inspect
-        end
-
         pattern = Regexp.compile("\\A#{Regexp.escape(pattern)}\\Z") if pattern.is_a?(String)
         pattern = Utils.normalize_extended_expression(pattern)
 

data/lib/rack/mount/route_set.rb

@@ -24,6 +24,12 @@ module Rack::Mount
     # - <tt>Recognition::RouteSet.new</tt>
     def initialize(options = {}, &block)
       @request_class = options.delete(:request_class) || Rack::Request
+      @valid_conditions = begin
+        conditions = @request_class.instance_methods(false)
+        conditions.map! { |m| m.to_sym }
+        conditions
+      end
+
       @routes = []
       expire!
 
@@ -43,7 +49,8 @@ module Rack::Mount
     # <tt>name</tt>:: Symbol identifier for the route used with named
     #                 route generations
     def add_route(app, conditions = {}, defaults = {}, name = nil)
-      route = Route.new(self, app, conditions, defaults, name)
+      validate_conditions!(conditions)
+      route = Route.new(app, conditions, defaults, name)
       @routes << route
       expire!
       route
@@ -86,11 +93,55 @@ module Rack::Mount
       super
     end
 
+    def marshal_dump #:nodoc:
+      hash = {}
+
+      instance_variables_to_serialize.each do |ivar|
+        hash[ivar] = instance_variable_get(ivar)
+      end
+
+      if graph = hash[:@recognition_graph]
+        hash[:@recognition_graph] = graph.dup
+      end
+
+      included_modules = (class << self; included_modules; end)
+      included_modules.reject! { |mod| mod == Kernel }
+      hash[:included_modules] = included_modules
+
+      hash
+    end
+
+    def marshal_load(hash) #:nodoc:
+      hash.delete(:included_modules).reverse.each { |mod| extend(mod) }
+
+      hash.each do |ivar, value|
+        instance_variable_set(ivar, value)
+      end
+    end
+
     private
       def expire! #:nodoc:
       end
 
       def flush! #:nodoc:
+        @valid_conditions = nil
+      end
+
+      def instance_variables_to_serialize
+        instance_variables.map { |ivar| ivar.to_sym }
+      end
+
+      def validate_conditions!(conditions)
+        unless conditions.is_a?(Hash)
+          raise ArgumentError, 'conditions must be a Hash'
+        end
+
+        unless conditions.all? { |method, pattern|
+            @valid_conditions.include?(method)
+          }
+          raise ArgumentError, 'conditions may only include ' +
+            @valid_conditions.inspect
+        end
       end
 
       # An internal helper method for constructing a nested set from

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

@@ -6,6 +6,7 @@
 
 require 'racc/parser.rb'
 
+require 'rack/mount/utils'
 require 'rack/mount/strexp/tokenizer'
 
 module Rack

data/lib/rack/mount/vendor/multimap/multimap.rb

@@ -529,6 +529,32 @@ class Multimap
     @hash.values_at(*keys)
   end
 
+  def marshal_dump #:nodoc:
+    @hash
+  end
+
+  def marshal_load(hash) #:nodoc:
+    @hash = hash
+  end
+
+  def to_yaml(opts = {}) #:nodoc:
+    YAML::quick_emit(self, opts) do |out|
+      out.map(taguri, to_yaml_style) do |map|
+        @hash.each do |k, v|
+          map.add(k, v)
+        end
+        map.add('__default__', @hash.default)
+      end
+    end
+  end
+
+  def yaml_initialize(tag, val) #:nodoc:
+    default = val.delete('__default__')
+    @hash = val
+    @hash.default = default
+    self
+  end
+
   protected
     def _internal_hash #:nodoc:
       @hash

data/lib/rack/mount/vendor/multimap/multiset.rb

@@ -159,4 +159,27 @@ class Multiset < Set
     superset?(set) && subset?(set)
   end
   alias_method :==, :eql?
+
+  def marshal_dump #:nodoc:
+    @hash
+  end
+
+  def marshal_load(hash) #:nodoc:
+    @hash = hash
+  end
+
+  def to_yaml(opts = {}) #:nodoc:
+    YAML::quick_emit(self, opts) do |out|
+      out.map(taguri, to_yaml_style) do |map|
+        @hash.each do |k, v|
+          map.add(k, v)
+        end
+      end
+    end
+  end
+
+  def yaml_initialize(tag, val) #:nodoc:
+    @hash = val
+    self
+  end
 end

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

@@ -54,16 +54,10 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\\[dDsSwW]/))
          action { [:CCLASS, text] }
 
-      when (text = @ss.scan(/\^/))
-         action { [:L_ANCHOR, text] }
-
-      when (text = @ss.scan(/\\A/))
+      when (text = @ss.scan(/\^|\\A/))
          action { [:L_ANCHOR, text] }
 
-      when (text = @ss.scan(/\$/))
-         action { [:R_ANCHOR, text] }
-
-      when (text = @ss.scan(/\\Z/))
+      when (text = @ss.scan(/\$|\\Z/))
          action { [:R_ANCHOR, text] }
 
       when (text = @ss.scan(/<(\w+)>/))

metadata

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