lhc 0.2.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac9f0ada28e8054aa6f8e01de35451970dd478b
-  data.tar.gz: b457597aba0d084e762f599b8a42680c2126cc47
+  metadata.gz: fe809e75fd7e92b7d3845d46bf14ce442a3c4dcd
+  data.tar.gz: ac02526096a42014c15efbab2bb5d6540f102620
 SHA512:
-  metadata.gz: 076b39d8fc0003520cd64ae221bc7f7efaf2b671a684699b3092566065f3490a85d54464447576179460715934b6350cc8cc0c8a57bf43cc2a7876ab745594fc
-  data.tar.gz: 6cb6e105b87af256708c9552a13aa1b935e59e500535bbb77197ba7e3a402ffd2f45fc1fdd84f3dc4c0b8ce67f3c9c6ead3dc09195f3ca7b99223a42e52b63c4
+  metadata.gz: d5f71fb2d3d35ee089e1e088ec77150106baf344b58d5278d5299a1b957151b2afe7d3e6d7f5b7243122e290f882346587e1f31a574058fa965157aa8acc2a24
+  data.tar.gz: 6651ce9efbbc0ce48ac4c28ce3e87fee172c741b5b0d60cb8d75741fa45a7ad8c0b60dc998d9b41734b43d75b9653b23beb5208b771cc05ed3eff693d8e8d7ae

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://GemInAbox:e3XRBgVJRNUmwJ5y@gembox-vm-inx01.intra.local.ch/'
+source 'https://rubygems.org'
 
 # Declare your gem's dependencies in lhc.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/lhc.gemspec

@@ -14,17 +14,19 @@ Gem::Specification.new do |s|
   s.description = 'Rails gem wrapping typhoeus and providing additional features (like interceptors)'
 
   s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
+  s.test_files   = `git ls-files -- spec/*`.split("\n") +
+                   `git ls-files -- non_rails_spec/*`.split("\n")
   s.require_paths = ['lib']
 
   s.requirements << 'Ruby >= 1.9.2'
   s.required_ruby_version = '>= 1.9.2'
-  
+
   s.add_dependency 'typhoeus'
+  s.add_dependency 'activesupport'
 
   s.add_development_dependency 'rspec-rails', '>= 3.0.0'
   s.add_development_dependency 'rails', '~> 4.1.1'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'geminabox'
   s.add_development_dependency 'pry'
-end
+end

data/lib/lhc/endpoint.rb

@@ -40,7 +40,7 @@ class LHC::Endpoint
   # Returns all placeholders found in the url-template.
   # They are alphabetically sorted.
   def placeholders
-    url.scan(PLACEHOLDER).sort
+    LHC::Endpoint.placeholders(url)
   end
 
   # Find a value for a placeholder either in the configuration
@@ -50,4 +50,37 @@ class LHC::Endpoint
     match = match.gsub(/^\:/, '').to_sym
     params[match] || LHC.config.placeholders[match]
   end
+
+  # Compares a concrete url with a template
+  # Returns true if concrete url is covered by the template
+  def self.match?(url, template)
+    regexp = template
+    LHC::Endpoint.placeholders(template).each do |placeholder|
+      regexp = regexp.gsub(placeholder, '.*')
+    end
+    url.match(Regexp.new("^#{regexp}$"))
+  end
+
+  # Returns all placeholders found in the url-template.
+  # They are alphabetically sorted.
+  def self.placeholders(template)
+    template.scan(PLACEHOLDER).sort
+  end
+
+  # Extracts the values from url and
+  # creates params according to template
+  def self.values_as_params(template, url)
+    params = {}
+    regexp = template
+    LHC::Endpoint.placeholders(template).each do |placeholder|
+      name = placeholder.gsub(":", '')
+      regexp = regexp.gsub(placeholder, "(?<#{name}>.*)")
+    end
+    matchdata = url.match(Regexp.new("^#{regexp}$"))
+    LHC::Endpoint.placeholders(template).each do |placeholder|
+      name = placeholder.gsub(':', '')
+      params[name.to_sym] = matchdata[name]
+    end
+    params
+  end
 end

data/lib/lhc/request.rb

@@ -1,4 +1,5 @@
 require 'typhoeus'
+require 'active_support/core_ext/object/deep_dup'
 
 # The request is doing an http-request using typhoeus.
 # It provides functionalities to access and alter request data
@@ -15,9 +16,8 @@ class LHC::Request
     generate_url_from_template!
     self.iprocessor = LHC::InterceptorProcessor.new(self)
     self.raw = create_request
-    return unless self_executing
     iprocessor.intercept(:before_request, self)
-    raw.run if !response
+    raw.run if self_executing && !response
   end
 
   def url

data/lib/lhc/version.rb

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

data/non_rails_spec/request/request_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe LHC::Request do
+  before do
+    allow_any_instance_of(LHC::Request).to receive(:use_configured_endpoint!)
+    allow_any_instance_of(LHC::Request).to receive(:generate_url_from_template!)
+  end
+  context 'request without rails' do
+    it 'does have deep_merge dependency met' do
+      expect { described_class.new({}, false) }.to_not raise_error
+    end
+  end
+end

data/script/ci/build.sh

@@ -4,7 +4,6 @@
 # RUBY = ruby-1.9.3-p125
 # GEMSET = location-app-${GitHub pull request id|branch name}
 # standard vars
-# https://jenkins.intra.local.ch/env-vars.html/
 
 if [ -z "$SKIP_RVM" ]; then
   [[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm"
@@ -16,4 +15,5 @@ fi
 
 bundle install --local --quiet || bundle install --quiet
 RAILS_ENV=test bundle exec rspec
+bundle exec rspec non_rails_spec
 rvm --force gemset delete ${RUBY}@${GEMSET}

data/spec/endpoint/match_spec.rb

@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe LHC::Endpoint do
+
+  context 'match' 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'
+        }.each do |template, url|
+          expect(
+            LHC::Endpoint.match?(url, template)
+          ).to be
+        end
+      end
+    end
+
+    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'
+          }.each do |template, url|
+            expect(
+              LHC::Endpoint.match?(url, template)
+            ).not_to be
+          end
+        end
+    end
+  end
+end

data/spec/endpoint/values_as_params_spec.rb

@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+describe LHC::Endpoint do
+
+  context 'values_as_params' do
+
+    it 'provides params extracting values from a provided url and template' do
+      [
+        [':datastore/v2/places', 'http://silo1.intra.local.ch:8082/v2/places', {
+          datastore: 'http://silo1.intra.local.ch:8082'
+        }],
+        [':datastore/v2/places/:id', 'http://silo1.intra.local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A', {
+          datastore: 'http://silo1.intra.local.ch:8082',
+          id: 'ZW9OJyrbt4OZE9ueu80w-A'
+        }],
+        [':datastore/v2/places/:namespace/:id', 'http://silo1.intra.local.ch:8082/v2/places/switzerland/ZW9OJyrbt', {
+          datastore: 'http://silo1.intra.local.ch:8082',
+          namespace: 'switzerland',
+          id: 'ZW9OJyrbt'
+        }],
+      ].each do |example|
+        params = LHC::Endpoint.values_as_params(example[0], example[1])
+        expect(params).to eq example[2]
+      end
+    end
+  end
+end

data/spec/interceptors/after_response_spec.rb

@@ -30,10 +30,10 @@ describe LHC do
       LHC.configure { |c| c.interceptors = [StatsTimingInterceptor] }
     end
 
-    let(:url) { "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/-Sc4_pYNpqfsudzhtivfkA" }
+    let(:url) { "http://local.ch/v2/feedbacks/-Sc4_pYNpqfsudzhtivfkA" }
 
     it 'can take action after a response was received' do
-      allow(Services).to receive(:timing).with('web.dummy.test.get.http.datastore-stg.lb-service.sunrise.intra.local.ch.200', 0)
+      allow(Services).to receive(:timing).with('web.dummy.test.get.http.local.ch.200', 0)
       stub_request(:get, url)
       LHC.get(url)
       expect(Services).to have_received(:timing)

data/spec/request/parallel_requests_spec.rb

@@ -2,14 +2,39 @@ require 'rails_helper'
 
 describe LHC::Request do
 
-  it 'does parallel requests if you provide an array of requests' do
-    requests = []
-    requests << { url: 'http://www.local.ch/restaurants' }
-    requests << { url: 'http://www.local.ch' }
+  let(:request_options) do
+    [
+      { url: 'http://www.local.ch/restaurants' },
+      { url: 'http://www.local.ch' }
+    ]
+  end
+
+  let(:stub_parallel_requests) do
     stub_request(:get, "http://www.local.ch/restaurants").to_return(status: 200, body: '1')
     stub_request(:get, "http://www.local.ch").to_return(status: 200, body: '2')
-    responses = LHC.request(requests)
+  end
+
+  it 'does parallel requests if you provide an array of requests' do
+    stub_parallel_requests
+    responses = LHC.request(request_options)
     expect(responses[0].body).to eq '1'
     expect(responses[1].body).to eq '2'
   end
+
+  context 'interceptors' do
+
+    before(:each) do
+      class TestInterceptor < LHC::Interceptor; end
+      LHC.configure { |c| c.interceptors = [TestInterceptor] }
+    end
+
+    it 'calls interceptors also for parallel requests' do
+      stub_parallel_requests
+      @called = 0
+      allow_any_instance_of(TestInterceptor)
+        .to receive(:before_request) { @called += 1 }
+      LHC.request(request_options)
+      expect(@called).to eq 2
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'pry'
 require 'webmock/rspec'
+require 'lhc'
 
 Dir[File.join(__dir__, "support/**/*.rb")].each {|f| require f}

data/spec/support/fixtures/json/feedback.json

@@ -1,7 +1,7 @@
 {
-    "href": "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/-Sc4_pYNpqfsudzhtivfkA",
+    "href": "http://local.ch/v2/feedbacks/-Sc4_pYNpqfsudzhtivfkA",
     "campaign": {
-        "href": "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12d"
+        "href": "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a12d"
     },
     "source_id": "aaa",
     "recommended": true,

data/spec/support/fixtures/json/feedbacks.json

@@ -1,9 +1,9 @@
 {
-  "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/?exclude_hidden=false&offset=0&limit=10",
+  "href" : "http://local.ch/v2/feedbacks/?exclude_hidden=false&offset=0&limit=10",
   "items" : [ {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/0sdaetZ-OWVg4oBiBJ-7IQ",
+    "href" : "http://local.ch/v2/feedbacks/0sdaetZ-OWVg4oBiBJ-7IQ",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12d"
+      "href" : "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a12d"
     },
     "source_id" : "aaa",
     "recommended" : true,
@@ -17,9 +17,9 @@
     "average_rating" : 3.0,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/QsUOQWNJoB-GFUNsX7z0jg",
+    "href" : "http://local.ch/v2/feedbacks/QsUOQWNJoB-GFUNsX7z0jg",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a11f"
+      "href" : "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a11f"
     },
     "source_id" : "abcdefghs12345",
     "name" : "Steve",
@@ -36,9 +36,9 @@
     "average_rating" : 3.3333333333333335,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/QynNtmpXlsEGvUJ0ekDKVw",
+    "href" : "http://local.ch/v2/feedbacks/QynNtmpXlsEGvUJ0ekDKVw",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc56b0cf271c375c5a14d"
+      "href" : "http://local.ch/v2/content-ads/51dfc56b0cf271c375c5a14d"
     },
     "source_id" : "abcdefghs12345",
     "name" : "Steve",
@@ -55,9 +55,9 @@
     "average_rating" : 3.3333333333333335,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/INmminYWNZwW_qNFx5peJQ",
+    "href" : "http://local.ch/v2/feedbacks/INmminYWNZwW_qNFx5peJQ",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc56b0cf271c375c5a153"
+      "href" : "http://local.ch/v2/content-ads/51dfc56b0cf271c375c5a153"
     },
     "source_id" : "abcdefghs12345",
     "name" : "Steve",
@@ -74,9 +74,9 @@
     "average_rating" : 3.3333333333333335,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/ltgfr0VRYDN2nxyC119wTg",
+    "href" : "http://local.ch/v2/feedbacks/ltgfr0VRYDN2nxyC119wTg",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc56b0cf271c375c5a14c"
+      "href" : "http://local.ch/v2/content-ads/51dfc56b0cf271c375c5a14c"
     },
     "source_id" : "aaa",
     "recommended" : false,
@@ -90,9 +90,9 @@
     "average_rating" : 1.3333333333333333,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/5dUdQP-kZ6sulN8NtpGXTw",
+    "href" : "http://local.ch/v2/feedbacks/5dUdQP-kZ6sulN8NtpGXTw",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc56b0cf271c375c5a14c"
+      "href" : "http://local.ch/v2/content-ads/51dfc56b0cf271c375c5a14c"
     },
     "source_id" : "abcdefghs12345",
     "name" : "Steve",
@@ -109,9 +109,9 @@
     "average_rating" : 3.3333333333333335,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/Z3KfWzIEQ3ZVCUj2IdrSNQ",
+    "href" : "http://local.ch/v2/feedbacks/Z3KfWzIEQ3ZVCUj2IdrSNQ",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12e"
+      "href" : "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a12e"
     },
     "source_id" : "abcdefghs",
     "recommended" : true,
@@ -119,9 +119,9 @@
     "created_date" : "2014-09-10T16:57:36.254+02:00",
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/ZUUUeiw-Stw5Zb1baHDUzQ",
+    "href" : "http://local.ch/v2/feedbacks/ZUUUeiw-Stw5Zb1baHDUzQ",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12d"
+      "href" : "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a12d"
     },
     "source_id" : "abcdefghs",
     "recommended" : true,
@@ -129,9 +129,9 @@
     "created_date" : "2014-09-10T16:57:32.791+02:00",
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/GyeWvhEtU4cYN_5T2FX2UA",
+    "href" : "http://local.ch/v2/feedbacks/GyeWvhEtU4cYN_5T2FX2UA",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/539266ec0cf2cd754583cfa0"
+      "href" : "http://local.ch/v2/content-ads/539266ec0cf2cd754583cfa0"
     },
     "source_id" : "abcdefghs",
     "name" : "aa",
@@ -148,9 +148,9 @@
     "average_rating" : 3.0,
     "comments" : [ ]
   }, {
-    "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/o-qTRqQGFS3Z_RPJm1f8SA",
+    "href" : "http://local.ch/v2/feedbacks/o-qTRqQGFS3Z_RPJm1f8SA",
     "campaign" : {
-      "href" : "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc56c0cf271c375c5a160"
+      "href" : "http://local.ch/v2/content-ads/51dfc56c0cf271c375c5a160"
     },
     "source_id" : "abcdefghs12345",
     "recommended" : true,

data/spec/support/fixtures/json/localina_content_ad.json

@@ -1,5 +1,5 @@
 {
-    "href": "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12d",
+    "href": "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a12d",
     "id": "51dfc5690cf271c375c5a12d",
     "product": "BKE",
     "hidden": false,
@@ -8,7 +8,7 @@
     "phone_number": "0041562227764",
     "type": "LOCALINA",
     "feedbacks": {
-        "href": "http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12d/feedbacks?exclude_hidden=false&offset=0&limit=10"
+        "href": "http://local.ch/v2/content-ads/51dfc5690cf271c375c5a12d/feedbacks?exclude_hidden=false&offset=0&limit=10"
     },
     "aggregated_feedback": {
         "recommendation": 1,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.1.0
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +139,7 @@ files:
 - lib/lhc/request.rb
 - lib/lhc/response.rb
 - lib/lhc/version.rb
+- non_rails_spec/request/request_spec.rb
 - script/ci/build.sh
 - spec/basic_methods/delete_spec.rb
 - spec/basic_methods/get_spec.rb
@@ -173,8 +188,10 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/endpoint/compile_spec.rb
+- spec/endpoint/match_spec.rb
 - spec/endpoint/placeholders_spec.rb
 - spec/endpoint/remove_interpolated_params_spec.rb
+- spec/endpoint/values_as_params_spec.rb
 - spec/error/find_spec.rb
 - spec/error/response_spec.rb
 - spec/error/timeout_spec.rb
@@ -278,8 +295,10 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/endpoint/compile_spec.rb
+- spec/endpoint/match_spec.rb
 - spec/endpoint/placeholders_spec.rb
 - spec/endpoint/remove_interpolated_params_spec.rb
+- spec/endpoint/values_as_params_spec.rb
 - spec/error/find_spec.rb
 - spec/error/response_spec.rb
 - spec/error/timeout_spec.rb
@@ -311,3 +330,4 @@ test_files:
 - spec/support/reset_config.rb
 - spec/timeouts/no_signal_spec.rb
 - spec/timeouts/timings_spec.rb
+- non_rails_spec/request/request_spec.rb