lhc-core-interceptors 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bcc91b0161bd232e2487449b928a351fcb92e7
-  data.tar.gz: d1a91579f20175af675aa6455bbf2412c68eeee4
+  metadata.gz: 846a8d5619ee3ea84c7adfe04e967f37cb34f49a
+  data.tar.gz: 5e08294e64256b9adeb5040f369c2ae36bbc6f06
 SHA512:
-  metadata.gz: 25ed9660ad091992ec955b65744ad9adde2b99cd18ca77f9d4e04e8c5c2923cd53e0aa869fc78bf83000f5fb75adbc14035e7f3c4c3d82013ea479a066307dfb
-  data.tar.gz: 86d7df8895e1f7ce2c37a3d6859a2214580a3c96778c725f1b9d4e310be5237b36578da5e05d46e041af676353efd308b3e8777edeb6923c0b2f3177c1d928d9
+  metadata.gz: c182e664a63da4afcff74156c847dcd74303f6b32a2e893d91b17b3b9532cfa0e6b99cb649d379216c3512b3d9d0c58bb2eca10725671c7354dde993237bc546
+  data.tar.gz: 9d8f7cfba22dd40c1f78cb237677ef7ebf359fd401a8b7c40d5632b586271aaecaf846c9c5ff7de5fb2f628dc917a5df5b2807eab378fc20307198b86b54f45b

data/cider-ci/contexts/rspec.yml

@@ -0,0 +1,16 @@
+subcontexts:
+
+  - name: 'All rspec tests'
+
+    task-defaults:
+
+      scripts:
+
+        test:
+
+          body: |
+            #!/usr/bin/env bash
+            bundle exec rspec $CIDER_CI_TASK_FILE
+
+    _cider-ci_generate-tasks:
+      include-match: spec/.*_spec.rb

data/cider-ci/jobs/tests.yml

@@ -0,0 +1,27 @@
+tests:
+
+  name: 'Tests'
+
+  run-on:
+    - type: branch
+      include-match: ^.*$
+  
+  context:
+    
+    _cider-ci_include:
+      - cider-ci/contexts/rspec.yml
+
+    task-defaults:
+
+      scripts:
+
+        bundle:
+          body: sed 's/^source.*/source "http\:\/\/52.29.7.59:9292"/g' Gemfile > Gemfile.tmp ; mv Gemfile.tmp Gemfile && bundle install
+
+        ruby-version:
+          body: ruby --version
+
+        test:
+          start-when:
+            - script: bundle
+            - script: ruby-version

data/cider-ci.yml

@@ -0,0 +1,3 @@
+jobs:
+  _cider-ci_include:
+    - cider-ci/jobs/tests.yml

data/lib/lhc-core-interceptors/monitoring.rb

@@ -30,16 +30,22 @@ class LHC::Monitoring < LHC::Interceptor
     key = options(request.options)[:key]
     return key if key.present?
 
+    url = sanitize_url(request.url)
     key = [
       'lhc',
       Rails.application.class.parent_name.underscore,
       Rails.env,
-      URI.parse(request.url).host.gsub(/\./, '_'),
+      URI.parse(url).host.gsub(/\./, '_'),
       request.method
     ]
     key.join('.')
   end
 
+  def sanitize_url(url)
+    return url if url.match(%r{https?://})
+    "http://#{url}"
+  end
+
   def options(input = {})
     options = {}
     FORWARDED_OPTIONS.each do |k, v|

data/lib/lhc-core-interceptors/version.rb

@@ -1,3 +1,3 @@
 module LHCCoreInterceptors
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/monitoring/main_spec.rb

@@ -3,11 +3,20 @@ require 'rails_helper'
 describe LHC::Monitoring do
 
   let(:stub) { stub_request(:get, 'http://local.ch').to_return(status: 200, body: 'The Website') }
+  let(:endpoint_configuration) { LHC.config.endpoint(:local, 'http://local.ch') }
+
+  module Statsd
+    def self.count(path, value)
+    end
+    def self.timing(path, value)
+    end
+  end
 
   before(:each) do
     LHC.config.interceptors = [LHC::Monitoring]
+    LHC::Monitoring.statsd = Statsd
     Rails.cache.clear
-    LHC.config.endpoint(:local, 'http://local.ch')
+    endpoint_configuration
   end
 
   it 'does not report anything if no statsd is configured' do
@@ -17,17 +26,6 @@ describe LHC::Monitoring do
 
   context 'statsd configured' do
 
-    module Statsd
-      def self.count(path, value)
-      end
-      def self.timing(path, value)
-      end
-    end
-
-    before(:each) do
-      LHC::Monitoring.statsd = Statsd
-    end
-
     it 'reports trial, response and timing by default ' do
       stub
       expect(Statsd).to receive(:count).with('lhc.dummy.test.local_ch.get.count', 1)
@@ -59,7 +57,18 @@ describe LHC::Monitoring do
       expect(Statsd).to receive(:timing).with('defined_key.time', anything)
       LHC.get(:local, monitoring_key: 'defined_key')
     end
-
   end
 
+  context 'without protocol' do
+
+    let(:endpoint_configuration) { LHC.config.endpoint(:local, 'local.ch') }
+
+    it 'reports trial, response and timing by default ' do
+      stub
+      expect(Statsd).to receive(:count).with('lhc.dummy.test.local_ch.get.count', 1)
+      expect(Statsd).to receive(:count).with('lhc.dummy.test.local_ch.get.200', 1)
+      expect(Statsd).to receive(:timing).with('lhc.dummy.test.local_ch.get.time', anything)
+      LHC.get(:local)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc-core-interceptors
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -120,6 +120,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- cider-ci.yml
+- cider-ci/contexts/rspec.yml
+- cider-ci/jobs/tests.yml
 - lhc-core-interceptors.gemspec
 - lib/lhc-core-interceptors.rb
 - lib/lhc-core-interceptors/auth.rb