sunstone 6.1.0.rc1 → 6.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afae21d218aa760e3a36c2db071a80f25f825fb618f56c9bc9cb25ddb628ee23
-  data.tar.gz: a1b4c27957ba0330a74bab059b5b352c56d74eeafd0d9e910845badae194a0e5
+  metadata.gz: 70fcfa3e9252509421cfb640f2f0ea0294c37018f6b8a9feeaf4fcb2f9d75161
+  data.tar.gz: 9dd9af70b45187707817193f5632302005e8e0ede8a8c146db6fae567c706e84
 SHA512:
-  metadata.gz: 2bf28e210e209846f11c287b7153669721211b86e1e27de9388b52bbdeb37abe1ea53c8370abfc11ab50132275804796912eeeb67c0c4e83cd840f54be44634b
-  data.tar.gz: b0eb0399c0a7ff542d06b9b3b83a1dbc699d4de11b75e24813186fd6f6c6de375713903ecc4886efb6b78395bc44f77841238d365ec389ada64bfeca95449626
+  metadata.gz: ac6d53c45d04cf82a891aa9bf736f69492e76847a3748aeecdda6830da80ae04f43f4e9fd981467627d301726ac2459f4297200a57ce917f48b35dc2e8734101
+  data.tar.gz: d7db042c9710800367267f124d7abc33814ce638409200a080e7c1e27e99e78b41cd84a22dbc160ec2d7c7f739df77cca0bec77b17d92b672c1ae9f69db5dc1b

data/.travis.yml

@@ -9,6 +9,7 @@ cache:
 
 rvm:
   - 2.7
+  - 3.0
 
 env:
   matrix:
@@ -29,7 +30,6 @@ addons:
     - postgresql-13
     - postgresql-client-13
 
-
 before_install:
   - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/13/main/postgresql.conf
   - sudo cp /etc/postgresql/{9.3,13}/main/pg_hba.conf

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -17,7 +17,7 @@ require 'active_record/connection_adapters/sunstone/type/json'
 module ActiveRecord
   module ConnectionHandling # :nodoc:
 
-    VALID_SUNSTONE_CONN_PARAMS = [:endpoint, :host, :port, :api_key, :use_ssl, :user_agent, :ca_cert]
+    VALID_SUNSTONE_CONN_PARAMS = [:url, :host, :port, :api_key, :use_ssl, :user_agent, :ca_cert]
 
     # Establishes a connection to the database that's used by all Active Record
     # objects
@@ -25,8 +25,8 @@ module ActiveRecord
       conn_params = config.symbolize_keys
       conn_params.delete_if { |_, v| v.nil? }
 
