mustermann 0.2.0 → 0.3.0

data/spec/mustermann_spec.rb

@@ -5,16 +5,36 @@ require 'sinatra/base'
 
 describe Mustermann do
   describe :new do
-    example { Mustermann.new('')                  .should be_a(Mustermann::Sinatra)  }
-    example { Mustermann.new('', type: :identity) .should be_a(Mustermann::Identity) }
-    example { Mustermann.new('', type: :rails)    .should be_a(Mustermann::Rails)    }
-    example { Mustermann.new('', type: :shell)    .should be_a(Mustermann::Shell)    }
-    example { Mustermann.new('', type: :sinatra)  .should be_a(Mustermann::Sinatra)  }
-    example { Mustermann.new('', type: :simple)   .should be_a(Mustermann::Simple)   }
-    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") }
+    context "string argument" do
+      example { Mustermann.new('')                  .should be_a(Mustermann::Sinatra)  }
+      example { Mustermann.new('', type: :identity) .should be_a(Mustermann::Identity) }
+      example { Mustermann.new('', type: :rails)    .should be_a(Mustermann::Rails)    }
+      example { Mustermann.new('', type: :shell)    .should be_a(Mustermann::Shell)    }
+      example { Mustermann.new('', type: :sinatra)  .should be_a(Mustermann::Sinatra)  }
+      example { Mustermann.new('', type: :simple)   .should be_a(Mustermann::Simple)   }
+      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") }
+    end
+
+    context "pattern argument" do
+      subject(:pattern) { Mustermann.new('') }
+      example { Mustermann.new(pattern).should be == pattern }
+      example { Mustermann.new(pattern, type: :rails).should be_a(Mustermann::Sinatra) }
+    end
+
+    context "regexp argument" do
+      example { Mustermann.new(//)               .should be_a(Mustermann::Regular) }
+      example { Mustermann.new(//, type: :rails) .should be_a(Mustermann::Regular) }
+    end
+
+    context "argument implementing #to_pattern" do
+      subject(:pattern) { Class.new { def to_pattern(**o) Mustermann.new('foo', **o) end }.new }
+      example { Mustermann.new(pattern)               .should be_a(Mustermann::Sinatra) }
+      example { Mustermann.new(pattern, type: :rails) .should be_a(Mustermann::Rails) }
+      example { Mustermann.new(pattern).to_s.should be == 'foo' }
+    end
   end
 
   describe :[] do

data/spec/pattern_spec.rb

@@ -1,26 +1,49 @@
 require 'support'
 require 'mustermann/pattern'
+require 'mustermann/sinatra'
+require 'mustermann/rails'
 
 describe Mustermann::Pattern do
   describe :=== do
     it 'raises a NotImplementedError when used directly' do
-      expect { described_class.new("") === "" }.to raise_error(NotImplementedError)
+      expect { Mustermann::Pattern.new("") === "" }.to raise_error(NotImplementedError)
     end
   end
 
   describe :initialize do
     it 'raises an ArgumentError for unknown options' do
-      expect { described_class.new("", foo: :bar) }.to raise_error(ArgumentError)
+      expect { Mustermann::Pattern.new("", foo: :bar) }.to raise_error(ArgumentError)
     end
 
     it 'does not complain about unknown options if ignore_unknown_options is enabled' do
-      expect { described_class.new("", foo: :bar, ignore_unknown_options: true) }.not_to raise_error
+      expect { Mustermann::Pattern.new("", foo: :bar, ignore_unknown_options: true) }.not_to raise_error
     end
   end
 
   describe :expand do
-    subject(:pattern) { described_class.new("") }
+    subject(:pattern) { Mustermann::Pattern.new("") }
     it { should_not respond_to(:expand) }
     it { expect { pattern.expand }.to raise_error(NotImplementedError) }
   end
+
+  describe :== do
+    example { Mustermann::Pattern.new('/foo') .should     be == Mustermann::Pattern.new('/foo') }
+    example { Mustermann::Pattern.new('/foo') .should_not be == Mustermann::Pattern.new('/bar') }
+    example { Mustermann::Sinatra.new('/foo') .should     be == Mustermann::Sinatra.new('/foo') }
+    example { Mustermann::Rails.new('/foo')   .should_not be == Mustermann::Sinatra.new('/foo') }
+  end
+
+  describe :eql? do
+    example { Mustermann::Pattern.new('/foo') .should     be_eql Mustermann::Pattern.new('/foo') }
+    example { Mustermann::Pattern.new('/foo') .should_not be_eql Mustermann::Pattern.new('/bar') }
+    example { Mustermann::Sinatra.new('/foo') .should     be_eql Mustermann::Sinatra.new('/foo') }
+    example { Mustermann::Rails.new('/foo')   .should_not be_eql Mustermann::Sinatra.new('/foo') }
+  end
+
+  describe :equal? do
+    example { Mustermann::Pattern.new('/foo') .should     be_equal Mustermann::Pattern.new('/foo') }
+    example { Mustermann::Pattern.new('/foo') .should_not be_equal Mustermann::Pattern.new('/bar') }
+    example { Mustermann::Sinatra.new('/foo') .should     be_equal Mustermann::Sinatra.new('/foo') }
+    example { Mustermann::Rails.new('/foo')   .should_not be_equal Mustermann::Sinatra.new('/foo') }
+  end
 end

data/spec/regexp_based_spec.rb

@@ -3,6 +3,6 @@ require 'mustermann/regexp_based'
 
 describe Mustermann::RegexpBased do
   it 'raises a NotImplementedError when used directly' do
-    expect { described_class.new("") === "" }.to raise_error(NotImplementedError)
+    expect { Mustermann::RegexpBased.new("") === "" }.to raise_error(NotImplementedError)
   end
 end

data/spec/regular_spec.rb

@@ -0,0 +1,36 @@
+require 'support'
+require 'mustermann/regular'
+
+describe Mustermann::Regular do
+  extend Support::Pattern
+
+  pattern '' do
+    it { should     match('')  }
+    it { should_not match('/') }
+  end
+
+  pattern '/' do
+    it { should     match('/')    }
+    it { should_not match('/foo') }
+  end
+
+  pattern '/foo' do
+    it { should     match('/foo')     }
+    it { should_not match('/bar')     }
+    it { should_not match('/foo.bar') }
+  end
+
+  pattern '/foo/bar' do
+    it { should     match('/foo/bar')   }
+    it { should_not match('/foo%2Fbar') }
+    it { should_not match('/foo%2fbar') }
+  end
+
+  pattern '/(?<foo>.*)' do
+    it { should match('/foo')       .capturing foo: 'foo'       }
+    it { should match('/bar')       .capturing foo: 'bar'       }
+    it { should match('/foo.bar')   .capturing foo: 'foo.bar'   }
+    it { should match('/%0Afoo')    .capturing foo: '%0Afoo'    }
+    it { should match('/foo%2Fbar') .capturing foo: 'foo%2Fbar' }
+  end
+end

data/spec/router/rack_spec.rb

@@ -2,7 +2,7 @@ require 'mustermann/router/rack'
 
 describe Mustermann::Router::Rack do
   include Rack::Test::Methods
-  subject(:app) { described_class.new }
+  subject(:app) { Mustermann::Router::Rack.new }
 
   context 'matching' do
     before { app.on('/foo') { [418, {'Content-Type' => 'text/plain'}, 'bar'] } }

data/spec/router/simple_spec.rb

@@ -3,28 +3,30 @@ require 'mustermann/router/simple'
 describe Mustermann::Router::Simple do
   describe :initialize do
     context "with implicit receiver" do
-      subject(:router) { described_class.new { on('/foo') { 'bar' } } }
+      subject(:router) { Mustermann::Router::Simple.new { on('/foo') { 'bar' } } }
       example { router.call('/foo').should be == 'bar' }
     end
 
     context "with explicit receiver" do
-      subject(:router) { described_class.new { |r| r.on('/foo') { 'bar' } } }
+      subject(:router) { Mustermann::Router::Simple.new { |r| r.on('/foo') { 'bar' } } }
       example { router.call('/foo').should be == 'bar' }
     end
 
     context "with default" do
-      subject(:router) { described_class.new(default: 'bar') }
+      subject(:router) { Mustermann::Router::Simple.new(default: 'bar') }
       example { router.call('/foo').should be == 'bar' }
     end
   end
 
   describe :[]= do
-    before { subject['/:name'] = proc { |*a| a } }
-    example { subject.call('/foo').should be == ['/foo', "name" => 'foo'] }
+    subject(:router) { Mustermann::Router::Simple.new }
+    before { router['/:name'] = proc { |*a| a } }
+    example { router.call('/foo').should be == ['/foo', "name" => 'foo'] }
   end
 
   describe :[] do
-    before { subject.on('/x') { 42 } }
-    example { subject['/x'].call.should be == 42 }
+    subject(:router) { Mustermann::Router::Simple.new }
+    before { router.on('/x') { 42 } }
+    example { router['/x'].call.should be == 42 }
   end
 end

data/spec/shell_spec.rb

@@ -103,6 +103,6 @@ describe Mustermann::Shell do
   end
 
   describe :=~ do
-    example { '/foo'.should be =~ described_class.new('/foo') }
+    example { '/foo'.should be =~ Mustermann::Shell.new('/foo') }
   end
 end

data/spec/simple_match_spec.rb

@@ -2,7 +2,7 @@ require 'support'
 require 'mustermann/simple_match'
 
 describe Mustermann::SimpleMatch do
-  subject { described_class.new('example') }
+  subject { Mustermann::SimpleMatch.new('example') }
   its(:to_s) { should be == 'example' }
   its(:names) { should be == [] }
   its(:captures) { should be == [] }

data/spec/sinatra_spec.rb

@@ -94,6 +94,19 @@ describe Mustermann::Sinatra do
     example { pattern.params('/foo').should be == {"splat" => ["foo"]} }
   end
 
+  pattern '/*foo' do
+    it { should match('/')        .capturing foo: ''        }
+    it { should match('/foo')     .capturing foo: 'foo'     }
+    it { should match('/foo/bar') .capturing foo: 'foo/bar' }
+
+    example { pattern.params('/foo')     .should be == {"foo" => "foo"     } }
+    example { pattern.params('/foo/bar') .should be == {"foo" => "foo/bar" } }
+  end
+
+  pattern '/*foo/*bar' do
+    it { should match('/foo/bar') .capturing foo: 'foo', bar: 'bar' }
+  end
+
   pattern '/:foo/*' do
     it { should match("/foo/bar/baz")     .capturing foo: 'foo',   splat: 'bar/baz'   }
     it { should match("/foo/")            .capturing foo: 'foo',   splat: ''          }

data/spec/support/env.rb

@@ -3,4 +3,14 @@ if RUBY_VERSION < '2.0.0'
   exit 1
 end
 
-ENV['RACK_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
+
+require 'tool/warning_filter'
+require 'rspec'
+require 'rspec/its'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end

data/spec/support/expand_matcher.rb

@@ -14,14 +14,14 @@ RSpec::Matchers.define :expand do |values = {}|
     @string = string
   end
 
-  failure_message_for_should do |pattern|
+  failure_message do |pattern|
     message = "expected %p to be expandable with %p" % [pattern, values]
     expanded = pattern.expand(values)
     message << " and result in %p, but got %p" % [@string, expanded] if @string
     message
   end
 
-  failure_message_for_should_not do |pattern|
+  failure_message_when_negated do |pattern|
     "expected %p not to be expandable with %p" % [pattern, values]
   end
 end

data/spec/support/match_matcher.rb

@@ -10,7 +10,7 @@ RSpec::Matchers.define :match do |expected|
     @captures = captures
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     require 'pp'
     match = actual.match(expected)
     if match
@@ -31,7 +31,7 @@ RSpec::Matchers.define :match do |expected|
     end
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected %p not to match %p" % [
       actual.to_s, expected
     ]

data/spec/support/pattern.rb

@@ -1,7 +1,9 @@
+require 'timeout'
+
 module Support
   module Pattern
     def pattern(pattern, options = nil, &block)
-      description = "pattern %p" % pattern
+      description   = "pattern %p" % pattern
 
       if options
         description << " with options %p" % [options]
@@ -26,8 +28,10 @@ module Support
     end
 
     def subject_for(pattern, *args)
-      instance = described_class.new(pattern, *args)
+      instance = Timeout.timeout(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 }
     rescue Exception => error
       proc { raise error }
     end

data/spec/to_pattern_spec.rb

@@ -0,0 +1,20 @@
+require 'support'
+require 'mustermann/to_pattern'
+
+describe Mustermann::ToPattern do
+  context String do
+    example { "".to_pattern               .should be_a(Mustermann::Sinatra) }
+    example { "".to_pattern(type: :rails) .should be_a(Mustermann::Rails)   }
+  end
+
+  context Regexp do
+    example { //.to_pattern               .should be_a(Mustermann::Regular) }
+    example { //.to_pattern(type: :rails) .should be_a(Mustermann::Regular) }
+  end
+
+  context Mustermann::Pattern do
+    subject(:pattern) { Mustermann.new('') }
+    example { pattern.to_pattern.should be == pattern }
+    example { pattern.to_pattern(type: :rails).should be_a(Mustermann::Sinatra) }
+  end
+end

metadata

@@ -1,139 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: mustermann
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: library implementing patterns that behave like regular expressions
@@ -144,10 +172,10 @@ extra_rdoc_files:
 - README.md
 - internals.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -168,14 +196,15 @@ files:
 - lib/mustermann/ast/tree_renderer.rb
 - lib/mustermann/ast/validation.rb
 - lib/mustermann/caster.rb
-- lib/mustermann/equality_map.rb
 - lib/mustermann/error.rb
 - lib/mustermann/expander.rb
 - lib/mustermann/extension.rb
 - lib/mustermann/identity.rb
+- lib/mustermann/mapper.rb
 - lib/mustermann/pattern.rb
 - lib/mustermann/rails.rb
 - lib/mustermann/regexp_based.rb
+- lib/mustermann/regular.rb
 - lib/mustermann/router.rb
 - lib/mustermann/router/rack.rb
 - lib/mustermann/router/simple.rb
@@ -184,15 +213,18 @@ files:
 - lib/mustermann/simple_match.rb
 - lib/mustermann/sinatra.rb
 - lib/mustermann/template.rb
+- lib/mustermann/to_pattern.rb
 - lib/mustermann/version.rb
 - mustermann.gemspec
 - spec/expander_spec.rb
 - spec/extension_spec.rb
 - spec/identity_spec.rb
+- spec/mapper_spec.rb
 - spec/mustermann_spec.rb
 - spec/pattern_spec.rb
 - spec/rails_spec.rb
 - spec/regexp_based_spec.rb
+- spec/regular_spec.rb
 - spec/router/rack_spec.rb
 - spec/router/simple_spec.rb
 - spec/shell_spec.rb
@@ -206,6 +238,7 @@ files:
 - spec/support/match_matcher.rb
 - spec/support/pattern.rb
 - spec/template_spec.rb
+- spec/to_pattern_spec.rb
 homepage: https://github.com/rkh/mustermann
 licenses:
 - MIT
@@ -216,17 +249,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: use patterns like regular expressions
@@ -234,10 +267,12 @@ test_files:
 - spec/expander_spec.rb
 - spec/extension_spec.rb
 - spec/identity_spec.rb
+- spec/mapper_spec.rb
 - spec/mustermann_spec.rb
 - spec/pattern_spec.rb
 - spec/rails_spec.rb
 - spec/regexp_based_spec.rb
+- spec/regular_spec.rb
 - spec/router/rack_spec.rb
 - spec/router/simple_spec.rb
 - spec/shell_spec.rb
@@ -251,4 +286,5 @@ test_files:
 - spec/support/match_matcher.rb
 - spec/support/pattern.rb
 - spec/template_spec.rb
+- spec/to_pattern_spec.rb
 has_rdoc: