restful_resource 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d294661eeac9255891b66e6dbebb6f1f5da44921
-  data.tar.gz: 5859ac65ef925dbd3c92b310ab377f8b3247258b
+  metadata.gz: d2d72ef667a20e5c2773931c3b5c449af79ed096
+  data.tar.gz: f0d464e0d0ffd5740c61d5ae6e251e755844e940
 SHA512:
-  metadata.gz: 49e2eb64d13010ced65c8a1d0b7b18d61047cfb7afd9d9afaced84453975a8b8317161cd5ea038413750e777ef7bc93acd916e82b6ed088507f0bb03695c23aa
-  data.tar.gz: 590deacd3e072ec8bb49cbe2e5e5d479d7442e7ad45cc9ba6e108af080434a7ec2dd716badf6d1dc0c3019fcd77540eea4298ac593e3db5d0c3b140d28e6eb09
+  metadata.gz: 161b0138fea97c3cb5853514ddc3b799328bf01d8829276b84f1dadcd2b1513739f2a8a7163a35c54304c1549e184dd0d3d1731920b4c16e41e859fadbeb61fe
+  data.tar.gz: 40177d79fd2a410a23adbb5e93037b72fc82657f7d9caa1353cc318aa296984fd1e862d5a11eb3ca8ea45b1d1d3320332146777b5b75d419cc5d387105272304

data/Rakefile

@@ -9,12 +9,12 @@ desc "Upload to rubygems"
 task :upload => :build do
   # Check if tag with v#{ResearchSiteApiClient::VERSION} version exists, if so, return with error
 
-  # if tag_exists?(current_tag_name)
-  #   puts "Tag exists, did you run rake increase_revision_number after merging with master?"
-  #   exit 1
-  # end
+  if tag_exists?(current_tag_name)
+    puts "Tag exists, did you run rake increase_revision_number after merging with master?"
+    exit 1
+  end
 
-  # create_tag(current_tag_name)
+  create_tag(current_tag_name)
   Rake::Task[:release].invoke
 end
 

data/lib/restful_resource/http_client.rb

@@ -1,3 +1,6 @@
+# Use the Faraday-Typhoeus adapter provided by Typhoeus, not Faraday
+require "typhoeus/adapters/faraday"
+
 module RestfulResource
   class HttpClient
     class HttpError < StandardError
@@ -86,17 +89,15 @@ module RestfulResource
         b.response :encoding
         b.use :gzip
 
-        b.adapter :excon,
-                  nonblock: true, # Always use non-blocking IO (for safe timeouts)
-                  persistent: true, # Re-use TCP connections
-                  connect_timeout: 2, # seconds
-                  read_timeout: 10, # seconds
-                  write_timeout: 2 # seconds
+        b.adapter :typhoeus
       end
     end
 
     def http_request(request)
       response = @connection.send(request.method) do |req|
+        req.options.open_timeout = 2 # seconds
+        req.options.timeout = 10 # seconds
+
         req.body = request.body unless request.body.nil?
         req.url request.url
 

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/restful_resource.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "link_header"
   spec.add_dependency "activesupport"
   spec.add_dependency "rack"
-  spec.add_dependency "excon"
+  spec.add_dependency "typhoeus"
 end

data/spec/restful_resource/http_client_configuration_spec.rb

@@ -20,8 +20,8 @@ describe RestfulResource::HttpClient do
     let(:middleware) { connection.builder.handlers }
 
     describe 'Builder configuration' do
-      it 'uses the excon adapter' do
-        expect(middleware).to include Faraday::Adapter::Excon
+      it 'uses the typhoeus adapter' do
+        expect(middleware).to include Faraday::Adapter::Typhoeus
       end
 
       it 'url_encodes requests' do
@@ -65,29 +65,5 @@ describe RestfulResource::HttpClient do
         end
       end
     end
-
-    describe 'Excon Adapter configuration' do
-      let(:config) { find_middleware_args connection, 'Faraday::Adapter::Excon' }
-    
-      it 'uses nonblock' do
-        expect(config[:nonblock]).to eq true
-      end
-
-      it 'uses a persistent connection' do
-        expect(config[:persistent]).to eq true
-      end
-
-      it 'has a connect_timeout of 2' do
-        expect(config[:connect_timeout]).to eq 2
-      end
-
-      it 'has a read_timeout of 10' do
-        expect(config[:read_timeout]).to eq 10
-      end
-
-      it 'has a write_timeout of 2' do
-        expect(config[:write_timeout]).to eq 2
-      end
-    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="