lhc 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e631c244f0c874a0e113aba5d070801abfefcc3
-  data.tar.gz: 1bbf13adcedef0adb7820069c08493153ce851c4
+  metadata.gz: 9eab71d5754c000d8a3810c90416a09b3c615b2e
+  data.tar.gz: 4de1ed988db86d463c7e573b48280f38d5172cb9
 SHA512:
-  metadata.gz: a376e211801678d57d28fa29abe0f3eb31f1d8e3a3e0d03740b1e663a53c3dc53df4f61af1e3ec2bf716e13cd5ca3968f0a082b705a9103bc6bc9d6a4c2f9515
-  data.tar.gz: 7d082bb04aaebb3bc32c977876a93a82305d93020a873c87b165ffaba689f9f124226e5833878a260717a66d70112d86e6c77d808e78fd68295e529f28141e0d
+  metadata.gz: f20cb466d43ff753fa3ec8b454879a100234d9231d4d440ba5132af9c79b245664b42953cc8e1e061e58bc1775b7eb6c7b32c0002782160c13a838f907f6c147
+  data.tar.gz: 45e4f0e2d27b4b30e072b504de2c6db24bb2a1bee673a33780e55c8a380db5f761f40871d14422fea3b4b6894ea7aeb4fbf5c6b7ba6405837b6be3e46077fe11

data/.rubocop.yml

@@ -8,3 +8,12 @@ Lint/IneffectiveAccessModifier:
 
 Rails:
   Enabled: false
+
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/DescribedClass:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false

data/lib/lhc/endpoint.rb

@@ -2,7 +2,8 @@
 # The url can also be an url-template.
 class LHC::Endpoint
 
-  PLACEHOLDER = /\:[A-Z,a-z,_,-]+/
+  PLACEHOLDER = %r{(?<=^):[^\/]+|(?<=\/):[^\/]+}
+  ANYTHING_BUT_SINGLE_SLASH = '([^\/]|\/\/)+'.freeze
 
   attr_accessor :url, :options
 
@@ -60,13 +61,10 @@ class LHC::Endpoint
 
   # Compares a concrete url with a template
   # 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
-    LHC::Endpoint.placeholders(template).each do |placeholder|
-      regexp = regexp.gsub(placeholder, '.*')
-    end
-    regexp = regexp.gsub('/', '(?<!/)/(?!/)')
-    url.match(Regexp.new("^#{regexp}$"))
+    regexp = template.gsub PLACEHOLDER, ANYTHING_BUT_SINGLE_SLASH
+    url.match "#{regexp}$"
   end
 
   # Returns all placeholders found in the url-template.

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION = "3.5.1"
+  VERSION = "3.5.2"
 end

data/non_rails_spec/request/request_spec.rb

@@ -7,7 +7,7 @@ describe LHC::Request do
   end
   context 'request without rails' do
     it 'does have deep_merge dependency met' do
-      expect { described_class.new({}, false) }.to_not raise_error
+      expect { described_class.new({}, false) }.not_to raise_error
     end
   end
 end

data/spec/endpoint/match_spec.rb

@@ -7,7 +7,10 @@ describe LHC::Endpoint do
         {
           ':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'
+          ':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'
         }.each do |template, url|
           expect(
             described_class.match?(url, template)
@@ -20,7 +23,8 @@ describe LHC::Endpoint do
       it 'checks if a url matches a template' do
         {
           ':datastore/v2/places' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
-          ':datastore/:campaign_id/feedbacks' => 'http://datastore.local.ch/feedbacks'
+          ':datastore/:campaign_id/feedbacks' => 'http://datastore.local.ch/feedbacks',
+          ':datastore/customers/:id' => 'http://local.ch:80/server/rest/v1/customers/123/addresses'
         }.each do |template, url|
           expect(
             described_class.match?(url, template)

data/spec/request/error_handling_spec.rb

@@ -49,7 +49,6 @@ describe LHC::Request do
   end
 
   context 'parsing error' do
-    
     before(:each) do
       stub_request(:get, 'http://datastore/v2/feedbacks').to_return(body: 'invalid json')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 1.9.2
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LocalHttpServices