mustermann 0.3.1 → 0.4.0

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 (cannot load such file -- mustermann/ast)") }
     end
 
     context "pattern argument" do
@@ -35,6 +35,20 @@ describe Mustermann do
       example { Mustermann.new(pattern, type: :rails) .should be_a(Mustermann::Rails) }
       example { Mustermann.new(pattern).to_s.should be == 'foo' }
     end
+
+    context "multiple arguments" do
+      example { Mustermann.new('', '')                        .should be_a(Mustermann::Composite) }
+      example { Mustermann.new('', '').patterns.first         .should be_a(Mustermann::Sinatra)   }
+      example { Mustermann.new('', '').operator               .should be == :|                    }
+      example { Mustermann.new('', '', operator: :&).operator .should be == :&                    }
+      example { Mustermann.new('', '', greedy: true)          .should be_a(Mustermann::Composite) }
+    end
+
+    context "invalid arguments" do
+      it "raise a TypeError for unsupported types" do
+        expect { Mustermann.new(10) }.to raise_error(TypeError, "Fixnum can't be coerced into Mustermann::Pattern")
+      end
+    end
   end
 
   describe :[] do
@@ -45,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 (cannot load such file -- mustermann/ast)") }
+    example { expect { Mustermann[:expander] }.to raise_error(ArgumentError, "unsupported type :expander") }
   end
 
   describe :extend_object do

data/spec/pattern_spec.rb

@@ -20,10 +20,14 @@ describe Mustermann::Pattern do
     end
   end
 
-  describe :expand do
+  describe :respond_to? do
     subject(:pattern) { Mustermann::Pattern.new("") }
-    it { should_not respond_to(:expand) }
-    it { expect { pattern.expand }.to raise_error(NotImplementedError) }
+
+    it { should_not respond_to(:expand)       }
+    it { should_not respond_to(:to_templates) }
+
+    it { expect { pattern.expand }       .to raise_error(NotImplementedError) }
+    it { expect { pattern.to_templates } .to raise_error(NotImplementedError) }
   end
 
   describe :== do

data/spec/regular_spec.rb

@@ -7,6 +7,9 @@ describe Mustermann::Regular do
   pattern '' do
     it { should     match('')  }
     it { should_not match('/') }
+
+    it { should_not respond_to(:expand)       }
+    it { should_not respond_to(:to_templates) }
   end
 
   pattern '/' do
@@ -33,4 +36,26 @@ describe Mustermann::Regular do
     it { should match('/%0Afoo')    .capturing foo: '%0Afoo'    }
     it { should match('/foo%2Fbar') .capturing foo: 'foo%2Fbar' }
   end
+
+  context "peeking" do
+    subject(:pattern) { Mustermann::Regular.new("(?<name>[^/]+)") }
+
+    describe :peek_size do
+      example { pattern.peek_size("foo bar/blah")   .should be == "foo bar".size }
+      example { pattern.peek_size("foo%20bar/blah") .should be == "foo%20bar".size }
+      example { pattern.peek_size("/foo bar")       .should be_nil }
+    end
+
+    describe :peek_match do
+      example { pattern.peek_match("foo bar/blah")   .to_s .should be == "foo bar" }
+      example { pattern.peek_match("foo%20bar/blah") .to_s .should be == "foo%20bar" }
+      example { pattern.peek_match("/foo bar")             .should be_nil }
+    end
+
+    describe :peek_params do
+      example { pattern.peek_params("foo bar/blah")   .should be == [{"name" => "foo bar"}, "foo bar".size] }
+      example { pattern.peek_params("foo%20bar/blah") .should be == [{"name" => "foo bar"}, "foo%20bar".size] }
+      example { pattern.peek_params("/foo bar")       .should be_nil }
+    end
+  end
 end

data/spec/sinatra_spec.rb

