lhc 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9dd4a891bb2dfe1d92a2645cabc2f62e20f151
-  data.tar.gz: 79773712ea94e1067655ba8009c585a22a20f58a
+  metadata.gz: 8b55a6d77b6a16bb202a4babfc914427d70f092e
+  data.tar.gz: c618090650536a4f7fbff41c8b83a59b91108e3f
 SHA512:
-  metadata.gz: 7eb974645a68588ffcd873ecbbaa501807de0bb6abd8f5fb0a7a7b419b86169b7c788756ed1260c4ee2015ec5c21b86356124695f0296c9f30f1996f1a3349be
-  data.tar.gz: 46e449afd28c4d99a45d679e7daadde1ec1edba2bfe57bfdeaf9e2b67916fbee9a57caf3345bd5a8d23d0daa770a4a7f7d6d137c4694df83d1b1fd2a8260c983
+  metadata.gz: 036f5aa745a97701ef069a902b9ba7d6b6bb142d72ccfd028ebe91358d68ae23d98b6ea2f70d55c87ba7d064185f7c9b24b99b9a19107e8c00c802ff076fc0e7
+  data.tar.gz: 74db7500de0d6a3638c5f96ec918984e4dc9624a2405679fb7936e54178e98d9faa638f41b2fb61ad5bf3fe2c07e7fa1d06c5240a46a1296128209eb03d9525d

data/lib/lhc/endpoint.rb

@@ -2,8 +2,8 @@
 # The url can also be an url-template.
 class LHC::Endpoint
 
-  PLACEHOLDER = %r{(?<=^):[^\/]+|(?<=\/):[^\/]+}
-  ANYTHING_BUT_SINGLE_SLASH = '([^\/]|\/\/)+'.freeze
+  PLACEHOLDER = %r{(?<=^):[^\/\.]+|(?<=\/):[^\/\.]+}
+  ANYTHING_BUT_SINGLE_SLASH_AND_DOT = '([^\/\.]|\/\/)+'.freeze
 
   attr_accessor :url, :options
 
@@ -63,7 +63,7 @@ class LHC::Endpoint
   # Returns true if concrete url is covered by the template
   # Example: :datastore/contracts/:id == http://local.ch/contracts/1
   def self.match?(url, template)
-    regexp = template.gsub PLACEHOLDER, ANYTHING_BUT_SINGLE_SLASH
+    regexp = template.gsub PLACEHOLDER, ANYTHING_BUT_SINGLE_SLASH_AND_DOT
     url.match "#{regexp}$"
   end
 

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION = "3.5.3"
+  VERSION = "3.5.4"
 end

data/spec/endpoint/compile_spec.rb

@@ -19,5 +19,12 @@ describe LHC::Endpoint do
         endpoint.compile(find_value)
       ).to eq "http://datastore/v2"
     end
+
+    it 'compiles when templates contain dots' do
+      endpoint = described_class.new(':datastore/entries/:id.json')
+      expect(
+        endpoint.compile(datastore: 'http://datastore', id: 123)
+      ).to eq "http://datastore/entries/123.json"
+    end
   end
 end

data/spec/endpoint/match_spec.rb

@@ -10,7 +10,8 @@ describe LHC::Endpoint do
           ':datastore/v2/places/:namespace/:id' => 'http://local.ch:8082/v2/places/switzerland/ZW9OJyrbt',
           ':datastore/addresses/:id' => 'http://local.ch/addresses/123',
           'http://local.ch/addresses/:id' => 'http://local.ch/addresses/123',
-          ':datastore/customers/:id/addresses' => 'http://local.ch:80/server/rest/v1/customers/123/addresses'
+          ':datastore/customers/:id/addresses' => 'http://local.ch:80/server/rest/v1/customers/123/addresses',
+          ':datastore/entries/:id.json' => 'http://local.ch/entries/123.json'
         }.each do |template, url|
           expect(
             described_class.match?(url, template)
@@ -24,7 +25,8 @@ describe LHC::Endpoint do
         {
           ':datastore/v2/places' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
           ':datastore/:campaign_id/feedbacks' => 'http://datastore.local.ch/feedbacks',
-          ':datastore/customers/:id' => 'http://local.ch:80/server/rest/v1/customers/123/addresses'
+          ':datastore/customers/:id' => 'http://local.ch:80/server/rest/v1/customers/123/addresses',
+          ':datastore/entries/:id' => 'http://local.ch/entries/123.json'
         }.each do |template, url|
           expect(
             described_class.match?(url, template)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus