mustermann 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f9565d31c5b29a990840eb04f933be370358de6
-  data.tar.gz: 5f4dc020bd50b6d11f787dc555e0fcab6252d486
+SHA256:
+  metadata.gz: f6e92bdd2542114b33a9f209cf71fdbe0b876b35abe09c1bb7309b640304e105
+  data.tar.gz: 8146636bb8dba303e828db1379302d3623912670c7cbf4238a24e4b6d766ff70
 SHA512:
-  metadata.gz: 7bf3d61ccac65e24d83b5551188ae5d9836b7664dad722fd077264d9b1b6e3097bc57b474c09acc3b250c009bd7852378b3049ee5630c28706335111ec651e60
-  data.tar.gz: b4ab4965dd93dae14ddf44c60116711a488ead67e0bf1109582c79ed86bf81c70315c1b9b4b6258978093515f4813e8f01d0aeca302de883289d65ccbcf5e870
+  metadata.gz: 5982de41f3bdfa52e627f73a7c54dd4292681cf65acda63306dff7835a4f05126681ff6a0a1912448713d6f9103e55df4c5470368b9724040eb99cdf9190e07e
+  data.tar.gz: 6a8755d02a86521d0d3e1c68496a54b33ab5c88da85ec920d63b072647f861de36ee156a8b1524ea628b06a3439d940da4570031306763db589ed773b3eff088

data/lib/mustermann.rb

@@ -3,6 +3,7 @@ require 'mustermann/pattern'
 require 'mustermann/composite'
 require 'mustermann/concat'
 require 'thread'
+require 'ruby2_keywords'
 
 # Namespace and main entry point for the Mustermann library.
 #

data/lib/mustermann/ast/compiler.rb

@@ -40,7 +40,7 @@ module Mustermann
 
         # @!visibility private
         def translate(**options)
-          return pattern(options) if options[:no_captures]
+          return pattern(**options) if options[:no_captures]
           "(?<#{name}>#{translate(no_captures: true, **options)})"
         end
 

data/lib/mustermann/ast/expander.rb

@@ -92,11 +92,11 @@ module Mustermann
       # @see Mustermann::Pattern#expand
       # @!visibility private
       def expand(values)
