mustermann 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c50c1eac97dced280798f1af3eb0f66862a13001
-  data.tar.gz: d7a7b5fa451c60d78b1d264b612e83a49918ce8a
+  metadata.gz: 0f9565d31c5b29a990840eb04f933be370358de6
+  data.tar.gz: 5f4dc020bd50b6d11f787dc555e0fcab6252d486
 SHA512:
-  metadata.gz: 4431ea0c5e349895c64147b504326f895b1209ce814509ae18d0ed506ad1ac99f9baffa8ebdb22d88545db7f851f2f7058414a36f7df36b59af6bb5007c94275
-  data.tar.gz: a199975d61ee06913ee9484af167d995fd25ebe9206129a6943f97a5adba649b4bb62552b3b4e0d335a15f5dd92d1b7e90baea31f8cad27c609a9dcc36e40fe9
+  metadata.gz: 7bf3d61ccac65e24d83b5551188ae5d9836b7664dad722fd077264d9b1b6e3097bc57b474c09acc3b250c009bd7852378b3049ee5630c28706335111ec651e60
+  data.tar.gz: b4ab4965dd93dae14ddf44c60116711a488ead67e0bf1109582c79ed86bf81c70315c1b9b4b6258978093515f4813e8f01d0aeca302de883289d65ccbcf5e870

data/lib/mustermann/equality_map.rb

@@ -10,7 +10,7 @@ module Mustermann
   #     @map = Mustermann::EqualityMap.new
   #
   #     def self.new(*args)
-  #       @map.fetch(*args) { super }
+  #       @map.fetch(args) { super }
   #     end
   #   end
   #
@@ -27,12 +27,16 @@ module Mustermann
       @map  = ObjectSpace::WeakMap.new
     end
 
-    # @param [Array<#hash>] key for caching
+    # @param [#hash] key for caching
     # @yield block that will be called to populate entry if missing (has to be idempotent)
     # @return value stored in map or result of block
-    def fetch(*key)
+    def fetch(key)
       identity = @keys[key.hash]
-      key      = identity == key ? identity : key
+      if identity == key
+        key = identity
+      elsif key.frozen?
+        key = key.dup
+      end
 
       # it is ok that this is not thread-safe, worst case it has double cost in
       # generating, object equality is not guaranteed anyways

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/sinatra/safe_renderer.rb

@@ -12,6 +12,7 @@ module Mustermann
       translate(:group)               { "(#{t(payload)})"                      }
       translate(:union)               { "(#{t(payload, join: ?|)})"            }
       translate(:optional)            { "#{t(payload)}?"                       }
+      translate(:with_look_ahead)     { t([head, payload])                     }
       translate(Array)                { |join: ""| map { |e| t(e) }.join(join) }
 
       translate(:capture) do

data/lib/mustermann/version.rb

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

data/spec/equality_map_spec.rb

@@ -22,5 +22,21 @@ RSpec.describe Mustermann::EqualityMap do
       result = subject.fetch(String.new('foo')) { "bar" }
       expect(result).to be == "bar"
     end
+
+    specify 'allows a frozen key and value' do
+      next if subject.is_a? Hash
+      key = "foo".freeze
+      value = "bar".freeze
+      subject.fetch(key) { value }
+      result = subject.fetch("foo".dup) { raise "not executed" }
+      expect(result).to be == value
+      expect(result).not_to equal value
+    end
+
+    specify 'allows only a single argument to be compatible with Hash#fetch' do
+      expect {
+        subject.fetch("foo", "bar", "baz") { "value" }
+      }.to raise_error(ArgumentError)
+    end
   end
 end

data/spec/regular_spec.rb

@@ -51,7 +51,7 @@ describe Mustermann::Regular do
         (.+)      # match the second SHA1
       }x
     }
-    example { expect { Timeout.timeout(1){ Mustermann::Regular.new(pattern) }}.not_to raise_error(Timeout::Error) }
+    example { expect { Timeout.timeout(1){ Mustermann::Regular.new(pattern) }}.not_to raise_error }
     it { expect(Mustermann::Regular.new(pattern)).to match('/compare/foo/bar..baz') }
   end
 

data/spec/sinatra_spec.rb

@@ -826,4 +826,11 @@ describe Mustermann::Sinatra do
       its(:class)  { should be == Mustermann::Composite                }
     end
   end
+
+  describe "native concatination" do
+    subject { Mustermann.new(prefix) + Mustermann.new(pattern) }
+    let(:prefix)  { "/a" }
+    let(:pattern) { "/:b(.:c)?" }
+    it { should match("/a/b.json") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustermann
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Konstantin Haase
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies: []
 description: A library implementing patterns that behave like regular expressions.
 email: sinatrarb@googlegroups.com