faraday-tracer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 432de20c11ea8f776a334a35b499a0167f1dc9c5
-  data.tar.gz: a1aefc8b0851bb24e3712ffba9d121c9231803d1
+SHA256:
+  metadata.gz: 757004104d14a23593e81d9ff123168049e80dfe8c9110d447292b5015dd7ba8
+  data.tar.gz: dbf7dd70ebb93b714bdf8312c7b1fa3fb4661111161047da6d7a9b781d7ac47c
 SHA512:
-  metadata.gz: bf1faceda09cf8bcfc3f5d6345b540ca06f88bb8dd64fec1d1ec52b722eed5d14a8b4c7d29cee1d34cee0f393c8c78300072ec27042bfa45a256ca3c61b47a66
-  data.tar.gz: f65ec3f75d87f20fd1a7f6e8b4f417997e51beb8f528f26e1219bd8a5d671a9563ba0c477b1fa2a573519c427c3052cec3fa7cc5aa644aad10e1cc42f17ac37e
+  metadata.gz: 184f6c154460756b1054e9e2d84b97431ced091b7b019e6571fe090221fb74612fea0532340aef502a76c58119b539c5247fcbc2e7e50a9c1977acfbb30ca45a
+  data.tar.gz: 6a6ea73727b67e8d0dd5c67d0c2e944c53e3cf729e9cd11d7012a14d9266d510e31bb7617ed9f9971ad89e38a7a4435cef04ca4f05c5ebe21349e13b6c19f24e

data/.rubocop.yml

@@ -0,0 +1,34 @@
+require: rubocop-rspec
+
+Metrics/AbcSize:
+  Enabled: no
+
+Metrics/BlockLength:
+  Enabled: no
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: no
+
+Style/Documentation:
+  Enabled: no
+
+RSpec/ExampleLength:
+  Enabled: no
+
+RSpec/MultipleExpectations:
+  Enabled: no
+
+RSpec/MessageSpies:
+  Enabled: no
+
+Style/FrozenStringLiteralComment:
+  Enabled: yes
+  EnforcedStyle: always
+  Include:
+    - 'lib/**/*'
+
+Naming/FileName:
+  Enabled: no

data/Rakefile

@@ -1,6 +1,9 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new(:rubocop)
+
+task default: %i[rubocop spec]

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "faraday/tracer"
+require 'bundler/setup'
+require 'faraday/tracer'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "faraday/tracer"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/faraday-tracer.gemspec

@@ -1,15 +1,15 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'faraday-tracer'
-  spec.version       = '0.6.0'
+  spec.version       = '0.6.1'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 
-  spec.summary       = %q{Faraday OpenTracing middleware}
-  spec.description   = %q{}
+  spec.summary       = 'Faraday OpenTracing middleware'
+  spec.description   = ''
   spec.homepage      = 'https://github.com/salemove/faraday-tracer'
   spec.license       = 'MIT'
 
@@ -20,10 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentracing'
 
-  spec.add_development_dependency "test-tracer", "~> 1.0"
-  spec.add_development_dependency "tracing-matchers", "~> 1.0"
   spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'faraday'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'faraday'
+  spec.add_development_dependency 'rubocop', '~> 0.54.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.24.0'
+  spec.add_development_dependency 'test-tracer', '~> 1.0'
+  spec.add_development_dependency 'tracing-matchers', '~> 1.0'
 end

data/lib/faraday/tracer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'opentracing'
 
@@ -16,7 +18,7 @@ module Faraday
     #        is called.
     # @param errors [Array<Class>] An array of error classes to be captured by the tracer
     #        as errors. Errors are **not** muted by the middleware.
-    def initialize(
+    def initialize( # rubocop:disable Metrics/ParameterLists
         app,
         span: nil,
         span_name: nil,
@@ -34,9 +36,8 @@ module Faraday
 
     def call(env)
       span = @tracer.start_span(span_name(env),
-        child_of: parent_span(env),
-        tags: prepare_tags(env)
-      )
+                                child_of: parent_span(env),
+                                tags: prepare_tags(env))
       @tracer.inject(span.context, OpenTracing::FORMAT_RACK, env[:request_headers])
       @app.call(env).on_complete do |response|
         span.set_tag('http.status_code', response.status)
@@ -59,10 +60,9 @@ module Faraday
     def parent_span(env)
       context = env.request.context
       span = context.is_a?(Hash) && context[:span] || @parent_span
+      return unless span
 
-      if span
-        span.respond_to?(:call) ? span.call : span
-      end
+      span.respond_to?(:call) ? span.call : span
     end
 
     def prepare_tags(env)
@@ -70,7 +70,7 @@ module Faraday
         'component' => 'faraday',
         'span.kind' => 'client',
         'http.method' => env[:method],
-        'http.url' => env[:url].to_s,
+        'http.url' => env[:url].to_s
       }
 
       if (service_name = peer_service(env))

data/lib/faraday/tracer/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Faraday
   module Tracer
-    VERSION = "0.1.0"
+    VERSION = '0.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-tracer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing
@@ -25,89 +25,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-tracer
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: tracing-matchers
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: test-tracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: tracing-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ''
 email:
 - techmovers@salemove.com
@@ -117,6 +145,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -147,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Faraday OpenTracing middleware