-        values = values.each_with_object({}){ |(key, value), new_hash|
+        adjusted = values.each_with_object({}){ |(key, value), new_hash|
           new_hash[value.instance_of?(Array) ? [key] * value.length : key] = value }
-        keys, pattern, filters = mappings.fetch(values.keys.flatten.sort) { error_for(values) }
-        filters.each { |key, filter| values[key] &&= escape(values[key], also_escape: filter) }
-        pattern % (values[keys] || values.values_at(*keys))
+        keys, pattern, filters = mappings.fetch(adjusted.keys.flatten.sort) { error_for(values) }
+        filters.each { |key, filter| adjusted[key] &&= escape(adjusted[key], also_escape: filter) }
+        pattern % (adjusted[keys] || adjusted.values_at(*keys))
       end
 
       # @see Mustermann::Pattern#expandable?
@@ -122,7 +122,7 @@ module Mustermann
 
       # @see Mustermann::AST::Translator#expand
       # @!visibility private
-      def escape(string, *args)
+      ruby2_keywords def escape(string, *args)
         # URI::Parser is pretty slow, let's not send every string to it, even if it's unnecessary
         string =~ /\A\w*\Z/ ? string : super
       end
@@ -137,7 +137,7 @@ module Mustermann
       # @!visibility private
       def add_to(list, result)
         list << [[], ""] if list.empty?
-        list.inject([]) { |l, (k1, p1, f1)| l + result.map { |k2, p2, f2| [k1+k2, p1+p2, **f1, **f2] } }
+        list.inject([]) { |l, (k1, p1, f1)| l + result.map { |k2, p2, f2| [k1+k2, p1+p2, f1.merge(f2)] } }
       end
     end
   end

data/lib/mustermann/ast/parser.rb

@@ -64,7 +64,7 @@ module Mustermann
       # @param [Symbol] type node type
       # @return [Mustermann::AST::Node]
       # @!visibility private
-      def node(type, *args, &block)
+      ruby2_keywords def node(type, *args, &block)
         type  = Node[type] unless type.respond_to? :new
         start = pos
         node  = block ? type.parse(*args, &block) : type.new(*args)
@@ -153,7 +153,7 @@ module Mustermann
       def read_brackets(open, close, char: nil, escape: ?\\, quote: false, **options)
         result = String.new
         escape = false if escape.nil?
-        while current = getch
+        while (current = getch)
           case current
           when close  then return result
           when open   then result << open   << read_brackets(open, close) << close

data/lib/mustermann/ast/translator.rb

@@ -36,7 +36,7 @@ module Mustermann
 
         # shorthand for translating a nested object
         # @!visibility private
-        def t(*args, &block)
+        ruby2_keywords def t(*args, &block)
           return translator unless args.any?
           translator.translate(*args, &block)
         end
@@ -109,7 +109,7 @@ module Mustermann
 
       # Start the translation dance for a (sub)tree.
       # @!visibility private
-      def translate(node, *args, &block)
+      ruby2_keywords def translate(node, *args, &block)
         result = decorator_for(node).translate(*args, &block)
         result = result.node while result.is_a? NodeTranslator
         result

data/lib/mustermann/composite.rb

@@ -102,9 +102,9 @@ module Mustermann
     end
 
     # @!visibility private
-    def patterns_from(pattern, options = nil)
+    def patterns_from(pattern, **options)
       return pattern.patterns if pattern.is_a? Composite and pattern.operator == self.operator
-      [options ? Mustermann.new(pattern, **options) : pattern]
+      [options.empty? && pattern.is_a?(Pattern) ? pattern : Mustermann.new(pattern, **options)]
     end
 
     private :with_matching, :patterns_from

data/lib/mustermann/concat.rb

@@ -40,7 +40,7 @@ module Mustermann
 
     # Should not be used directly.
     # @!visibility private
-    def initialize(*)
+    def initialize(*, **)
       super
       AST::Validation.validate(combined_ast) if respond_to? :expand
     end

data/lib/mustermann/mapper.rb

@@ -40,11 +40,7 @@ module Mustermann
     #
     #   @example map before options
     #     require 'mustermann/mapper'
-    #     Mustermann::Mapper.new("/:foo" => "/:foo.html", type: :rails)
-    #
-    #   @example map after options
-    #     require 'mustermann/mapper'
-    #     Mustermann::Mapper.new(type: :rails, "/:foo" => "/:foo.html")
+    #     Mustermann::Mapper.new({"/:foo" => "/:foo.html"}, type: :rails)
     def initialize(map = {}, additional_values: :ignore, **options, &block)
       @map               = []
       @options           = options

data/lib/mustermann/pattern.rb

@@ -56,7 +56,7 @@ module Mustermann
       end
 
       @map ||= EqualityMap.new
-      @map.fetch([string, options]) { super(string, options) { options } }
+      @map.fetch([string, options]) { super(string, **options) { options } }
     end
 
     supported_options :uri_decode, :ignore_unknown_options

data/lib/mustermann/version.rb

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

data/mustermann.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   s.files                 = `git ls-files`.split("\n")
   s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.add_runtime_dependency('ruby2_keywords', '~> 0.0.1')
 end

data/spec/expander_spec.rb

@@ -64,6 +64,8 @@ describe Mustermann::Expander do
       example { expander.expand(a: ?a).should be == '/a' }
       example { expander.expand(a: ?a, b: ?b).should be == '/a' }
       example { expect { expander.expand(b: ?b) }.to raise_error(Mustermann::ExpandError) }
+      example { expect { expander.expand(b: ?b, c: []) }.to raise_error(Mustermann::ExpandError) }
+      example { expect { expander.expand(b: ?b, c: [], d: ?d) }.to raise_error(Mustermann::ExpandError) }
     end
 
     context :append do

data/spec/mapper_spec.rb

@@ -19,21 +19,14 @@ describe Mustermann::Mapper do
     end
 
     context 'accepts mappings followed by options' do
-      subject(:mapper) { Mustermann::Mapper.new("/foo" => "/bar", additional_values: :raise) }
-      its(:to_h) { should be == { Mustermann.new("/foo") => Mustermann::Expander.new("/bar") } }
-      example { mapper['/foo'].should be == '/bar' }
-      example { mapper['/fox'].should be == '/fox' }
-    end
-
-    context 'accepts options followed by mappings' do
-      subject(:mapper) { Mustermann::Mapper.new(additional_values: :raise, "/foo" => "/bar") }
+      subject(:mapper) { Mustermann::Mapper.new({ "/foo" => "/bar" }, additional_values: :raise) }
       its(:to_h) { should be == { Mustermann.new("/foo") => Mustermann::Expander.new("/bar") } }
       example { mapper['/foo'].should be == '/bar' }
       example { mapper['/fox'].should be == '/fox' }
     end
 
     context 'allows specifying type' do
-      subject(:mapper) { Mustermann::Mapper.new(additional_values: :raise, type: :rails, "/foo" => "/bar") }
+      subject(:mapper) { Mustermann::Mapper.new({ "/foo" => "/bar" }, additional_values: :raise, type: :rails) }
       its(:to_h) { should be == { Mustermann.new("/foo", type: :rails) => Mustermann::Expander.new("/bar", type: :rails) } }
       example { mapper['/foo'].should be == '/bar' }
       example { mapper['/fox'].should be == '/fox' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustermann
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Konstantin Haase
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
-dependencies: []
+date: 2019-12-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: A library implementing patterns that behave like regular expressions.
 email: sinatrarb@googlegroups.com
 executables: []
@@ -91,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Your personal string matching expert.