mustermann 1.0.0.beta2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d5c978f69743fdbee3eec3efc6bc6c05a83dfb
-  data.tar.gz: e777bda67af6ff598fc5a584ae786fa78eb68c4b
+  metadata.gz: 1dcbbae7585845981a56f957deb4b729d311ffab
+  data.tar.gz: 5c446520da882ed59f6fa38304343c10b7b67dab
 SHA512:
-  metadata.gz: 2b92c4b696adefa6c6c0ce16fc6a3ef7a3e85834e9579dbc8a7108fc535888da5dc907f39c087fac8abf5b26a387b81e85c7c45f161b691e40f9709e382df07b
-  data.tar.gz: fe32e08661344ce33c9066610e6d1591999fb62210597714e1f406b2161e4e517438d5c026fe801b84a262ec97cdbc76e471ecffae233275888aa4d1f6139814
+  metadata.gz: d5c237bc73e1cfd18d923ba55514ffc66a575f81086f935eec4aa6831554f57ac955aad122cb169f09693c3265d544a6d32cbcb60557c64fe93582586ee98975
+  data.tar.gz: a6e0cda3b4b51c0b914806b86467374d7222e026b9be9d5f4a43e09a7acbd25d736e1075b13dee2c864750e16b55c1ccb7b3d74d1e6de23440879f31b381e972

data/LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2013-2017 Konstantin Haase
+Copyright (c) 2016-2017 Zachary Scott
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/lib/mustermann.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/pattern'
 require 'mustermann/composite'
 require 'mustermann/concat'

data/lib/mustermann/ast/boundaries.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 
 module Mustermann
@@ -41,4 +42,4 @@ module Mustermann
       end
     end
   end
-end
+end

data/lib/mustermann/ast/compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 
 module Mustermann

data/lib/mustermann/ast/expander.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 require 'mustermann/ast/compiler'
 

data/lib/mustermann/ast/param_scanner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 
 module Mustermann

data/lib/mustermann/ast/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/node'
 require 'forwardable'
 require 'strscan'
@@ -150,7 +151,7 @@ module Mustermann
       #
       # @!visibility private
       def read_brackets(open, close, char: nil, escape: ?\\, quote: false, **options)
-        result = ""
+        result = String.new
         escape = false if escape.nil?
         while current = getch
           case current
@@ -193,7 +194,7 @@ module Mustermann
           case current
           when *close    then return result
           when ignore    then nil # do nothing
-          when separator then result  << ""
+          when separator then result  << String.new
           when escape    then element << getch
           when *quotes   then element << read_escaped(current, escape: escape)
           else element << current
@@ -206,7 +207,7 @@ module Mustermann
       #
       # @!visibility private
       def read_escaped(close, escape: ?\\, **options)
-        result = ""
+        result = String.new
         while current = getch
           case current
           when close  then return result

data/lib/mustermann/ast/pattern.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/parser'
 require 'mustermann/ast/boundaries'
 require 'mustermann/ast/compiler'
@@ -79,8 +80,7 @@ module Mustermann
         options[:except] &&= parse options[:except]
         compiler.compile(to_ast, **options)
       rescue CompileError => error
-        error.message << ": %p" % @string
-        raise error
+        raise error.class, "#{error.message}: #{@string.inspect}", error.backtrace
       end
 
       # Internal AST representation of pattern.

data/lib/mustermann/ast/template_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 
 module Mustermann

data/lib/mustermann/ast/transformer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 
 module Mustermann

data/lib/mustermann/ast/translator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/node'
 require 'mustermann/error'
 require 'delegate'
@@ -79,13 +80,13 @@ module Mustermann
       # @example
       #   require 'mustermann'
       #   require 'mustermann/ast/translator'
-      #   
+      #
       #   translator = Mustermann::AST::Translator.create do
       #     translate(:node)  { [type, *t(payload)].flatten.compact }
       #     translate(Array)  { map { |e| t(e) } }
       #     translate(Object) { }
       #   end
-      #   
+      #
       #   ast = Mustermann.new('/:name').to_ast
       #   translator.translate(ast) # => [:root, :separator, :capture]
       #

data/lib/mustermann/ast/validation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/translator'
 
 module Mustermann

data/lib/mustermann/caster.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'delegate'
 
 module Mustermann

data/lib/mustermann/composite.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   # Class for pattern objects composed of multiple patterns using binary logic.
   # @see Mustermann::Pattern#&

data/lib/mustermann/concat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   # Class for pattern objects that are a concatenation of other patterns.
   # @see Mustermann::Pattern#+

data/lib/mustermann/equality_map.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   # A simple wrapper around ObjectSpace::WeakMap that allows matching keys by equality rather than identity.
   # Used for caching. Note that `fetch` is not guaranteed to return the object, even if it has not been
@@ -42,6 +43,7 @@ module Mustermann
     # @param [Object] object to be stored
     # @return [Object] same as the second parameter
     def track(key, object)
+      object = object.dup if object.frozen?
       ObjectSpace.define_finalizer(object, finalizer(key.hash))
       @keys[key.hash] = key
       object
@@ -49,7 +51,7 @@ module Mustermann
 
     # Finalizer proc needs to be generated in different scope so it doesn't keep a reference to the object.
     #
-    # @param [Fixnum] hash for key
+    # @param [Integer] hash for key
     # @return [Proc] finalizer callback
     def finalizer(hash)
       proc { @keys.delete(hash) }

data/lib/mustermann/error.rb

@@ -1,6 +1,7 @@
+# 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}.
-end
+end

data/lib/mustermann/expander.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/ast/expander'
 require 'mustermann/caster'
 require 'mustermann'

data/lib/mustermann/extension.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sinatra/version'
 fail "no need to load the Mustermann extension for #{::Sinatra::VERSION}" if ::Sinatra::VERSION >= '2.0.0'
 

data/lib/mustermann/identity.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann'
 require 'mustermann/pattern'
 require 'mustermann/ast/node'

data/lib/mustermann/mapper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann'
 require 'mustermann/expander'
 

data/lib/mustermann/pattern.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/error'
 require 'mustermann/simple_match'
 require 'mustermann/equality_map'
@@ -107,7 +108,7 @@ module Mustermann
     end
 
     # Used by Ruby internally for hashing.
-    # @return [Fixnum] same has value for patterns that are equal
+    # @return [Integer] same has value for patterns that are equal
     def hash
       self.class.hash | @string.hash | options.hash
     end

data/lib/mustermann/pattern_cache.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'thread'
 require 'mustermann'
@@ -8,7 +9,7 @@ module Mustermann
   # @example
   #   require 'mustermann/pattern_cache'
   #   cache = Mustermann::PatternCache.new
-  #   
+  #
   #   # use this instead of Mustermann.new
   #   pattern = cache.create_pattern("/:name", type: :rails)
   #
@@ -46,4 +47,4 @@ module Mustermann
       @mutex.synchronize { @cached.size }
     end
   end
-end
+end

data/lib/mustermann/regexp_based.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann/pattern'
 require 'forwardable'
 

data/lib/mustermann/regular.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann'
 require 'mustermann/regexp_based'
 require 'strscan'

data/lib/mustermann/simple_match.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   # Fakes MatchData for patterns that do not support capturing.
   # @see http://ruby-doc.org/core-2.0/MatchData.html MatchData

data/lib/mustermann/sinatra.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann'
 require 'mustermann/identity'
 require 'mustermann/ast/pattern'

data/lib/mustermann/sinatra/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   class Sinatra < AST::Pattern
     # Sinatra syntax definition.

data/lib/mustermann/sinatra/safe_renderer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   class Sinatra < AST::Pattern
     # Generates a string that can safely be concatenated with other strings

data/lib/mustermann/sinatra/try_convert.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mustermann
   class Sinatra < AST::Pattern
     # Tries to translate objects to Sinatra patterns.
@@ -45,4 +46,4 @@ module Mustermann
 
     private_constant :TryConvert
   end
-end
+end

data/lib/mustermann/to_pattern.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mustermann'
 
 module Mustermann

data/lib/mustermann/version.rb

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

data/mustermann.gemspec

@@ -4,9 +4,9 @@ require "mustermann/version"
 Gem::Specification.new do |s|
   s.name                  = "mustermann"
   s.version               = Mustermann::VERSION
-  s.author                = "Konstantin Haase"
-  s.email                 = "konstantin.mailinglists@googlemail.com"
-  s.homepage              = "https://github.com/rkh/mustermann"
+  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.license               = 'MIT'

data/spec/ast_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/ast/node'
 
@@ -11,4 +12,4 @@ describe Mustermann::AST 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
+end

data/spec/composite_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann'
 

data/spec/concat_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann'
 
@@ -111,4 +112,4 @@ describe Mustermann::Concat do
     it { should generate_template("/{foo}") }
     it { should generate_template("{bar}") }
   end
-end
+end

data/spec/equality_map_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/equality_map'
 
@@ -16,9 +17,9 @@ RSpec.describe Mustermann::EqualityMap do
 
     specify 'with GC-removed entry' do
       next if subject.is_a? Hash
-      subject.fetch("foo") { "foo" }
+      subject.fetch(String.new('foo')) { "foo" }
       expect(subject.map).to receive(:[]).and_return(nil)
-      result = subject.fetch("foo") { "bar" }
+      result = subject.fetch(String.new('foo')) { "bar" }
       expect(result).to be == "bar"
     end
   end

data/spec/expander_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/expander'
 

data/spec/extension_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/extension'
 require 'sinatra/base'
@@ -293,4 +294,4 @@ describe Mustermann::Extension do
     example { get('/auth/dunno').body.should be == 'auth required' }
     example { get('/auth/login').body.should be == 'please log in' }
   end
-end
+end

data/spec/identity_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/identity'
 

data/spec/mapper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/mapper'
 

data/spec/mustermann_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann'
 require 'mustermann/extension'
@@ -49,7 +50,7 @@ describe Mustermann do
 
     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")
+        expect { Mustermann.new(10) }.to raise_error(TypeError, /(Integer|Fixnum) can't be coerced into Mustermann::Pattern/)
       end
     end
   end

data/spec/pattern_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/pattern'
 require 'mustermann/sinatra'

data/spec/regexp_based_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/regexp_based'
 

data/spec/regular_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/regular'
 

data/spec/simple_match_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/simple_match'
 

data/spec/sinatra_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/sinatra'
 

data/spec/to_pattern_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'support'
 require 'mustermann/to_pattern'
 require 'delegate'

metadata

@@ -1,21 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: mustermann
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0
 platform: ruby
 authors:
 - Konstantin Haase
+- Zachary Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies: []
 description: library implementing patterns that behave like regular expressions
-email: konstantin.mailinglists@googlemail.com
+email: sinatrarb@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - bench/capturing.rb
 - bench/regexp.rb
@@ -70,7 +72,7 @@ files:
 - spec/simple_match_spec.rb
 - spec/sinatra_spec.rb
 - spec/to_pattern_spec.rb
-homepage: https://github.com/rkh/mustermann
+homepage: https://github.com/sinatra/mustermann
 licenses:
 - MIT
 metadata: {}
@@ -85,9 +87,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -95,4 +97,3 @@ signing_key:
 specification_version: 4
 summary: use patterns like regular expressions
 test_files: []
-has_rdoc: