mustermann19 0.3.1.2 → 0.4.0

data/mustermann/lib/mustermann/ast/compiler.rb

@@ -0,0 +1,156 @@
+require 'mustermann/ast/translator'
+
+module Mustermann
+  # @see Mustermann::AST::Pattern
+  module AST
+    # Regexp compilation logic.
+    # @!visibility private
+    class Compiler < Translator
+      raises CompileError
+
+      # Trivial compilations
+      translate(Array)      { |**o| map { |e| t(e, **o) }.join  }
+      translate(:node)      { |**o| t(payload, **o)             }
+      translate(:separator) { |**o| Regexp.escape(payload)      }
+      translate(:optional)  { |**o| "(?:%s)?" % t(payload, **o) }
+      translate(:char)      { |**o| t.encoded(payload, **o)     }
+
+      translate :union do |**options|
+        "(?:%s)" % payload.map { |e| "(?:%s)" % t(e, **options) }.join(?|)
+      end
+
+      translate :expression do |greedy: true, **options|
+        t(payload, allow_reserved: operator.allow_reserved, greedy: greedy && !operator.allow_reserved,
+          parametric: operator.parametric, separator: operator.separator, **options)
+      end
+
+      translate :with_look_ahead do |**options|
+        lookahead = each_leaf.inject("") do |ahead, element|
+          ahead + t(element, skip_optional: true, lookahead: ahead, greedy: false, no_captures: true, **options).to_s
+        end
+        lookahead << (at_end ? '$' : '/')
+        t(head, lookahead: lookahead, **options) + t(payload, **options)
+      end
+
+      # Capture compilation is complex. :(
+      # @!visibility private
+      class Capture < NodeTranslator
+        register :capture
+
+        # @!visibility private
+        def translate(**options)
+          return pattern(options) if options[:no_captures]
+          "(?<#{name}>#{translate(no_captures: true, **options)})"
+        end
+
+        # @return [String] regexp without the named capture
+        # @!visibility private
+        def pattern(capture: nil, **options)
+          case capture
+          when Symbol then from_symbol(capture, **options)
+          when Array  then from_array(capture, **options)
+          when Hash   then from_hash(capture, **options)
+          when String then from_string(capture, **options)
+          when nil    then from_nil(**options)
+          else capture
+          end
+        end
+
+        private
+          def qualified(string, greedy: true, **options)        "#{string}#{qualifier || "+#{?? unless greedy}"}"                    end
+          def with_lookahead(string, lookahead: nil, **options)  lookahead ? "(?:(?!#{lookahead})#{string})" : string                end
+          def from_hash(hash,     **options)                     pattern(capture: hash[name.to_sym], **options)                      end
+          def from_array(array,   **options)                     Regexp.union(*array.map { |e| pattern(capture: e, **options) })     end
+          def from_symbol(symbol, **options)                     qualified(with_lookahead("[[:#{symbol}:]]", **options), **options)  end
+          def from_string(string, **options)                     Regexp.new(string.chars.map { |c| t.encoded(c, **options) }.join)   end
+          def from_nil(**options)                                qualified(with_lookahead(default(**options), **options), **options) end
+          def default(**options)                                 constraint || "[^/\\?#]"                                            end
+      end
+
+      # @!visibility private
+      class Splat < Capture
+        register :splat, :named_splat
+        # splats are always non-greedy
+        # @!visibility private
+        def pattern(**options)
+          constraint || ".*?"
+        end
+      end
+
+      # @!visibility private
+      class Variable < Capture
+        register :variable
+
+        # @!visibility private
+        def translate(**options)
+          return super(**options) if explode or not options[:parametric]
+          parametric super(parametric: false, **options)
+        end
+
+        # @!visibility private
+        def pattern(parametric: false, separator: nil, **options)
+          register_param(parametric: parametric, separator: separator, **options)
+          pattern = super(**options)
+          pattern = parametric(pattern) if parametric
+          pattern = "#{pattern}(?:#{Regexp.escape(separator)}#{pattern})*" if explode and separator
+          pattern
+        end
+
+        # @!visibility private
+        def parametric(string)
+          "#{Regexp.escape(name)}(?:=#{string})?"
+        end
+
+        # @!visibility private
+        def qualified(string, **options)
+          prefix ? "#{string}{1,#{prefix}}" : super(string, **options)
+        end
+
+        # @!visibility private
+        def default(allow_reserved: false, **options)
+          allow_reserved ? '[\w\-\.~%\:/\?#\[\]@\!\$\&\'\(\)\*\+,;=]' : '[\w\-\.~%]'
+        end
+
+        # @!visibility private
+        def register_param(parametric: false, split_params: nil, separator: nil, **options)
+          return unless explode and split_params
+          split_params[name] = { separator: separator, parametric: parametric }
+        end
+      end
+
+      # @return [String] Regular expression for matching the given character in all representations
+      # @!visibility private
+      def encoded(char, uri_decode: true, space_matches_plus: true, **options)
+        return Regexp.escape(char) unless uri_decode
+        encoded = escape(char, escape: /./)
+        list    = [escape(char), encoded.downcase, encoded.upcase].uniq.map { |c| Regexp.escape(c) }
+        if char == " "
+          list << encoded('+') if space_matches_plus
+          list << " "
+        end
+        "(?:%s)" % list.join("|")
+      end
+
+      # Compiles an AST to a regular expression.
+      # @param [Mustermann::AST::Node] ast the tree
+      # @return [Regexp] corresponding regular expression.
+      #
+      # @!visibility private
+      def self.compile(ast, **options)
+        new.compile(ast, **options)
+      end
+
+      # Compiles an AST to a regular expression.
+      # @param [Mustermann::AST::Node] ast the tree
+      # @return [Regexp] corresponding regular expression.
+      #
+      # @!visibility private
+      def compile(ast, except: nil, **options)
+        except &&= "(?!#{translate(except, no_captures: true, **options)}\\Z)"
+        Regexp.new("#{except}#{translate(ast, **options)}")
+      end
+    end
+
+    private_constant :Compiler
+  end
+end

data/spec/ast_spec.rb

@@ -0,0 +1,14 @@
+require 'support'
+require 'mustermann/ast/node'
+
+describe Mustermann::AST do
+  describe :type do
+    example { Mustermann::AST::Node[:char].type     .should be == :char }
+    example { Mustermann::AST::Node[:char].new.type .should be == :char }
+  end
+
+  describe :min_size do
+    example { Mustermann::AST::Node[:char].new.min_size.should be == 1 }
+    example { Mustermann::AST::Node[:node].new.min_size.should be == 0 }
+  end
+end

data/spec/mustermann_spec.rb

@@ -15,7 +15,7 @@ describe Mustermann do
       example { Mustermann.new('', type: :template) .should be_a(Mustermann::Template) }
 
       example { expect { Mustermann.new('', foo:  :bar) }.to raise_error(ArgumentError, "unsupported option :foo for Mustermann::Sinatra") }
-      example { expect { Mustermann.new('', type: :ast) }.to raise_error(ArgumentError, "unsupported type :ast") }
+      example { expect { Mustermann.new('', type: :ast) }.to raise_error(ArgumentError, /unsupported type :ast/) }
     end
 
     context "pattern argument" do
@@ -59,7 +59,8 @@ describe Mustermann do
     example { Mustermann[:simple]   .should be == Mustermann::Simple   }
     example { Mustermann[:template] .should be == Mustermann::Template }
 
-    example { expect { Mustermann[:ast] }.to raise_error(ArgumentError, "unsupported type :ast") }
+    example { expect { Mustermann[:ast]      }.to raise_error(ArgumentError, /unsupported type :ast/) }
+    example { expect { Mustermann[:expander] }.to raise_error(ArgumentError, "unsupported type :expander") }
   end
 
   describe :extend_object do

data/spec/rails_spec.rb

@@ -593,4 +593,49 @@ describe Mustermann::Rails do
       example { pattern.peek_params("/foo bar")       .should be_nil }
     end
   end
+
+  context 'version compatibility' do
+    context '2.3' do
+      pattern '(foo)', version: '2.3' do
+        it { should_not match("")      }
+        it { should_not match("foo")   }
+        it { should     match("(foo)") }
+      end
+
+      pattern '\\:name', version: '2.3' do
+        it { should match('%5cfoo').capturing(name: 'foo') }
+      end
+    end
+
+    context '3.0' do
+      pattern '(foo)', version: '3.0' do
+        it { should match("")      }
+        it { should match("foo")   }
+      end
+
+      pattern '\\:name', version: '3.0' do
+        it { should     match(':name') }
+        it { should_not match(':foo')  }
+      end
+    end
+
+    context '3.2' do
+      pattern '\\:name', version: '3.2' do
+        it { should match('%5cfoo').capturing(name: 'foo') }
+      end
+    end
+
+    context '4.0' do
+      pattern '\\:name', version: '4.0' do
+        it { should match('foo').capturing(name: 'foo') }
+      end
+    end
+
+    context '4.2' do
+      pattern '\\:name', version: '4.2' do
+        it { should     match(':name') }
+        it { should_not match(':foo')  }
+      end
+    end
+  end
 end

data/spec/shell_spec.rb

@@ -59,8 +59,10 @@ describe Mustermann::Shell do
     it { should_not match('/foo/')    }
   end
 
-  pattern '/föö' do
-    it { should match("/f%C3%B6%C3%B6") }
+  unless defined?(JRUBY_VERSION)
+    pattern '/föö' do
+      it { should match("/f%C3%B6%C3%B6") }
+    end
   end
 
   pattern '/test$/' do

data/spec/sinatra_spec.rb

@@ -464,6 +464,18 @@ describe Mustermann::Sinatra do
     it { should_not expand(a: 'foo', b: 'bar', c: 'baz')   }
   end
 