-      if conn_params[:endpoint]
-        uri = URI.parse(conn_params.delete(:endpoint))
+      if conn_params[:url]
+        uri = URI.parse(conn_params.delete(:url))
         conn_params[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
         conn_params[:host]    ||= uri.host
         conn_params[:port]    ||= uri.port

data/lib/sunstone.rb

@@ -37,4 +37,18 @@ require File.expand_path(File.join(__FILE__, '../../ext/arel/select_manager'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/eager_load'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/attributes/empty_relation'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/select_statement'))
-require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))
+
+if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR == 1
+  # Patch to allow Rails 6.1 pass url to adapter, all other versions work
+  class ActiveRecord::DatabaseConfigurations::UrlConfig
+    private
+    def build_url_hash
+      if url.nil? || %w(jdbc: http: https:).any? { |protocol| url.start_with?(protocol) }
+        { url: url }
+      else
+        ConnectionUrlResolver.new(url).to_hash
+      end
+    end
+  end
+end

data/lib/sunstone/connection.rb

@@ -10,7 +10,7 @@ module Sunstone
     #
     # Options:
     #
-    # * <tt>:endpoint</tt> - An optional endpoint used to set the protocol, host, port,
+    # * <tt>:url</tt> - An optional url used to set the protocol, host, port,
     #   and api_key
     # * <tt>:host</tt> - The default is to connect to 127.0.0.1.
     # * <tt>:port</tt> - Defaults to 80.
@@ -19,8 +19,8 @@ module Sunstone
     # * <tt>:user_agent</tt> - An optional string. Will be joined with other
     #                          User-Agent info.
     def initialize(config)
-      if config[:endpoint]
-        uri = URI.parse(config.delete(:endpoint))
+      if config[:url]
+        uri = URI.parse(config.delete(:url))
         config[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
         config[:host]    ||= uri.host
         config[:port]    ||= uri.port

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '6.1.0.rc1'
+  VERSION = '6.1.0.1'
 end

data/sunstone.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'activesupport', '>= 6.0.0'
+  s.add_development_dependency 'activesupport', '>= 6.1.0'
   
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
   s.add_runtime_dependency 'activerecord', '>= 6.1.0'
-  s.add_runtime_dependency 'arel-extensions', '>= 6.0.0.5'
+  s.add_runtime_dependency 'arel-extensions', '>= 6.1.0'
 end

data/test/schema_mock.rb

@@ -86,7 +86,7 @@ class ActiveSupport::TestCase
 
   set_callback(:setup, :before) do
     if !instance_variable_defined?(:@suite_setup_run) && self.class.class_variable_defined?(:@@schema)
-      ActiveRecord::Base.establish_connection(adapter: 'sunstone', endpoint: 'http://example.com')
+      ActiveRecord::Base.establish_connection(adapter: 'sunstone', url: 'http://example.com')
 
       req_stub = stub_request(:get, /^http:\/\/example.com/).with do |req|
         case req.uri.path

data/test/sunstone/connection/configuration_test.rb

@@ -2,40 +2,40 @@ require 'test_helper'
 
 class Sunstone::Connection::ConfigurationTest < ActiveSupport::TestCase
 
-  test "setting the endpoint sets the api_key" do
-    connection = Sunstone::Connection.new(endpoint: 'http://my_api_key@localhost')
+  test "setting the url sets the api_key" do
+    connection = Sunstone::Connection.new(url: 'http://my_api_key@localhost')
     assert_equal('my_api_key', connection.api_key)
   end
 
-  test "setting the endpoint sets the host" do
-    connection = Sunstone::Connection.new(endpoint: 'https://example.com')
+  test "setting the url sets the host" do
+    connection = Sunstone::Connection.new(url: 'https://example.com')
     assert_equal('example.com', connection.host)
   end
 
-  test "setting the endpoint sets the port" do
-    connection = Sunstone::Connection.new(endpoint: 'http://localhost')
+  test "setting the url sets the port" do
+    connection = Sunstone::Connection.new(url: 'http://localhost')
     assert_equal(80, connection.port)
 
-    connection = Sunstone::Connection.new(endpoint: 'https://localhost')
+    connection = Sunstone::Connection.new(url: 'https://localhost')
     assert_equal(443, connection.port)
     
-    connection = Sunstone::Connection.new(endpoint: 'https://localhost:4321')
+    connection = Sunstone::Connection.new(url: 'https://localhost:4321')
     assert_equal(4321, connection.port)
   end
 
-  test "setting the endpoint sets the use_ssl option" do
-    connection = Sunstone::Connection.new(endpoint: 'http://localhost')
+  test "setting the url sets the use_ssl option" do
+    connection = Sunstone::Connection.new(url: 'http://localhost')
     assert_equal(false, connection.use_ssl)
     
-    connection = Sunstone::Connection.new(endpoint: 'https://localhost')
+    connection = Sunstone::Connection.new(url: 'https://localhost')
     assert_equal(true, connection.use_ssl)
   end
   
   test "setting the user_agent appends it to the User-Agent" do
-    connection = Sunstone::Connection.new(endpoint: 'http://localhost')
+    connection = Sunstone::Connection.new(url: 'http://localhost')
     assert_equal("Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", connection.user_agent)
     
-    connection = Sunstone::Connection.new(endpoint: 'http://localhost', user_agent: "MyGem/3.14")
+    connection = Sunstone::Connection.new(url: 'http://localhost', user_agent: "MyGem/3.14")
     assert_equal("MyGem/3.14 Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", connection.user_agent)
   end
   

data/test/sunstone/connection/cookie_store_test.rb

@@ -4,7 +4,7 @@ class Sunstone::Connection::CookieStoreTest < ActiveSupport::TestCase
 
   test '#send_request(#<Net::HTTPRequest) adds cookies to the cookie store if present' do
     store = CookieStore::HashStore.new
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get', :headers => {'Set-Cookie' => 'foo=bar; Max-Age=3600'})
 
     Sunstone::Connection.with_cookie_store(store) { connection.get('/test') }
@@ -17,7 +17,7 @@ class Sunstone::Connection::CookieStoreTest < ActiveSupport::TestCase
   
   test '#send_request(#<Net::HTTPRequest) sends cookie header if cookie store is present' do
     store = CookieStore::HashStore.new
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(
       headers: {
         'Set-Cookie' => 'foo=bar; Path="/" Max-Age=3600'

data/test/sunstone/connection/request_helper_test.rb

@@ -5,28 +5,28 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.get ==============================================================
 
   test '#get(path)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(:body => "get")
 
     assert_equal('get', connection.get('/test').body)
   end
 
   test '#get(path, params) with params as string' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
 
     assert_equal 'get', connection.get('/test', 'key=value').body
   end
 
   test '#get(path, params) with params as hash' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
 
     assert_equal 'get', connection.get('/test', {:key => 'value'}).body
   end
 
   test '#get(path, &block)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
 
     connection.get('/test') do |response|
@@ -37,21 +37,21 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.post =============================================================
 
   test '#post(path)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:post, "http://testhost.com/test").to_return(:body => "post")
 
     assert_equal('post', connection.post('/test').body)
   end
 
   test '#post(path, body)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:post, "http://testhost.com/test").with(:body => 'body').to_return(:body => "post")
 
     assert_equal('post', connection.post('/test', 'body').body)
   end
 
   test '#post(path, &block)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:post, "http://testhost.com/test").to_return(:body => 'post')
 
     connection.post('/test') do |response|
@@ -62,21 +62,21 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.put ==============================================================
 
   test '#put(path)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:put, "http://testhost.com/test").to_return(:body => "put")
 
     assert_equal('put', connection.put('/test').body)
   end
 
   test '#put(path, body)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:put, "http://testhost.com/test").with(:body => 'body').to_return(:body => "put")
 
     assert_equal('put', connection.put('/test', 'body').body)
   end
 
   test '#put(path, &block)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:put, "http://testhost.com/test").to_return(:body => 'put')
 
     connection.put('/test') do |response|
@@ -87,14 +87,14 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.delete ===========================================================
 
   test '#delete' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:delete, "http://testhost.com/test").to_return(:body => "delete")
 
     assert_equal('delete', connection.delete('/test').body)
   end
 
   test '#delete(path, &block)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:delete, "http://testhost.com/test").to_return(:body => 'delete')
 
     connection.delete('/test') do |response|

data/test/sunstone/connection/send_request_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
 
   test '#send_request(#<Net::HTTPRequest>) includes the api-key header when present' do
-    connection = Sunstone::Connection.new(endpoint: "http://my_api_key@example.com")
+    connection = Sunstone::Connection.new(url: "http://my_api_key@example.com")
     
     test_stub = stub_request(:get, "http://example.com/verify").with { |req|
       req.headers['Api-Key'] == 'my_api_key'
@@ -13,7 +13,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   end
   
   test '#send_request(#<Net::HTTPRequest>) includes the user_agent' do
-    connection = Sunstone::Connection.new(endpoint: "http://example.com")
+    connection = Sunstone::Connection.new(url: "http://example.com")
     
     test_stub = stub_request(:get, "http://example.com/verify").with { |req|
       req.headers['User-Agent'] =~ /Sunstone\/\S+ Ruby\/\S+ \S+/
@@ -22,7 +22,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     assert_requested(test_stub)
     
     # Custom Agent
-    connection = Sunstone::Connection.new(endpoint: "http://example.com", user_agent: "MyClient/2")
+    connection = Sunstone::Connection.new(url: "http://example.com", user_agent: "MyClient/2")
     
     test_stub = stub_request(:get, "http://example.com/verify").with { |req|
       req.headers['User-Agent'] =~ /MyClient\/2 Sunstone\/\S+ Ruby\/\S+ \S+/
@@ -34,7 +34,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   test '#send_request(#<Net::HTTPRequest>)' do
     stub_request(:get, "http://testhost.com/test").to_return(body: 'get')
 
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     assert_equal('get', connection.send_request(Net::HTTP::Get.new('/test')).body)
   end
 
@@ -45,7 +45,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
       body: "post"
     )
 
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), '{"key":"value"}').body)
   end
 
@@ -58,14 +58,14 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     wr.write('{"key":"value"}')
     wr.close
 
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), rd).body)
   end
 
   test '#send_request(#<Net::HTTPRequest>, body) with Ruby Object body' do
     stub_request(:post, "http://testhost.com/test").with(body: '{"key":"value"}').to_return(body: "post")
 
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), {:key => 'value'}).body)
   end
 
