nestful 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed5261af3eae8645b3f911b9bd25e4609d775ae2
-  data.tar.gz: 9e720f009d510b03cb894fd7bd5e40c066b5e733
+  metadata.gz: eb9257a0d53809d47c726404fe0727c055358ecc
+  data.tar.gz: a247a02e2d1ee21992a5da0940f6d46d140ebaa5
 SHA512:
-  metadata.gz: afdbc5f917195797ef29fd577611563cfe83a497de1b60ba2567d8e823811c34e1c5e2bd24b797f048095c0cdbdc44814091ff3807718a0e9f3a5367cac0d0eb
-  data.tar.gz: 8f16da8c697b2180ac672aa52b10638ec441b61cef501c296fc582c0a53734c30279f27e01a4fc570db4c757392760909739e0136c61ff840603086805c17fec
+  metadata.gz: a816e887e670eecea85e9b5fca9200d6bd52f11a7a3cdc42377b3446201d2de83770853fee0593a182a608ff1581e18813069150ced8d680f692649c6800792a
+  data.tar.gz: bc85420dd3fcccc1492ba8e86093b87736925ef72685fb7dea96487aac3fc314ea59c9ee2a95746c1321010b3821dfdec3f35dae5de4d83adb33489aebbbbc02

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2

data/Gemfile

@@ -7,4 +7,5 @@ group :test do
   gem 'webmock'
   gem 'rake'
   gem 'net-http-spy'
-end
+  gem 'minitest'
+end

data/Rakefile

@@ -5,4 +5,6 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/test*.rb']
   t.verbose = true
-end
+end
+
+task default: :test

data/lib/nestful/connection.rb

@@ -6,7 +6,7 @@ module Nestful
     UriParser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
 
     attr_accessor :timeout, :ssl_options
-    attr_reader :endpoint, :timeout, :proxy, :ssl_options
+    attr_reader :endpoint, :proxy
 
     # The +endpoint+ parameter is required and will set the +endpoint+
     # attribute to the URI for the remote resource service.

data/lib/nestful/formats/json_format.rb

@@ -1,6 +1,6 @@
 begin
   require 'json'
-rescue LoadError => e
+rescue LoadError
   require 'json/pure'
 end
 
@@ -22,4 +22,4 @@ module Nestful
 
     JsonFormat = JSONFormat
   end
-end
+end

data/lib/nestful/helpers.rb

@@ -54,14 +54,6 @@ module Nestful
       end
     end
 
-    def from_param(param)
-      Rack::Utils.parse_nested_query(param)
-      (value || '').split('&').each do |res|
-        key, value = res.split('=')
-        @params[key] = value
-      end
-    end
-
     def from_param(qs, d = nil)
       params = {}
 

data/lib/nestful/request.rb

@@ -1,5 +1,7 @@
 module Nestful
   class Request
+    UriParser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
+
     attr_reader :options, :format, :url
 
     attr_accessor :params, :body, :method, :headers,
@@ -37,11 +39,11 @@ module Nestful
     end
 
     def uri
-      return @uri if @uri
+      return @uri if defined?(@uri) && @uri
 
       url = @url.match(/\Ahttps?:\/\//) ? @url : "http://#{@url}"
 
-      @uri = URI.parse(url)
+      @uri = UriParser.parse(url)
       @uri.path = '/' if @uri.path.empty?
 
       @uri
@@ -103,13 +105,15 @@ module Nestful
         raise RedirectionLoop.new(self, error.response) if attempts > max_attempts
 
         location = error.response['Location'].scrub
-        location = URI.parse(location)
+        location = UriParser.parse(location)
 
         # Path is relative
         unless location.host
           location = URI.join(uri, location)
         end
 
+        location.scheme = uri.scheme unless location.scheme
+
         self.url = location.to_s
         retry
       end

data/lib/nestful/resource.rb

@@ -16,7 +16,7 @@ module Nestful
 
     def self.defaults(value = nil)
       @defaults = value if value
-      return @defaults if @defaults
+      return @defaults if defined?(@defaults) && @defaults
       superclass.respond_to?(:defaults) ? superclass.defaults : {}
     end
 
@@ -183,4 +183,4 @@ module Nestful
       end
     end
   end
-end
+end

data/lib/nestful/version.rb

@@ -1,3 +1,3 @@
 module Nestful
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'.freeze
 end

data/test/nestful/test_endpoint.rb

@@ -1,10 +1,6 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'nestful'
+require 'test_helper'
 
-WebMock.disable_net_connect!
-
-class TestEndpoint < MiniTest::Unit::TestCase
+class TestEndpoint < Minitest::Test
   def test_join
     endpoint = Nestful::Endpoint['http://example.com']['charges'][1]
     assert_equal 'http://example.com/charges/1', endpoint.url
@@ -12,13 +8,13 @@ class TestEndpoint < MiniTest::Unit::TestCase
 
   def test_get
     stub_request(:any, 'http://example.com/charges?limit=10')
-    endpoint = Nestful::Endpoint['http://example.com']['charges'].get(:limit => 10)
+    Nestful::Endpoint['http://example.com']['charges'].get(:limit => 10)
     assert_requested(:get, 'http://example.com/charges?limit=10')
   end
 
   def test_post
     stub_request(:any, 'http://example.com/charges')
-    endpoint = Nestful::Endpoint['http://example.com']['charges'].post
+    Nestful::Endpoint['http://example.com']['charges'].post
     assert_requested(:post, 'http://example.com/charges')
   end
-end
+end

data/test/nestful/test_request.rb

@@ -1,10 +1,6 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'nestful'
+require 'test_helper'
 
-WebMock.disable_net_connect!
-
-class TestRequest < MiniTest::Unit::TestCase
+class TestRequest < Minitest::Test
   def test_get
     stub_request(:any, 'http://example.com/v1/tokens')
     Nestful::Request.new('http://example.com/v1/tokens', :method => :get).execute
@@ -80,4 +76,4 @@ class TestRequest < MiniTest::Unit::TestCase
     Nestful::Request.new('http://example.com/v1/tokens', :auth_type => :bearer, :password => 'password1').execute
     assert_requested(:get, 'http://example.com/v1/tokens', :headers => {'Authorization' => 'Bearer password1'})
   end
-end
+end

data/test/nestful/test_resource.rb

@@ -1,10 +1,6 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'nestful'
+require 'test_helper'
 
-WebMock.disable_net_connect!
-
-class TestResource < MiniTest::Unit::TestCase
+class TestResource < Minitest::Test
   class Charge < Nestful::Resource
     endpoint 'http://example.com'
     path '/v1/charges'
@@ -65,4 +61,4 @@ class TestResource < MiniTest::Unit::TestCase
     charge = Charge.new(:amount => 1)
     assert_equal charge.to_json, '{"amount":1}'
   end
-end
+end

data/test/nestful/test_response.rb

@@ -1,10 +1,6 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'nestful'
+require 'test_helper'
 
-WebMock.disable_net_connect!
-
-class TestResponse < MiniTest::Unit::TestCase
+class TestResponse < Minitest::Test
   def test_headers
     stub_request(:any, 'http://example.com/v1/charges').to_return(:headers => {'X-TEST' => 'BAR'})
     response = Nestful.get('http://example.com/v1/charges')

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler'
+
+require 'minitest/autorun'
+require 'minitest/unit'
+require 'webmock/minitest'
+
+require 'nestful'
+
+WebMock.disable_net_connect!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nestful
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.markdown
@@ -44,6 +45,7 @@ files:
 - test/nestful/test_request.rb
 - test/nestful/test_resource.rb
 - test/nestful/test_response.rb
+- test/test_helper.rb
 homepage: https://github.com/maccman/nestful
 licenses: []
 metadata: {}
@@ -72,3 +74,4 @@ test_files:
 - test/nestful/test_request.rb
 - test/nestful/test_resource.rb
 - test/nestful/test_response.rb
+- test/test_helper.rb