@@ -7,6 +7,11 @@ describe Mustermann::Sinatra do
   pattern '' do
     it { should     match('')  }
     it { should_not match('/') }
+
+    it { should generate_template('') }
+
+    it { should respond_to(:expand)       }
+    it { should respond_to(:to_templates) }
   end
 
   pattern '/' do
@@ -43,6 +48,8 @@ describe Mustermann::Sinatra do
     it { should_not match('/foo/bar') }
     it { should_not match('/')        }
     it { should_not match('/foo/')    }
+
+    it { should generate_template('/{foo}') }
   end
 
   pattern '/föö' do
@@ -61,10 +68,34 @@ describe Mustermann::Sinatra do
 
     example { pattern.params('/bar/foo').should be == {"foo" => "bar", "bar" => "foo"} }
     example { pattern.params('').should be_nil }
+
+    it { should generate_template('/{foo}/{bar}') }
+  end
+
+  pattern "/{foo}/{bar}" do
+    it { should match('/foo/bar')               .capturing foo: 'foo',              bar: 'bar'     }
+    it { should match('/foo.bar/bar.foo')       .capturing foo: 'foo.bar',          bar: 'bar.foo' }
+    it { should match('/user@example.com/name') .capturing foo: 'user@example.com', bar: 'name'    }
+    it { should match('/10.1/te.st')            .capturing foo: '10.1',             bar: 'te.st'   }
+    it { should match('/10.1.2/te.st')          .capturing foo: '10.1.2',           bar: 'te.st'   }
+
+    it { should_not match('/foo%2Fbar') }
+    it { should_not match('/foo%2fbar') }
+
+    example { pattern.params('/bar/foo').should be == {"foo" => "bar", "bar" => "foo"} }
+    example { pattern.params('').should be_nil }
+
+    it { should generate_template('/{foo}/{bar}') }
   end
 
   pattern '/hello/:person' do
     it { should match('/hello/Frank').capturing person: 'Frank' }
+    it { should generate_template('/hello/{person}') }
+  end
+
+  pattern '/hello/{person}' do
+    it { should match('/hello/Frank').capturing person: 'Frank' }
+    it { should generate_template('/hello/{person}') }
   end
 
   pattern '/?:foo?/?:bar?' do
@@ -73,23 +104,40 @@ describe Mustermann::Sinatra do
     it { should match('/')            .capturing foo: nil,     bar: nil     }
     it { should match('')             .capturing foo: nil,     bar: nil     }
 
-    it { should_not match('/hello/world/') }
+    it { should expand(foo: 'hello')               .to('/hello/')      }
+    it { should expand(foo: 'hello', bar: 'world') .to('/hello/world') }
+    it { should expand(bar: 'world')               .to('//world')      }
+    it { should expand                             .to('//')           }
+    it { should_not expand(baz: '') }
 
-    # it { should expand(foo: 'hello')               .to('/hello')       }
-    # it { should expand(foo: 'hello', bar: 'world') .to('/hello/world') }
-    # it { should expand(bar: 'world')               .to('//world')      }
-    # it { should expand                             .to('')             }
-    # it { should_not expand(baz: '') }
+    it { should_not match('/hello/world/') }
+    it { should generate_templates("", "/", "//", "//{bar}", "/{bar}", "/{foo}", "/{foo}/", "/{foo}/{bar}", "/{foo}{bar}", "{bar}", "{foo}", "{foo}/", "{foo}/{bar}", "{foo}{bar}") }
   end
 
   pattern '/:foo_bar' do
     it { should match('/hello').capturing foo_bar: 'hello' }
+    it { should generate_template('/{foo_bar}') }
+  end
+
+  pattern '/{foo.bar}' do
+    it { should match('/hello').capturing :"foo.bar" => 'hello' }
+    it { should generate_template('/{foo.bar}') }
   end
 
   pattern '/*' do
     it { should match('/')        .capturing splat: '' }
     it { should match('/foo')     .capturing splat: 'foo' }
     it { should match('/foo/bar') .capturing splat: 'foo/bar' }