@@ -80,7 +80,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     stub_request(:get, "http://testhost.com/503").to_return(status: 503)
     stub_request(:get, "http://testhost.com/550").to_return(status: 550)
 
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     assert_raises(Sunstone::Exception::BadRequest)   { connection.send_request(Net::HTTP::Get.new('/400')) }
     assert_raises(Sunstone::Exception::Unauthorized) { connection.send_request(Net::HTTP::Get.new('/401')) }
     assert_raises(Sunstone::Exception::Forbidden) { connection.send_request(Net::HTTP::Get.new('/403')) }
@@ -95,7 +95,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   test '#send_request(#<Net::HTTPRequest>, &block) returns value returned from &block' do
     stub_request(:get, "http://testhost.com/test").to_return(body: 'get')
 
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     value = connection.send_request(Net::HTTP::Get.new('/test')) do |response|
       3215
     end
@@ -104,7 +104,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   end
 
   test '#send_request(#<Net::HTTPRequest>, &block)' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(body: 'get')
 
     connection.send_request(Net::HTTP::Get.new('/test')) do |response|
@@ -122,7 +122,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   end
 
   test '#send_request(#<Net::HTTPRequest>, &block) with block reading chunks' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     
     rd, wr = IO.pipe
     rd = Net::BufferedIO.new(rd)
@@ -149,7 +149,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   
   # TODO: support multple depreaction-notice headers
   test 'deprecation warning printed when deprecation header returned' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     
     stub_request(:get, "http://testhost.com/test").to_return(
       body: 'get',

data/test/sunstone/connection_test.rb

@@ -5,7 +5,7 @@ class Sunstone::ConnectionTest < ActiveSupport::TestCase
   # #ping =====================================================================
 
   test '#ping' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/ping").to_return(:body => 'pong')
 
     assert_equal( 'pong', connection.ping )
@@ -14,7 +14,7 @@ class Sunstone::ConnectionTest < ActiveSupport::TestCase
   # #server_config ===========================================================
 
   test '#config' do
-    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/config").to_return(:body => '{"server": "configs"}')
 
     assert_equal( {:server => "configs"}, connection.server_config )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 6.1.0.rc1
+  version: 6.1.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.5
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.5
+        version: 6.1.0
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -336,11 +336,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs