lhc 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe809e75fd7e92b7d3845d46bf14ce442a3c4dcd
-  data.tar.gz: ac02526096a42014c15efbab2bb5d6540f102620
+  metadata.gz: 433be6f02c1ccf13d4371eb4ce4f494459f95bda
+  data.tar.gz: 1d1f479f03152e50798da81183673c6adc0b15d8
 SHA512:
-  metadata.gz: d5f71fb2d3d35ee089e1e088ec77150106baf344b58d5278d5299a1b957151b2afe7d3e6d7f5b7243122e290f882346587e1f31a574058fa965157aa8acc2a24
-  data.tar.gz: 6651ce9efbbc0ce48ac4c28ce3e87fee172c741b5b0d60cb8d75741fa45a7ad8c0b60dc998d9b41734b43d75b9653b23beb5208b771cc05ed3eff693d8e8d7ae
+  metadata.gz: 334d1f083f02164608ea72a104c2b749510525eb405346b11923f7ca154250d8e9fba5f69b9bad8d2f184839c60a892bf071317d56696c4666d292ff96ccc3e4
+  data.tar.gz: 363288f5578543311ba1f00c886cc64cca9ea1fe170946946f9adca8bc394169d8e79055f6ee06a4d4585858ce0aba0d145efec8f3c5184b653203141f26f4d0

data/lib/lhc/endpoint.rb

@@ -58,6 +58,7 @@ class LHC::Endpoint
     LHC::Endpoint.placeholders(template).each do |placeholder|
       regexp = regexp.gsub(placeholder, '.*')
     end
+    regexp = regexp.gsub('/', '(?<!/)/(?!/)')
     url.match(Regexp.new("^#{regexp}$"))
   end
 

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/endpoint/match_spec.rb

@@ -7,13 +7,13 @@ describe LHC::Endpoint do
     context 'matching' do
       it 'checks if a url matches a template' do
         {
-          ':datastore/v2/places' => 'http://silo1.intra.local.ch:8082/v2/places',
-          ':datastore/v2/places/:id' => 'http://silo1.intra.local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
-          ':datastore/v2/places/:namespace/:id' => 'http://silo1.intra.local.ch:8082/v2/places/switzerland/ZW9OJyrbt'
+          ':datastore/v2/places' => 'http://local.ch:8082/v2/places',
+          ':datastore/v2/places/:id' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
+          ':datastore/v2/places/:namespace/:id' => 'http://local.ch:8082/v2/places/switzerland/ZW9OJyrbt'
         }.each do |template, url|
           expect(
             LHC::Endpoint.match?(url, template)
-          ).to be
+          ).to be, "#{url} should match #{template}!"
         end
       end
     end
@@ -21,11 +21,12 @@ describe LHC::Endpoint do
     context 'not matching' do
         it 'checks if a url matches a template' do
           {
-            ':datastore/v2/places' => 'http://silo1.intra.local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A'
+            ':datastore/v2/places' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
+            ':datastore/:campaign_id/feedbacks' => 'http://datastore.local.ch/feedbacks'
           }.each do |template, url|
             expect(
               LHC::Endpoint.match?(url, template)
-            ).not_to be
+            ).not_to be, "#{url} should not match #{template}!"
           end
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - local.ch