shutl_resource 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 374d4ad60025ab11efb2effad701d583b2849130
-  data.tar.gz: 483917af82f0df4850bde5af995c60639d5d7ab9
+  metadata.gz: 696918244a38ca0fd9a105f824662391cb2dea3b
+  data.tar.gz: a25d0bcfb3c94c3fca569dc527121e56078079b1
 SHA512:
-  metadata.gz: '0592c27d5061d24c3facb589a2c738bfa8de785e88b59c13240caaf225e7fb1d42b1225a0c7a01d17924471b997948ed0b113995436f8057edb6b4168487e305'
-  data.tar.gz: 4630c98cf74187cb2210a0e8731102f02e319617bd97db8bcbd82a8a4841f4b6f1ec6a3134e7542644e6f26c3cedd6f957e06ecce3ef52adc932af511575c684
+  metadata.gz: a31540928199beddcf7b31033b531c04d60c96714bfaba5f186858f06caf5a593d1c0f937dcb1b42305bd530f5ae16e5415c7c2b953ff959bd4b6bb1e8827e80
+  data.tar.gz: 7a127180ddea91f26d56657d2403ef47493af7ed9275a544cf683763406c7a52dde2d73cc1479209c7c22f0a51fcb0c3866f050f388c5b1f382f5df2eeb5325a

data/.gitignore

@@ -1,4 +1,5 @@
 
+*swp
 .rbenv-version
 .ruby-version
 

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.2.6
   - 2.4.0
-  - jruby-9.1.6.0
+  - jruby-9.1.7.0
 jdk:
-  - openjdk7
-  - oraclejdk7
+  - oraclejdk8

data/Gemfile

@@ -1,11 +1,10 @@
 source 'https://rubygems.org'
 
-group :development do
+group :development, :test do
+  gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 2.11.0'
+  gem 'webmock', '~> 1.8.7'
   gem 'license_finder'
-end
-
-group :test do
   gem 'pry'
 end
-# Specify your gem's dependencies in shutl_resource.gemspec
 gemspec

data/Rakefile

@@ -1,10 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = "--color --format doc"
 end
 
 task :test => :spec
-task :default => :spec
+task :default => :spec

data/lib/shutl/resource/rest_class_methods.rb

@@ -1,4 +1,5 @@
 require 'open-uri'
+
 module Shutl::Resource
   module RestClassMethods
 
@@ -20,7 +21,10 @@ module Shutl::Resource
         end
 
         faraday.response :json
-        faraday.adapter :net_http_pooled
+        faraday.adapter :httpclient do |client| # yields HTTPClient
+          client.keep_alive_timeout = 600
+          client.ssl_config.timeout = 600
+        end
       end
     end
 

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/lib/shutl_resource.rb

@@ -3,7 +3,6 @@ end
 
 require 'faraday'
 require 'faraday_middleware'
-require 'faraday_connection_pool'
 
 require 'shutl_auth'
 require 'shutl/resource/version'

data/shutl_resource.gemspec

@@ -26,9 +26,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware'
   gem.add_dependency 'faraday-conductivity'
   gem.add_dependency 'faraday_connection_pool'
-
-  gem.add_development_dependency 'rake', '~> 10.0'
-  gem.add_development_dependency 'rspec', '~> 2.11.0'
-
-  gem.add_development_dependency 'webmock', '~> 1.8.7'
 end

data/spec/request_headers_spec.rb

@@ -6,7 +6,6 @@ describe Shutl::Resource::Rest do
       headers:
         {
           'Accept'                => 'application/json',
-          'Accept-Encoding'       => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
           'Authorization'         => 'some auth',
           'Content-Type'          => 'application/json+consumer',
           'User-Agent'            => "Shutl Resource Gem v#{Shutl::Resource::VERSION}",
@@ -41,16 +40,16 @@ describe Shutl::Resource::Rest do
     let(:expected_headers) {
       {
         'Accept'                => 'application/json',
-        'Accept-Encoding'       => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
         'Authorization'         => 'Bearer some_auth',
         'Content-Type'          => 'application/json',
         'User-Agent'            => "Shutl Resource Gem v#{Shutl::Resource::VERSION}",
         'X-Request_Id'          => 'ABCDE123'
       }
     }
+
     before do
       @request = stub_request(:get, 'http://host/test_singular_resource')
-                 .with(expected_headers)
+                 .with({headers: expected_headers})
                  .to_return(:status  => 200,
                             :body    => '{"test_singular_resource": { "a": "a", "b": 2 }}',
                             :headers => response_headers)
@@ -180,4 +179,4 @@ describe Shutl::Resource::Rest do
       @request.should have_been_requested
     end
   end
-end
+end

data/spec/rest_resource_spec.rb

@@ -341,7 +341,6 @@ describe Shutl::Resource::Rest do
          with(:headers => {
            'Authorization'=>'Bearer TOKEN',
            'Accept'=>'application/json',
-           'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
            'Content-Type'=>'application/json',
            'User-Agent'=>"Shutl Resource Gem v#{Shutl::Resource::VERSION}"}).
          to_return(:status => 200, :body => '{"test_rests": [{ "a": "a", "b": 2 }]}', :headers => {})

data/spec/support/test_resource.rb

@@ -2,4 +2,4 @@ class TestRest
   include Shutl::Resource::Rest
   base_uri 'http://host'
   resource_id :a
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - David Rouchy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shutl_auth
@@ -99,48 +99,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.7
 description: Shutl Rest resource
 email:
 - davidr@shutl.co.uk