rack-mount 0.0.1 → 0.6.13

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 29
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 13
+  version: 0.6.13
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,29 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -05:00
+date: 2010-08-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: multimap
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: racc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rexical
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Stackable dynamic tree based Rack router
 email: josh@joshpeek.com
 executables: []
@@ -39,35 +69,43 @@ 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
-- lib/rack/mount/const.rb
-- lib/rack/mount/exceptions.rb
+- lib/rack/mount/code_generation.rb
 - lib/rack/mount/generatable_regexp.rb
-- lib/rack/mount/generation/route.rb
-- lib/rack/mount/generation/route_set.rb
-- lib/rack/mount/meta_method.rb
-- lib/rack/mount/mixover.rb
 - lib/rack/mount/multimap.rb
 - lib/rack/mount/prefix.rb
-- lib/rack/mount/recognition/code_generation.rb
-- lib/rack/mount/recognition/route.rb
-- lib/rack/mount/recognition/route_set.rb
 - 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/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.rb
-- README.rdoc
-- LICENSE
+- 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
+- lib/rack/mount/vendor/regin/regin/character.rb
+- lib/rack/mount/vendor/regin/regin/character_class.rb
+- lib/rack/mount/vendor/regin/regin/collection.rb
+- lib/rack/mount/vendor/regin/regin/expression.rb
+- lib/rack/mount/vendor/regin/regin/group.rb
+- lib/rack/mount/vendor/regin/regin/options.rb
+- 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/version.rb
 has_rdoc: true
 homepage: http://github.com/josh/rack-mount
 licenses: []
@@ -78,21 +116,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: rack-mount
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Stackable dynamic tree based Rack router

data/lib/rack/mount/const.rb

@@ -1,45 +0,0 @@
-module Rack::Mount
-  module Const
-    RACK_ROUTING_ARGS = 'rack.routing_args'.freeze
-
-    begin
-      eval('/(?<foo>.*)/').named_captures
-      SUPPORTS_NAMED_CAPTURES = true
-      REGEXP_NAMED_CAPTURE = '(?<%s>%s)'.freeze
-    rescue SyntaxError, NoMethodError
-      SUPPORTS_NAMED_CAPTURES = false
-      REGEXP_NAMED_CAPTURE = '(?:<%s>%s)'.freeze
-    end
-
-    EMPTY_ARRAY = [].freeze
-    EMPTY_HASH = {}.freeze
-
-    NULL = "\0".freeze
-
-    CONTENT_TYPE    = 'Content-Type'.freeze
-    CONTINUE        = '100-continue'.freeze
-    DELETE          = 'PUT'.freeze
-    EMPTY_STRING    = ''.freeze
-    EXPECT          = 'Expect'.freeze
-    GET             = 'GET'.freeze
-    HEAD            = 'HEAD'.freeze
-    PATH_INFO       = 'PATH_INFO'.freeze
-    POST            = 'POST'.freeze
-    PUT             = 'PUT'.freeze
-    REQUEST_METHOD  = 'REQUEST_METHOD'.freeze
-    SCRIPT_NAME     = 'SCRIPT_NAME'.freeze
-    SLASH           = '/'.freeze
-    TEXT_SLASH_HTML = 'text/html'.freeze
-
-    DEFAULT_CONTENT_TYPE_HEADERS = {CONTENT_TYPE => TEXT_SLASH_HTML}.freeze
-    HTTP_METHODS = [GET, HEAD, POST, PUT, DELETE].freeze
-
-    OK = 'OK'.freeze
-    NOT_FOUND = 'Not Found'.freeze
-    EXPECTATION_FAILED = 'Expectation failed'.freeze
-
-    OK_RESPONSE = [200, DEFAULT_CONTENT_TYPE_HEADERS, [OK].freeze].freeze
-    NOT_FOUND_RESPONSE = [404, DEFAULT_CONTENT_TYPE_HEADERS, [NOT_FOUND].freeze].freeze
-    EXPECTATION_FAILED_RESPONSE = [417, DEFAULT_CONTENT_TYPE_HEADERS, [EXPECTATION_FAILED].freeze].freeze
-  end
-end

data/lib/rack/mount/exceptions.rb

@@ -1,3 +0,0 @@
-module Rack::Mount
-  class RoutingError < StandardError; end
-end

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

