we-call 0.6.0.pre.alpha.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c34caa46ddb44d604811424673ceb22a81f7632
-  data.tar.gz: c4a42d7fe0b6035e06d044e1427f9c23b8919318
+  metadata.gz: 3d78d029728e8e0fa159897a40a4e618127f8baa
+  data.tar.gz: 7d19119651d934580795b9ae0f94a758048406cd
 SHA512:
-  metadata.gz: '083bc9fc18509c2c11a36a0fd0ec523371a3fa1c026a70052a6cde4e1442e167ab1bc2257a443e4354e4fbf665bed800556b941c77b039ba7aa6d690c25afa14'
-  data.tar.gz: 267e738a3f870802ce4e7c8bc4a9599ecafa672bb0b8181f0fc2909c70c6c40937d6a8dc378eb9df9686481405644cfc148088def40053107ae0d04677c32849
+  metadata.gz: f5f90f915b325d61ccdfc43c896e4b4354d83a1ba47deade642411ab89316159c56ceda5aeda2813e223d3f5eb769e5e298155bbf632430d870a72110c683451
+  data.tar.gz: a1952d2146232bb7f6a78d78394bed9b48d8b82f1bbfbba681dcd17b1495b3d54001456e30ba32608bb311bd953f4321773e50978e945c8818176a6b2fe93ae9

data/README.md

@@ -157,7 +157,6 @@ _For now this gem requires Rails 4.2+ due to some ActiveController functionality
 - [ ] Support adding href to Deprecate to make a `Link` with rel=sunset as per Sunset RFC draft 03
 - [ ] Remove Rails as a dependency (soft requirement on `ActiveSupport::Deprecated` is fine)
 - [x] Split DetectDeprecations into standalone [faraday-sunset] gem
-- [ ] Pass Trace IDs along
 - [ ] Work on sane defaults for retries and error raising
 
 [faraday-sunset]: https://github.com/philsturgeon/faraday-sunset
@@ -167,12 +166,12 @@ _For now this gem requires Rails 4.2+ due to some ActiveController functionality
 To run tests and modify locally, you'll want to `bundle install` in this directory.
 
 ```
-bundle exec rspec
+bundle exec appraisal rspec
 ```
 
 ## Development
 
-If you want to test this gem within an application, update your Gemfile to have something like this: `gem 'we-call', github: 'wework/we-call', branch: 'BRANCHNAME'` and set your local config: `bundle config --local local.we-call path/to/we-call`
+If you want to test this gem within an application, update your Gemfile to have something like this: `gem 'we-call', github: 'wework/we-call-gem', branch: 'BRANCHNAME'` and set your local config: `bundle config --local local.we-call path/to/we-call-gem`
 
 Simply revert the Gemfile change (updating the version as necessary!) and remove the config with `bundle config --delete local.we-call`.
 

data/lib/we/call/connection.rb

@@ -1,5 +1,7 @@
 require 'faraday'
 require 'faraday-sunset'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 
 module We
   module Call
@@ -8,14 +10,17 @@ module We
 
       OPEN_TIMEOUT = 2
 
+      # We use typhoeus instead of default NetHTTP so we can control how many retries are made
+      # https://github.com/lostisland/faraday/issues/612
+      DEFAULT_ADAPTER_CLASS = Faraday::Adapter::Typhoeus
+      DEFAULT_ADAPTER = :typhoeus
+
       class MissingApp < ArgumentError; end
       class MissingEnv < ArgumentError; end
       class MissingTimeout < ArgumentError; end
       class MissingOpenTimeout < ArgumentError; end
 
-      parent_builder_class = defined?(Faraday::RackBuilder) ? Faraday::RackBuilder : Faraday::Builder
-
-      QueryableBuilder = Class.new(parent_builder_class) do
+      QueryableBuilder = Class.new(Faraday::RackBuilder) do
         def adapter?
           @has_adapter || false
         end
@@ -49,20 +54,25 @@ module We
       def create
         builder = QueryableBuilder.new(&Proc.new { |_| })
 
-        Faraday.new(url: host, builder: builder) do |faraday|
-          faraday.headers['User-Agent'] = app
-          faraday.headers[config.app_name_header] = app
-          faraday.headers[config.app_env_header] = env
-          faraday.options[:timeout] = timeout
-          faraday.options[:open_timeout] = open_timeout
+        headers = {
+          'User-Agent'            => app,
+          config.app_name_header  => app,
+          config.app_env_header   => env,
+        }
+
+        request = {
+          timeout:      timeout,
+          open_timeout: open_timeout
+        }
 
+        Faraday.new(host, builder: builder, headers: headers, request: request) do |faraday|
           if config.detect_deprecations
             faraday.response :sunset, setup_sunset_middleware(faraday)
           end
 
           yield faraday if block_given?
 
-          faraday.adapter Faraday.default_adapter unless faraday.builder.adapter?
+          faraday.adapter DEFAULT_ADAPTER unless faraday.builder.adapter?
         end
       end
 

data/lib/we/call/version.rb

@@ -1,5 +1,5 @@
 module We
   module Call
-    VERSION = "0.6.0-alpha.1"
+    VERSION = "0.6.0"
   end
 end

data/we-call.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
   spec.bindir               = "bin"
   spec.require_paths        = ["lib"]
 
-  spec.add_dependency "faraday", ">= 0.9.0", "< 0.14"
+  spec.add_dependency "typhoeus", "~> 1.3"
+  spec.add_dependency "faraday", ">= 0.9.0", "< 1.0"
   spec.add_dependency "faraday_middleware", '~> 0'
   spec.add_dependency "faraday-sunset", "~> 0.1.0"
   spec.add_dependency "ruby_decorators", '~> 0.0'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: we-call
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.alpha.1
+  version: 0.6.0
 platform: ruby
 authors:
 - WeWork Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -19,7 +33,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +43,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -245,9 +259,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8