+    it { should generate_template('/{+splat}') }
+
+    example { pattern.params('/foo').should be == {"splat" => ["foo"]} }
+  end
+
+  pattern '/{+splat}' do
+    it { should match('/')        .capturing splat: '' }
+    it { should match('/foo')     .capturing splat: 'foo' }
+    it { should match('/foo/bar') .capturing splat: 'foo/bar' }
+    it { should generate_template('/{+splat}') }
 
     example { pattern.params('/foo').should be == {"splat" => ["foo"]} }
   end
@@ -98,6 +146,17 @@ describe Mustermann::Sinatra do
     it { should match('/')        .capturing foo: ''        }
     it { should match('/foo')     .capturing foo: 'foo'     }
     it { should match('/foo/bar') .capturing foo: 'foo/bar' }
+    it { should generate_template('/{+foo}') }
+
+    example { pattern.params('/foo')     .should be == {"foo" => "foo"     } }
+    example { pattern.params('/foo/bar') .should be == {"foo" => "foo/bar" } }
+  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' }
+    it { should generate_template('/{+foo}') }
 
     example { pattern.params('/foo')     .should be == {"foo" => "foo"     } }
     example { pattern.params('/foo/bar') .should be == {"foo" => "foo/bar" } }
@@ -105,6 +164,12 @@ describe Mustermann::Sinatra do
 
   pattern '/*foo/*bar' do
     it { should match('/foo/bar') .capturing foo: 'foo', bar: 'bar' }
+    it { should generate_template('/{+foo}/{+bar}') }
+  end
+
+  pattern '/{+foo}/{+bar}' do
+    it { should match('/foo/bar') .capturing foo: 'foo', bar: 'bar' }
+    it { should generate_template('/{+foo}/{+bar}') }
   end
 
   pattern '/:foo/*' do
@@ -112,6 +177,18 @@ describe Mustermann::Sinatra do
     it { should match("/foo/")            .capturing foo: 'foo',   splat: ''          }
     it { should match('/h%20w/h%20a%20y') .capturing foo: 'h%20w', splat: 'h%20a%20y' }
     it { should_not match('/foo') }
+    it { should generate_template('/{foo}/{+splat}') }
+
+    example { pattern.params('/bar/foo').should be == {"splat" => ["foo"], "foo" => "bar"} }
+    example { pattern.params('/bar/foo/f%20o').should be == {"splat" => ["foo/f o"], "foo" => "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: ''          }
+    it { should match('/h%20w/h%20a%20y') .capturing foo: 'h%20w', splat: 'h%20a%20y' }
+    it { should_not match('/foo') }
+    it { should generate_template('/{foo}/{+splat}') }
 
     example { pattern.params('/bar/foo').should be == {"splat" => ["foo"], "foo" => "bar"} }
     example { pattern.params('/bar/foo/f%20o').should be == {"splat" => ["foo/f o"], "foo" => "bar"} }
@@ -131,12 +208,18 @@ describe Mustermann::Sinatra do
     it { should match('/path%20with%20spaces') }
     it { should match('/path%2Bwith%2Bspaces') }
     it { should match('/path+with+spaces')     }
+
+    it { should generate_template('/path%20with%20spaces') }
   end
 
   pattern '/foo&bar' do
     it { should match('/foo&bar') }
   end
 
+  pattern '/foo\{bar' do
+    it { should match('/foo%7Bbar') }
+  end
+
   pattern '/*/:foo/*/*' do
     it { should match('/bar/foo/bling/baz/boom') }
 
@@ -153,13 +236,29 @@ describe Mustermann::Sinatra do
     end
   end
 
+  pattern '/{+splat}/{foo}/{+splat}/{+splat}' do
+    it { should match('/bar/foo/bling/baz/boom') }
+
+    it "should capture all splat parts" do
+      match = pattern.match('/bar/foo/bling/baz/boom')
+      match.captures.should be == ['bar', 'foo', 'bling', 'baz/boom']
+      match.names.should be == ['splat', 'foo']
+    end
+
+    it 'should map to proper params' do
+      pattern.params('/bar/foo/bling/baz/boom').should be == {
+        "foo" => "foo", "splat" => ['bar', 'bling', 'baz/boom']
+      }
+    end
+  end
+
   pattern '/test.bar' do
     it { should     match('/test.bar') }
     it { should_not match('/test0bar') }
   end
 
   pattern '/:file.:ext' do
-    it { should match('/pony.jpg')    .capturing file: 'pony', ext: 'jpg' }
+    it { should match('/pony.jpg')   .capturing file: 'pony', ext: 'jpg' }
     it { should match('/pony%2Ejpg') .capturing file: 'pony', ext: 'jpg' }
     it { should match('/pony%2ejpg') .capturing file: 'pony', ext: 'jpg' }
 
@@ -179,12 +278,18 @@ describe Mustermann::Sinatra do
     it { should match('/ax')    .capturing a: 'a'   }
     it { should match('/axax')  .capturing a: 'axa' }
     it { should match('/axaxx') .capturing a: 'axax' }
+
+    it { should generate_template('/{a}x') }
+    it { should generate_template('/{a}')  }
   end
 
   pattern '/:user(@:host)?' do
     it { should match('/foo@bar')     .capturing user: 'foo',     host: 'bar'     }
     it { should match('/foo.foo@bar') .capturing user: 'foo.foo', host: 'bar'     }
     it { should match('/foo@bar.bar') .capturing user: 'foo',     host: 'bar.bar' }
+
+    it { should generate_template('/{user}')        }
+    it { should generate_template('/{user}@{host}') }
   end
 
   pattern '/:file(.:ext)?' do
@@ -195,6 +300,10 @@ describe Mustermann::Sinatra do
     it { should match('/pony.png.jpg')   .capturing file: 'pony.png', ext: 'jpg' }
     it { should match('/pony.')          .capturing file: 'pony.' }
     it { should_not match('/.jpg')  }
+
+    it { should     generate_template('/{file}')       }
+    it { should     generate_template('/{file}.{ext}') }
+    it { should_not generate_template('/{file}.')      }
   end
 
   pattern '/:id/test.bar' do
@@ -323,6 +432,37 @@ describe Mustermann::Sinatra do
     it { should match('/foo/bar/baz').capturing foo: 'foo', bar: 'bar', baz: 'baz' }
   end
 
+  pattern "/(foo|bar)" do
+    it { should match("/foo") }
+    it { should match("/bar") }
+
+    it { should generate_template('/foo') }
+    it { should generate_template('/bar') }
+  end
+
+  pattern "/(foo\\|bar)" do
+    it { should match             "/foo%7Cbar" }
+    it { should generate_template "/foo%7Cbar" }
+
+    it { should_not match("/foo") }
+    it { should_not match("/bar") }
+
+    it { should_not generate_template('/foo') }
+    it { should_not generate_template('/bar') }
+  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' }
@@ -508,6 +648,11 @@ 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\\\\"')
@@ -563,11 +708,41 @@ describe Mustermann::Sinatra do
     end
 
     describe :to_regexp do
-      example('empty pattern') { Mustermann::Sinatra.new('').to_regexp.should be == /\A\Z/ }
+      example('empty pattern') { Mustermann::Sinatra.new('').to_regexp.should be == /\A(?-mix:)\Z/ }
 
       context 'Regexp.try_convert' do
-        example('empty pattern') { Regexp.try_convert(Mustermann::Sinatra.new('')).should be == /\A\Z/ }
+        example('empty pattern') { Regexp.try_convert(Mustermann::Sinatra.new('')).should be == /\A(?-mix:)\Z/ }
       end
     end
   end
+
+  context 'Proc compatibility' do
+    describe :to_proc do
+      example { Mustermann::Sinatra.new("/").to_proc.should be_a(Proc) }
+      example('non-matching') { Mustermann::Sinatra.new("/")     .to_proc.call('/foo').should be == false }
+      example('matching')     { Mustermann::Sinatra.new("/:foo") .to_proc.call('/foo').should be == true  }
+    end
+  end
+
+  context "peeking" do
+    subject(:pattern) { Mustermann::Sinatra.new(":name") }
+
+    describe :peek_size do
+      example { pattern.peek_size("foo bar/blah")   .should be == "foo bar".size }
+      example { pattern.peek_size("foo%20bar/blah") .should be == "foo%20bar".size }
+      example { pattern.peek_size("/foo bar")       .should be_nil }
+    end
+
+    describe :peek_match do
+      example { pattern.peek_match("foo bar/blah")   .to_s .should be == "foo bar" }
+      example { pattern.peek_match("foo%20bar/blah") .to_s .should be == "foo%20bar" }
+      example { pattern.peek_match("/foo bar")             .should be_nil }
+    end
+
+    describe :peek_params do
+      example { pattern.peek_params("foo bar/blah")   .should be == [{"name" => "foo bar"}, "foo bar".size] }
+      example { pattern.peek_params("foo%20bar/blah") .should be == [{"name" => "foo bar"}, "foo%20bar".size] }
+      example { pattern.peek_params("/foo bar")       .should be_nil }
+    end
+  end
 end

data/spec/to_pattern_spec.rb

@@ -1,5 +1,6 @@
 require 'support'
 require 'mustermann/to_pattern'
+require 'delegate'
 
 describe Mustermann::ToPattern do
   context String do
@@ -12,9 +13,57 @@ describe Mustermann::ToPattern do
     example { //.to_pattern(type: :rails) .should be_a(Mustermann::Regular) }
   end
 
+  context Symbol do
+    example { :foo.to_pattern               .should be_a(Mustermann::Sinatra) }
+    example { :foo.to_pattern(type: :rails) .should be_a(Mustermann::Sinatra) }
+  end
+
+  context Array do
+    example { [:foo, :bar].to_pattern               .should be_a(Mustermann::Composite) }
+    example { [:foo, :bar].to_pattern(type: :rails) .should be_a(Mustermann::Composite) }
+  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
+
+  context 'custom class' do
+    let(:example_class) do
+      Class.new do
+        include Mustermann::ToPattern
+        def to_s
+          ":foo/:bar"
+        end
+      end
+    end
+
+    example { example_class.new.to_pattern                    .should be_a(Mustermann::Sinatra) }
+    example { example_class.new.to_pattern(type: :rails)      .should be_a(Mustermann::Rails)   }
+    example { Mustermann.new(example_class.new)               .should be_a(Mustermann::Sinatra) }
+    example { Mustermann.new(example_class.new, type: :rails) .should be_a(Mustermann::Rails)   }
+  end
+
+  context 'primitive delegate' do
+    let(:example_class) do
+      Class.new(DelegateClass(Array)) do
+        include Mustermann::ToPattern
+      end
+    end
+
+    example { example_class.new([:foo, :bar]).to_pattern               .should be_a(Mustermann::Composite) }
+    example { example_class.new([:foo, :bar]).to_pattern(type: :rails) .should be_a(Mustermann::Composite) }
+  end
+
+  context 'primitive subclass' do
+    let(:example_class) do
+      Class.new(Array) do
+        include Mustermann::ToPattern
+      end
+    end
+
+    example { example_class.new([:foo, :bar]).to_pattern               .should be_a(Mustermann::Composite) }
+    example { example_class.new([:foo, :bar]).to_pattern(type: :rails) .should be_a(Mustermann::Composite) }
+  end
 end