mustermann19 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b657d781342db968ae5f3aa2870ae038b2dcbe6d
-  data.tar.gz: 7e3f3769de07852525cf560cc1b053f31ff90be9
+  metadata.gz: 0213dc6d9a2c7638cac33790888dfaaa7da56258
+  data.tar.gz: 2c5628b7ce6f0d6c83693f714de0b6b634a411c6
 SHA512:
-  metadata.gz: 82059db05fce899ea10ec6d729d4411a7d5073052c66dba13710df0f17a7472fc79d0345225f1b760bd9cf16c3d4e32d822502fe8271e2efd78bac449d7acbcc
-  data.tar.gz: ddab562925edbfe2f4fe85af92d7e86945077965b6407cce6960796945fad76234b1c158dca4dd06442fd3dc66f805fef532005f8007613d1251dc652832985e
+  metadata.gz: 4adbeefe8e9c58a9478dbe235029d55234aba29c70bea436b9ae8bdf1a1f03c031fb80ec92bf2d6ad7401ee4180b9ea3d690b4554032ee6e14644066661976da
+  data.tar.gz: 95c9a1d24af3a7823469cc04bb22fda9a3232723d0c7b3a6f7cbf6cb1dfd0d588b6f5138e3e035413a1636b421d190f5faa43d5f396632462c9c70c921de0bdd

data/lib/mustermann/grape.rb

@@ -14,7 +14,7 @@ module Mustermann
     on(nil, ??, ?)) { |c| unexpected(c) }
 
     on(?*)  { |c| scan(/\w+/) ? node(:named_splat, buffer.matched) : node(:splat) }
-    on(?:)  { |c| node(:capture) { scan(/\w+/) } }
+    on(?:)  { |c| node(:capture, constraint: "[^/\\?#\.]") { scan(/\w+/) } }
     on(?\\) { |c| node(:char, expect(/./)) }
     on(?()  { |c| node(:optional, node(:group) { read unless scan(?)) }) }
     on(?|)  { |c| node(:or) }

data/lib/mustermann/version.rb

@@ -1,3 +1,3 @@
 module Mustermann
-  VERSION ||= '0.4.1'
+  VERSION ||= '0.4.2'
 end

data/spec/grape_spec.rb

@@ -41,10 +41,10 @@ describe Mustermann::Grape do
   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' }
 
+    it { should_not match('/foo.bar') }
     it { should_not match('/foo?')    }
     it { should_not match('/foo/bar') }
     it { should_not match('/')        }
@@ -59,10 +59,10 @@ describe Mustermann::Grape do
 
   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.bar/bar.foo')       }
+    it { should_not match('/user@example.com/name') }
+    it { should_not match('/10.1/te.st')            }
+    it { should_not match('/10.1.2/te.st')          }
 
     it { should_not match('/foo%2Fbar') }
     it { should_not match('/foo%2fbar') }
@@ -267,9 +267,9 @@ describe Mustermann::Grape do
     it { should match('/pony%e6%ad%a3%2ejpg') .capturing file: 'pony%e6%ad%a3', ext: 'jpg' }
     it { should match('/pony正%2Ejpg')        .capturing file: 'pony正',         ext: 'jpg' }
     it { should match('/pony正%2ejpg')        .capturing file: 'pony正',         ext: 'jpg' }
-    it { should match('/pony正..jpg')         .capturing file: 'pony正.',        ext: 'jpg' }
 
-    it { should_not match('/.jpg') }
+    it { should_not match('/pony正..jpg') }
+    it { should_not match('/.jpg')        }
   end
 
   pattern '/(:a)x?' do
@@ -283,8 +283,8 @@ describe Mustermann::Grape do
 
   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_not match('/foo.foo@bar') }
+    it { should_not match('/foo@bar.bar') }
 
     it { should generate_template('/{user}')        }
     it { should generate_template('/{user}@{host}') }
@@ -295,9 +295,9 @@ describe Mustermann::Grape do
     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' }
-    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_not match('/pony.png.jpg') }
+    it { should_not match('/pony.')        }
+    it { should_not match('/.jpg')         }
 
     it { should     generate_template('/{file}')       }
     it { should     generate_template('/{file}.{ext}') }
@@ -314,24 +314,24 @@ describe Mustermann::Grape do
 
   pattern '/10/:id' do
     it { should match('/10/test')  .capturing id: 'test'  }
-    it { should match('/10/te.st') .capturing id: 'te.st' }
+    it { should_not match('/10/te.st') }
   end
 
   pattern '/10.1/:id' do
     it { should match('/10.1/test')  .capturing id: 'test'  }
-    it { should match('/10.1/te.st') .capturing id: 'te.st' }
+    it { should_not match('/10.1/te.st') }
   end
 
   pattern '/:foo.:bar/:id' do
-    it { should match('/10.1/te.st')   .capturing foo: "10",   bar: "1", id: "te.st" }
-    it { should match('/10.1.2/te.st') .capturing foo: "10.1", bar: "2", id: "te.st" }
+    it { should_not match('/10.1/te.st')   }
+    it { should_not match('/10.1.2/te.st') }
   end
 
   pattern '/:a/:b.?:c?' do
     it { should match('/a/b')     .capturing a: 'a',   b: 'b', c: nil }
     it { should match('/a/b.c')   .capturing a: 'a',   b: 'b', c: 'c' }
-    it { should match('/a.b/c')   .capturing a: 'a.b', b: 'c', c: nil }
-    it { should match('/a.b/c.d') .capturing a: 'a.b', b: 'c', c: 'd' }
+    it { should_not match('/a.b/c')     }
+    it { should_not match('/a.b/c.d')   }
     it { should_not match('/a.b/c.d/e') }
   end
 
@@ -554,23 +554,23 @@ describe Mustermann::Grape do
     it { should match('/pony.png')     .capturing file: 'pony',     ext: 'png' }
     it { should match('/pony%2Epng')   .capturing file: 'pony',     ext: 'png' }
     it { should match('/pony%2epng')   .capturing file: 'pony',     ext: 'png' }
-    it { should match('/pony.png.jpg') .capturing file: 'pony.png', ext: 'jpg' }
-    it { should match('/pony.jpg.png') .capturing file: 'pony.jpg', ext: 'png' }
-    it { should match('/pony.gif')     .capturing file: 'pony.gif', ext: nil   }
-    it { should match('/pony.')        .capturing file: 'pony.',    ext: nil   }
-    it { should_not match('.jpg') }
+    it { should_not match('/pony.png.jpg') }
+    it { should_not match('/pony.jpg.png') }
+    it { should_not match('/pony.gif')     }
+    it { should_not match('/pony.')        }
+    it { should_not match('.jpg')          }
   end
 
   pattern '/:file:ext?', capture: { ext: ['.jpg', '.png', '.tar.gz'] } do
     it { should match('/pony')         .capturing file: 'pony',     ext: nil       }
     it { should match('/pony.jpg')     .capturing file: 'pony',     ext: '.jpg'    }
     it { should match('/pony.png')     .capturing file: 'pony',     ext: '.png'    }
-    it { should match('/pony.png.jpg') .capturing file: 'pony.png', ext: '.jpg'    }
-    it { should match('/pony.jpg.png') .capturing file: 'pony.jpg', ext: '.png'    }
-    it { should match('/pony.tar.gz')  .capturing file: 'pony',     ext: '.tar.gz' }
-    it { should match('/pony.gif')     .capturing file: 'pony.gif', ext: nil       }
-    it { should match('/pony.')        .capturing file: 'pony.',    ext: nil       }
-    it { should_not match('/.jpg')  }
+    it { should match('/pony.tar.gz')  .capturing file: 'pony',     ext: '.tar.gz'  }
+    it { should_not match('/pony.png.jpg') }
+    it { should_not match('/pony.jpg.png') }
+    it { should_not match('/pony.gif')     }
+    it { should_not match('/pony.')        }
+    it { should_not match('/.jpg')         }
   end
 
   pattern '/:a(@:b)?', capture: { b: /\d+/ } do
@@ -587,7 +587,7 @@ describe Mustermann::Grape do
   pattern '/:file(.:ext)?', greedy: false do
     it { should match('/pony')           .capturing file: 'pony', ext: nil       }
     it { should match('/pony.jpg')       .capturing file: 'pony', ext: 'jpg'     }
-    it { should match('/pony.png.jpg')   .capturing file: 'pony', ext: 'png.jpg' }
+    it { should_not match('/pony.png.jpg') }
   end
 
   pattern '/auth/*', except: '/auth/login' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustermann19
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Konstantin Haase