@@ -1,57 +0,0 @@
-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
-
-        @required_params.freeze
-        @required_defaults.freeze
-        @generation_keys.freeze
-      end
-
-      def generate(methods, params = {}, recall = {})
-        if methods.is_a?(Array)
-          result = methods.map { |m| generate_method(m, params, recall, @defaults) || (return nil) }
-        else
-          result = generate_method(methods, params, recall, @defaults)
-        end
-
-        if result
-          @defaults.each do |key, value|
-            params.delete(key) if params[key] == value
-          end
-        end
-
-        result
-      end
-
-      private
-        def generate_method(method, params, recall, defaults)
-          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)
-        end
-    end
-  end
-end

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

@@ -1,163 +0,0 @@
-require 'rack/mount/utils'
-require 'forwardable'
-
-module Rack::Mount
-  module Generation
-    module RouteSet
-      # Adds generation related concerns to RouteSet.new.
-      def initialize(*args)
-        @named_routes = {}
-        @generation_key_analyzer = Analysis::Frequency.new
-
-        super
-      end
-
-      # Adds generation aspects to RouteSet#add_route.
-      def add_route(*args)
-        route = super
-        @named_routes[route.name] = route if route.name
-        @generation_key_analyzer << route.generation_keys
-        route
-      end
-
-      # Generates path from identifiers or significant keys.
-      #
-      # To generate a url by named route, pass the name in as a +Symbol+.
-      #   url(:dashboard) # => "/dashboard"
-      #
-      # Additional parameters can be passed in as a hash
-      #   url(:people, :id => "1") # => "/people/1"
-      #
-      # If no name route is given, it will fall back to a slower
-      # generation search.
-      #   url(:controller => "people", :action => "show", :id => "1")
-      #     # => "/people/1"
-      def url(*args)
-        named_route, params, recall = extract_params!(*args)
-
-        params = URISegment.wrap_values(params)
-        recall = URISegment.wrap_values(recall)
-
-        unless result = generate(:path_info, named_route, params, recall)
-          return
-        end
-
-        uri, params = result
-        params.each do |k, v|
-          if v._value
-            params[k] = v._value
-          else
-            params.delete(k)
-          end
-        end
-
-        uri << "?#{Utils.build_nested_query(params)}" if uri && params.any?
-        uri
-      end
-
-      def generate(method, *args) #:nodoc:
-        raise 'route set not finalized' unless @generation_graph
-
-        named_route, params, recall = extract_params!(*args)
-        merged = recall.merge(params)
-        route = nil
-
-        if named_route
-          if route = @named_routes[named_route.to_sym]
-            recall = route.defaults.merge(recall)
-            url = route.generate(method, params, recall)
-            [url, params]
-          else
-            raise RoutingError, "#{named_route} failed to generate from #{params.inspect}"
-          end
-        else
-          keys = @generation_keys.map { |key|
-            if k = merged[key]
-              k.to_s
-            else
-              nil
-            end
-          }
-          @generation_graph[*keys].each do |r|
-            if url = r.generate(method, params, recall)
-              return [url, params]
-            end
-          end
-
-          raise RoutingError, "No route matches #{params.inspect}"
-        end
-      end
-
-      def rehash #:nodoc:
-        @generation_keys  = build_generation_keys
-        @generation_graph = build_generation_graph
-
-        super
-      end
-
-      private
-        def expire!
-          @generation_keys = @generation_graph = nil
-          super
-        end
-
-        def build_generation_graph
-          build_nested_route_set(@generation_keys) { |k, i|
-            if k = @generation_key_analyzer.possible_keys[i][k]
-              k.to_s
-            else
-              nil
-            end
-          }
-        end
-
-        def build_generation_keys
-          @generation_key_analyzer.report
-        end
-
-        def extract_params!(*args)
-          case args.length
-          when 3
-            named_route, params, recall = args
-          when 2
-            if args[0].is_a?(Hash) && args[1].is_a?(Hash)
-              params, recall = args
-            else
-              named_route, params = args
-            end
-          when 1
-            if args[0].is_a?(Hash)
-              params = args[0]
-            else
-              named_route = args[0]
-            end
-          else
-            raise ArgumentError
-          end
-
-          named_route ||= nil
-          params ||= {}
-          recall ||= {}
-
-          [named_route, params.dup, recall.dup]
-        end
-
-        class URISegment < Struct.new(:_value)
-          def self.wrap_values(hash)
-            hash.inject({}) { |h, (k, v)| h[k] = new(v); h }
-          end
-
-          extend Forwardable
-          def_delegators :_value, :==, :eql?, :hash
-
-          def to_param
-            @to_param ||= begin
-              v = _value.respond_to?(:to_param) ? _value.to_param : _value
-              Utils.escape_uri(v)
-            end
-          end
-          alias_method :to_s, :to_param
-        end
-    end
-  end
-end

data/lib/rack/mount/meta_method.rb

@@ -1,104 +0,0 @@
-module Rack::Mount
-  class MetaMethod #:nodoc:
-    class Block < Array #:nodoc:
-      def initialize(*parts)
-        replace(parts)
-        yield(self) if block_given?
-      end
-
-      def multiline?
-        length > 1
-      end
-
-      def inspect(indented = 2)
-        return Const::EMPTY_STRING if empty?
-        space = ' ' * indented
-        space + map { |p|
-          if p.is_a?(Condition)
-            p.inspect(indented)
-          else
-            p
-          end
-        }.join("\n#{space}")
-      end
-
-      def to_str
-        map { |p| p.to_str }.join('; ')
-      end
-    end
-
-    class Condition #:nodoc:
-      attr_accessor :body, :else
-
-      def initialize(*conditions)
-        @conditions = conditions.map { |c| c.is_a?(Block) ? c : Block.new(c) }
-        @body = Block.new
-        @else = Block.new
-        yield(@body) if block_given?
-      end
-
-      def <<(condition)
-        @conditions << condition
-      end
-
-      def inspect(indented = 2)
-        return @body.inspect(indented) if @conditions.empty?
-        space = ' ' * indented
-        str = 'if '
-        str << @conditions.map { |b|
-          b.multiline? ?
-            "begin\n#{b.inspect(indented + 4)}\n#{space}  end" :
-            b.inspect(0)
-        }.join(' && ')
-        str << "\n#{@body.inspect(indented + 2)}" if @body.any?
-        if @else.any?
-          str << "\n#{space}else\n#{@else.inspect(indented + 2)}"
-        end
-        str << "\n#{space}end"
-        str
-      end
-
-      def to_str
-        return @body.to_str if @conditions.empty?
-        str = 'if '
-        str << @conditions.map { |b|
-          b.multiline? ? "(#{b.to_str})" : b.to_str
-        }.join(' && ')
-        str << "; #{@body.to_str}" if @body.any?
-        if @else.any?
-          str << "; else; #{@else.to_str}"
-        end
-        str << "; end"
-        str
-      end
-    end
-
-    def initialize(sym, *args)
-      @sym = sym
-      @args = args
-      @body = Block.new
-    end
-
-    def <<(line)
-      @body << line
-    end
-
-    def inspect
-      str = ""
-      str << "def #{@sym}"
-      str << "(#{@args.join(', ')})" if @args.any?
-      str << "\n#{@body.inspect}" if @body.any?
-      str << "\nend\n"
-      str
-    end
-
-    def to_str
-      str = []
-      str << "def #{@sym}"
-      str << "(#{@args.join(', ')})" if @args.any?
-      str << "\n#{@body.to_str}" if @body.any?
-      str << "\nend"
-      str.join
-    end
-  end
-end

data/lib/rack/mount/mixover.rb

@@ -1,47 +0,0 @@
-module Rack::Mount
-  # A mixin that changes the behavior of +include+. Instead of modules
-  # being chained as a superclass, they are mixed into the objects
-  # metaclass. This allows mixins to be stacked ontop of the instance
-  # methods.
-  module Mixover
-    module InstanceMethods #:nodoc:
-      def dup
-        obj = super
-        included_modules = (class << self; included_modules; end) - (class << obj; included_modules; end)
-        included_modules.reverse.each { |mod| obj.extend(mod) }
-        obj
-      end
-    end
-
-    # Replaces include with a lazy version.
-    def include(*mod)
-      (@included_modules ||= []).push(*mod)
-    end
-
-    def new(*args, &block) #:nodoc:
-      obj = allocate
-      obj.extend(InstanceMethods)
-      (@included_modules ||= []).each { |mod| obj.extend(mod) }
-      obj.send(:initialize, *args, &block)
-      obj
-    end
-
-    # Create a new class without an included module.
-    def new_without_module(mod, *args, &block)
-      old_included_modules = (@included_modules ||= []).dup
-      @included_modules.delete(mod)
-      new(*args, &block)
-    ensure
-      @included_modules = old_included_modules
-    end
-
-    # Create a new class temporarily with a module.
-    def new_with_module(mod, *args, &block)
-      old_included_modules = (@included_modules ||= []).dup
-      include(mod)
-      new(*args, &block)
-    ensure
-      @included_modules = old_included_modules
-    end
-  end
-end

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

@@ -1,99 +0,0 @@
-require 'rack/mount/meta_method'
-
-module Rack::Mount
-  module Recognition
-    module CodeGeneration #:nodoc:
-      def _expired_call(env) #:nodoc:
-        raise 'route set not finalized'
-      end
-
-      def rehash
-        super
-        optimize_call!
-      end
-
-      private
-        def expire!
-          class << self
-            alias_method :call, :_expired_call
-          end
-
-          super
-        end
-
-        def optimize_container_iterator(container)
-          m = MetaMethod.new(:optimized_each, :req)
-          m << 'env = req.env'
-
-          container.each_with_index { |route, i|
-            path_info_unanchored = route.conditions[:path_info] &&
-              !Utils.regexp_anchored?(route.conditions[:path_info])
-            m << "route = self[#{i}]"
-            m << 'routing_args = route.defaults.dup'
-
-            m << matchers = MetaMethod::Condition.new do |body|
-              body << "env[#{@parameters_key.inspect}] = routing_args"
-              body << "response = route.app.call(env)"
-              body << "return response unless response[0].to_i == 417"
-            end
-
-            route.conditions.each do |method, condition|
-              matchers << MetaMethod::Block.new do |matcher|
-                matcher << c = MetaMethod::Condition.new("m = req.#{method}.match(#{condition.inspect})") do |b|
-                  b << "matches = m.captures" if route.named_captures[method].any?
-                  route.named_captures[method].each do |k, i|
-                    b << MetaMethod::Condition.new("p = matches[#{i}]") do |c2|
-                      c2 << "routing_args[#{k.inspect}] = Utils.unescape_uri(p)"
-                    end
-                  end
-                  if method == :path_info && !Utils.regexp_anchored?(condition)
-                    b << "env[Prefix::KEY] = m.to_s"
-                  end
-                  b << "true"
-                end
-                c.else = MetaMethod::Block.new("false")
-              end
-            end
-          }
-
-          m << 'nil'
-          # puts "\n#{m.inspect}"
-          container.instance_eval(m, __FILE__, __LINE__)
-        end
-
-        def optimize_call!
-          method = MetaMethod.new(:call, :env)
-
-          if @routes.empty?
-            method << 'env[Const::EXPECT] != Const::CONTINUE ? Const::NOT_FOUND_RESPONSE : Const::EXPECTATION_FAILED_RESPONSE'
-          else
-            method << 'begin'
-            method << 'set_expectation = env[Const::EXPECT] != Const::CONTINUE'
-            method << 'env[Const::EXPECT] = Const::CONTINUE if set_expectation'
-
-            method << 'env[Const::PATH_INFO] = Utils.normalize_path(env[Const::PATH_INFO])'
-            method << "req = #{@request_class.name}.new(env)"
-            cache = false
-            keys = @recognition_keys.map { |key|
-              if key.is_a?(Array)
-                cache = true
-                key.call_source(:cache, :req)
-              else
-                "req.#{key}"
-              end
-            }.join(', ')
-            method << 'cache = {}' if cache
-            method << "container = @recognition_graph[#{keys}]"
-            method << "optimize_container_iterator(container) unless container.respond_to?(:optimized_each)"
-            method << "container.optimized_each(req) || (set_expectation ? Const::NOT_FOUND_RESPONSE : Const::EXPECTATION_FAILED_RESPONSE)"
-            method << 'ensure'
-            method << 'env.delete(Const::EXPECT) if set_expectation'
-            method << 'end'
-          end
-
-          # puts "\n#{method.inspect}"
-          instance_eval(method, __FILE__, __LINE__)
-        end
-    end
-  end
-end