mustermann 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dcbbae7585845981a56f957deb4b729d311ffab
-  data.tar.gz: 5c446520da882ed59f6fa38304343c10b7b67dab
+  metadata.gz: 8c1952019b943fa6b499465e215a4b7ba68c3cbd
+  data.tar.gz: e390428040cf68a16dea8367d87417bf921bd0c3
 SHA512:
-  metadata.gz: d5c237bc73e1cfd18d923ba55514ffc66a575f81086f935eec4aa6831554f57ac955aad122cb169f09693c3265d544a6d32cbcb60557c64fe93582586ee98975
-  data.tar.gz: a6e0cda3b4b51c0b914806b86467374d7222e026b9be9d5f4a43e09a7acbd25d736e1075b13dee2c864750e16b55c1ccb7b3d74d1e6de23440879f31b381e972
+  metadata.gz: b6abd1d958db391ebea46b12e16f151473a73f25eb684614fc2a87f8f0b72c7facf344b0b0ce0ee1feb58d3397f816b41b217d654cb5d537b02cb9c20404b662
+  data.tar.gz: '09be3f684228b37319fd48eff0d119350a71f9d1d558b89266b78a9cd0510dd9852c4454e0e3b4fda5e848dd3190208795f3b8c2e489c3962e2987f9fd615d7e'

data/lib/mustermann/error.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 module Mustermann
-  Error        ||= Class.new(StandardError) # Raised if anything goes wrong while generating a {Pattern}.
-  CompileError ||= Class.new(Error)         # Raised if anything goes wrong while compiling a {Pattern}.
-  ParseError   ||= Class.new(Error)         # Raised if anything goes wrong while parsing a {Pattern}.
-  ExpandError  ||= Class.new(Error)         # Raised if anything goes wrong while expanding a {Pattern}.
+  unless defined?(Mustermann::Error)
+    Error        = Class.new(StandardError) # Raised if anything goes wrong while generating a {Pattern}.
+    CompileError = Class.new(Error)         # Raised if anything goes wrong while compiling a {Pattern}.
+    ParseError   = Class.new(Error)         # Raised if anything goes wrong while parsing a {Pattern}.
+    ExpandError  = Class.new(Error)         # Raised if anything goes wrong while expanding a {Pattern}.
+  end
 end

data/lib/mustermann/regular.rb

@@ -21,6 +21,7 @@ module Mustermann
     # @see (see Mustermann::Pattern#initialize)
     def initialize(string, check_anchors: true, **options)
       string = $1 if string.to_s =~ /\A\(\?\-mix\:(.*)\)\Z/ && string.inspect == "/#$1/"
+      string = string.source.gsub!(/(?<!\\)(?:\s|#.*$)/, '') if extended_regexp?(string)
       @check_anchors = check_anchors
       super(string, **options)
     end
@@ -40,6 +41,10 @@ module Mustermann
       raise CompileError, "regular expression should not contain %s: %p" % [illegal.to_s, @string]
     end
 
-    private :compile, :check_anchors
+    def extended_regexp?(string)
+      not (Regexp.new(string).options & Regexp::EXTENDED).zero?
+    end
+
+    private :compile, :check_anchors, :extended_regexp?
   end
 end

data/lib/mustermann/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Mustermann
-  VERSION ||= '1.0.0'
+  VERSION ||= '1.0.1'
 end

data/mustermann.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.authors               = ["Konstantin Haase", "Zachary Scott"]
   s.email                 = "sinatrarb@googlegroups.com"
   s.homepage              = "https://github.com/sinatra/mustermann"
-  s.summary               = %q{use patterns like regular expressions}
-  s.description           = %q{library implementing patterns that behave like regular expressions}
+  s.summary               = %q{Your personal string matching expert.}
+  s.description           = %q{A library implementing patterns that behave like regular expressions.}
   s.license               = 'MIT'
   s.required_ruby_version = '>= 2.2.0'
   s.files                 = `git ls-files`.split("\n")

data/spec/regular_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'support'
+require 'timeout'
 require 'mustermann/regular'
 
 describe Mustermann::Regular do
@@ -38,6 +39,22 @@ describe Mustermann::Regular do
     it { should match('/foo%2Fbar') .capturing foo: 'foo%2Fbar' }
   end
 
+
+  context 'with Regexp::EXTENDED' do
+    let(:pattern) {
+      %r{
+        \/compare\/ # match any URL beginning with \/compare\/
+        (.+)      # extract the full path (including any directories)
+        \/         # match the final slash
+        ([^.]+)   # match the first SHA1
+        \.{2,3}   # match .. or ...
+        (.+)      # match the second SHA1
+      }x
+    }
+    example { expect { Timeout.timeout(1){ Mustermann::Regular.new(pattern) }}.not_to raise_error(Timeout::Error) }
+    it { expect(Mustermann::Regular.new(pattern)).to match('/compare/foo/bar..baz') }
+  end
+
   describe :check_achnors do
     context 'raises on anchors' do
       example { expect { Mustermann::Regular.new('^foo')        }.to     raise_error(Mustermann::CompileError) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustermann
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies: []
-description: library implementing patterns that behave like regular expressions
+description: A library implementing patterns that behave like regular expressions.
 email: sinatrarb@googlegroups.com
 executables: []
 extensions: []
@@ -92,8 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: use patterns like regular expressions
+summary: Your personal string matching expert.
 test_files: []