+  pattern "/:a/:b|:c" do
+    it { should match("foo")      .capturing c: 'foo'           }
+    it { should match("/foo/bar") .capturing a: 'foo', b: 'bar' }
+
+    it { should generate_template('/{a}/{b}') }
+    it { should generate_template('{c}')      }
+
+    it { should expand(a: 'foo', b: 'bar') .to('/foo/bar') }
+    it { should expand(c: 'foo')           .to('foo')      }
+    it { should_not expand(a: 'foo', b: 'bar', c: 'baz')   }
+  end
+
   pattern '/:foo', capture: /\d+/ do
     it { should match('/1')   .capturing foo: '1'   }
     it { should match('/123') .capturing foo: '123' }
@@ -649,11 +661,6 @@ describe Mustermann::Sinatra do
         to raise_error(Mustermann::ParseError, 'unexpected ? while parsing "foo??bar"')
     end
 
-    example '| outside of group' do
-      expect { Mustermann::Sinatra.new('foo|bar') }.
-        to raise_error(Mustermann::ParseError, 'unexpected | while parsing "foo|bar"')
-    end
-
     example 'dangling escape' do
       expect { Mustermann::Sinatra.new('foo\\') }.
         to raise_error(Mustermann::ParseError, 'unexpected end of string while parsing "foo\\\\"')

data/spec/support/match_matcher.rb

@@ -36,4 +36,4 @@ RSpec::Matchers.define :match do |expected|
       actual.to_s, expected
     ]
   end
-end
+end

data/spec/support/pattern.rb

@@ -31,7 +31,7 @@ module Support
     end
 
     def subject_for(pattern, *args)
-      instance = Timeout.timeout(1) { described_class.new(pattern, *args) }
+      instance = Timeout.timeout(defined?(JRUBY_VERSION) ? 3 : 1) { described_class.new(pattern, *args) }
       proc { instance }
     rescue Timeout::Error => error
       proc { raise Timeout::Error, "could not compile #{pattern.inspect} in time", error.backtrace }
@@ -39,4 +39,4 @@ module Support
       proc { raise error }
     end
   end
-end
+end

data/spec/template_spec.rb

@@ -561,6 +561,11 @@ describe Mustermann::Template do
     end
 
     context 'operator +' do
+      pattern '/{a}/{+b}' do
+        it { should match('/foo/bar/baz').capturing(a: 'foo', b: 'bar/baz') }
+        it { should expand(a: 'foo/bar', b: 'foo/bar').to('/foo%2Fbar/foo/bar') }
+      end
+
       context 'prefix' do
         pattern '{+a:3}/bar' do
           it { should match('foo/bar') .capturing a: 'foo' }

metadata

@@ -1,158 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: mustermann19
 version: !ruby/object:Gem::Version
-  version: 0.3.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Konstantin Haase
 - namusyaka
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: enumerable-lazy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: enumerable-lazy
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rspec-its
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: addressable
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :development
+  name: sinatra
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rack-test
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: yard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: simplecov
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: coveralls
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: library implementing patterns that behave like regular expressions for
-  use in Ruby 1.9
+description: library implementing patterns that behave like regular expressions for use in Ruby 1.9
 email: namusyaka@gmail.com
 executables: []
 extensions: []
@@ -172,6 +171,7 @@ files:
 - bench/simple_vs_sinatra.rb
 - bench/template_vs_addressable.rb
 - lib/mustermann.rb
+- lib/mustermann/ast/boundaries.rb
 - lib/mustermann/ast/compiler.rb
 - lib/mustermann/ast/expander.rb
 - lib/mustermann/ast/node.rb
@@ -197,6 +197,8 @@ files:
 - lib/mustermann/pattern_cache.rb
 - lib/mustermann/pyramid.rb
 - lib/mustermann/rails.rb
+- lib/mustermann/rails/versions.rb
+- lib/mustermann/regexp.rb
 - lib/mustermann/regexp_based.rb
 - lib/mustermann/regular.rb
 - lib/mustermann/router.rb
@@ -209,8 +211,12 @@ files:
 - lib/mustermann/string_scanner.rb
 - lib/mustermann/template.rb
 - lib/mustermann/to_pattern.rb
+- lib/mustermann/uri_template.rb
 - lib/mustermann/version.rb
 - mustermann.gemspec
+- mustermann/README.md
+- mustermann/lib/mustermann/ast/compiler.rb
+- spec/ast_spec.rb
 - spec/composite_spec.rb
 - spec/expander_spec.rb
 - spec/express_spec.rb
@@ -246,7 +252,7 @@ homepage: https://github.com/namusyaka/mustermann
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -261,12 +267,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: use patterns like regular expressions
 test_files:
+- spec/ast_spec.rb
 - spec/composite_spec.rb
 - spec/expander_spec.rb
 - spec/express_spec.rb
@@ -298,4 +305,4 @@ test_files:
 - spec/support/scan_matcher.rb
 - spec/template_spec.rb
 - spec/to_pattern_spec.rb
-has_rdoc: 
+has_rdoc: