sequelizer 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d676f724540c01e7cbd2bc6b2a354d78a2e9d15
-  data.tar.gz: e6872a70bdf5d268687f667273edced41abd13aa
+SHA256:
+  metadata.gz: 4cfd3663b92545f1bffb3c811297f81f26a2a1c237bc621c31d22d905be4bc0b
+  data.tar.gz: 1865666d4f264967f909820d9c7572dfff2b74bc3c80219c589c8197f18e5e59
 SHA512:
-  metadata.gz: 8fb25153b51b05926e5da76fd977f88b8b3077b9dccedb6282edd40486bea4bc1d1e6be70fd8a576f2102a80c406663b40ef396a6ad32897730fd510cd6bddcd
-  data.tar.gz: ace9f653827f44fac941f1bbd6b2e6e854d3128bcf8d3a8f14343304b5f7350f2e6efe1c7ee11271cd3aa6f8f659bd6dd7b19145223372a3eecac56ac33aa4e7
+  metadata.gz: c02b029eb0bf30bfb6498d75fbde32aa7a1576074c74dd55993a91a3f4d6458c53e0e1ed45c16d3177767ddde7b44ce706cbafce0269681f025acbe80f46ea35
+  data.tar.gz: f123e5d48c8178d9b5609f6f44d9744fb00f31085b11364aa839b902784f9de60beedabc7b90a7c6e4ae6b84a62d9d9a1b338190a0597fec40107518632b94f8

data/.gitignore

@@ -15,3 +15,21 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+# Created by https://www.gitignore.io/api/vim
+
+### Vim ###
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+# End of https://www.gitignore.io/api/vim

data/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+rvm:
+- 2.4
+sudo: false
+env:
+  secure: xFZ00J+axPQADZ2Dqc61Ljo56vT8/uwVzOFw9zxKQs3ThMfI8+OvlI7LV8sf0XPC5Cp+BObYCxzsqIOY8M8yo+NfknlNmlrQaPqi3lf+3tKvEFeFiQZ/jvbGReIdxRdPViVls1W3zEDdRwe9zUAiz7C+xBYCRfZRoGjfm7gx/4c=
+before_install:
+- gem install bundler
+- bundle
+script: bundle exec rake test
+jobs:
+  include:
+  - stage: deploy
+    before_install: gem install tping
+    install: true
+    script:
+      - tping --token $TRAVIS_PRO_TOKEN --user outcomesinsights --repo t_shank --pro --branch $TRAVIS_BRANCH
+      - tping --token $TRAVIS_PRO_TOKEN --user outcomesinsights --repo jigsaw-diagram-editor --pro --branch $TRAVIS_BRANCH
+notifications:
+  slack:
+    secure: b+ao+3BuBtM5nj/m1gP5AbrrTIdQiV/HkT1deXvY4gg5xZQDheDeLmOI7wSFP1o67BrwrAY7rpcwIP7S/99fudrU3rKI3+GLn8KoefdAv78Z4tsMs9rodJJ3Z3ZmnEdMK2i2+hCLJ1pzZ9Ae3e+GDHsBPkTz4+TNE1lrOPxDIUo=

data/README.md

@@ -1,4 +1,4 @@
-# Sequelizer
+# Sequelizer [![Build Status](https://travis-ci.org/outcomesinsights/sequelizer.svg?branch=master)](https://travis-ci.org/outcomesinsights/sequelizer)
 
 I was tired of writing the code to bootstrap a connection to my databases.
 

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs = ["lib"]
+  t.warning = true
+  t.test_files = FileList['test/**/test_*.rb']
+end
+
+task default: :test

data/lib/sequel/extensions/db_opts.rb

@@ -0,0 +1,41 @@
+module Sequel
+  module DbOpts
+    class DbOptions
+      attr :db
+      def initialize(db)
+        db.extension :settable
+        @db = db
+      end
+
+      def to_hash
+        @_to_hash ||= extract_db_opts
+      end
+
+      def extract_db_opts
+        opt_regexp = /^#{db.database_type}_db_opt_/i
+
+        Hash[db.opts.select { |k, _| k.to_s.match(opt_regexp) }.map { |k, v| [k.to_s.gsub(opt_regexp, '').to_sym, prep_value(k, v)] }]
+      end
+
+      def apply(c)
+        sql_statements.each do |stmt|
+          db.send(:log_connection_execute, c, stmt)
+        end
+      end
+
+      def prep_value(k, v)
+        v =~ /\W/ ? db.literal("#{v}") : v
+      end
+
+      def sql_statements
+        db.send(:set_sql, to_hash)
+      end
+    end
+
+    def db_opts
+      @db_opts ||= DbOptions.new(self)
+    end
+  end
+
+  Database.register_extension(:db_opts, DbOpts)
+end

data/lib/sequel/extensions/settable.rb

@@ -0,0 +1,17 @@
+module Sequel
+  module Settable
+    def set(opts = {})
+      set_sql(opts).each do |sql|
+        run(sql)
+      end
+    end
+
+    private
+
+    def set_sql(opts)
+      opts.map { |k, v| "SET #{k}=#{v}" }
+    end
+  end
+
+  Database.register_extension(:settable, Settable)
+end

data/lib/sequelizer/cli.rb

@@ -50,7 +50,9 @@ module Sequelizer
 
     desc 'config', 'prints out the connection parameters'
     def config
-      pp Options.new.to_hash
+      opts = Options.new
+      pp opts.to_hash
+      pp opts.extensions
     end
 
     private

data/lib/sequelizer/connection_maker.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'cgi'
 require_relative 'options'
 
 module Sequelizer
@@ -23,11 +24,74 @@ module Sequelizer
     # Returns a Sequel connection to the database
     def connection
       opts = options.to_hash
-      if url = (opts.delete(:uri) || opts.delete(:url))
+      extensions = options.extensions
+
+      conn = if url = (opts.delete(:uri) || opts.delete(:url))
         Sequel.connect(url, opts)
       else
-        Sequel.connect(options.to_hash)
+        # Kerberos related options
+        realm = opts[:realm]
+        host_fqdn = opts[:host_fqdn] || opts[:host]
+        principal = opts[:principal]
+
+        adapter = opts[:adapter]
+        if adapter =~ /\Ajdbc_/
+          user = opts[:user]
+          password = opts[:password]
+        end
+
+        case opts[:adapter] && opts[:adapter].to_sym
+        when :jdbc_hive2
+          opts[:adapter]  = :jdbc
+          auth = if realm
+            ";principal=#{e principal}/#{e host_fqdn}@#{e realm}"
+          elsif user
+            ";user=#{e user};password=#{e password}"
+          else
+            ';auth=noSasl'
+          end
+          opts[:uri] = "jdbc:hive2://#{e opts[:host]}:#{opts.fetch(:port, 21050).to_i}/#{e(opts[:database] || 'default')}#{auth}"
+        when :jdbc_impala
+          opts[:adapter]  = :jdbc
+          auth = if realm
+            ";AuthMech=1;KrbServiceName=#{e principal};KrbAuthType=2;KrbHostFQDN=#{e host_fqdn};KrbRealm=#{e realm}"
+          elsif user
+            if password
+              ";AuthMech=3;UID=#{e user};PWD=#{e password}"
+            else
+              ";AuthMech=2;UID=#{e user}"
+            end
+          end
+          opts[:uri] = "jdbc:impala://#{e opts[:host]}:#{opts.fetch(:port, 21050).to_i}/#{e(opts[:database] || 'default')}#{auth}"
+        when :jdbc_postgres
+          opts[:adapter]  = :jdbc
+          auth = "?user=#{user}#{"&password=#{password}" if password}" if user
+          opts[:uri] = "jdbc:postgresql://#{e opts[:host]}:#{opts.fetch(:port, 5432).to_i}/#{e(opts[:database])}#{auth}"
+        when :impala
+          opts[:database] ||= 'default'
+          opts[:port] ||= 21000
+          if principal
+            # realm doesn't seem to be used?
+            opts[:transport] = :sasl
+            opts[:sasl_params] = {
+              mechanism: "GSSAPI",
+              remote_host: host_fqdn,
+              remote_principal: principal
+            }
+          end
+        end
+
+        Sequel.connect(opts)
       end
+      conn.extension(*extensions)
+      conn
+    end
+
+    private
+
+    def e(v)
+      CGI.escape(v.to_s)
     end
   end
 end
+

data/lib/sequelizer/env_config.rb

@@ -9,12 +9,20 @@ module Sequelizer
     # as an option for the database
     def options
       Dotenv.load
-      env_config = ENV.keys.select { |key| key =~ /^SEQUELIZER_/ }.inject({}) do |config, key|
+
+      seq_config = ENV.keys.select { |key| key =~ /^SEQUELIZER_/ }.inject({}) do |config, key|
         new_key = key.gsub(/^SEQUELIZER_/, '').downcase
         config[new_key] = ENV[key]
         config
       end
-      env_config.empty? ? {} : env_config
+
+      db_config = ENV.keys.select { |key| key =~ /_DB_OPT_/ }.inject({}) do |config, key|
+        new_key = key.downcase
+        config[new_key] = ENV[key]
+        config
+      end
+
+      db_config.merge(seq_config)
     end
   end
 end

data/lib/sequelizer/monkey_patches/database_in_after_connect.rb

@@ -0,0 +1,26 @@
+module Sequel
+  class ConnectionPool
+    # Return a new connection by calling the connection proc with the given server name,
+    # and checking for connection errors.
+    def make_new(server)
+      begin
+        conn = @db.connect(server)
+        if ac = @after_connect
+          case ac.arity
+          when 3
+            ac.call(conn, server, @db)
+          when 2
+            ac.call(conn, server)
+          else
+            ac.call(conn)
+          end
+        end
+      rescue Exception=>exception
+        raise Sequel.convert_exception_class(exception, Sequel::DatabaseConnectionError)
+      end
+      raise(Sequel::DatabaseConnectionError, "Connection parameters not valid") unless conn
+      conn
+    end
+  end
+end
+

data/lib/sequelizer/options.rb

@@ -1,11 +1,13 @@
-require 'sequelizer/yaml_config'
-require 'sequelizer/env_config'
-require 'sequelizer/options_hash'
+require_relative 'yaml_config'
+require_relative 'env_config'
+require_relative 'options_hash'
 
 module Sequelizer
   class Options
+    attr :extensions
     def initialize(options = nil)
-      @options = fix_options(options)
+      opts = fix_options(options)
+      @options, @extensions = filter_extensions(opts)
     end
 
     def to_hash
@@ -20,6 +22,16 @@ module Sequelizer
 
     private
 
+    def make_ac(opts)
+      Proc.new do |conn, server, db|
+        if ac = opts[:after_connect]
+          ac.arity == 2 ? ac.call(conn, server) : ac.call(conn)
+        end
+        db.extension :db_opts
+        db.db_opts.apply(conn)
+      end
+    end
+
     # If passed a hash, scans hash for certain options and sets up hash
     # to be fed to Sequel.connect
     #
@@ -27,7 +39,8 @@ module Sequelizer
     # the string is returned without modification
     def fix_options(passed_options)
       return passed_options unless passed_options.nil? || passed_options.is_a?(Hash)
-      sequelizer_options = db_config.merge(OptionsHash.new(passed_options || {}).to_hash)
+      opts = OptionsHash.new(passed_options || {}).to_hash
+      sequelizer_options = db_config(opts).merge(opts)
 
       if sequelizer_options[:adapter] =~ /^postgres/
         sequelizer_options[:adapter] = 'postgres'
@@ -46,18 +59,19 @@ module Sequelizer
         sequelizer_options.merge!(timeout: sequelizer_options[:timeout].to_i)
       end
 
-      sequelizer_options
+      sequelizer_options.merge(after_connect: make_ac(sequelizer_options))
     end
 
     # Grabs the database options from
     #  - ~/.config/sequelizer.yml if it exists
     #  - config/database.yml if it exists
     #  - environment variables (also reads from .env)
-    def db_config
+    def db_config(opts)
       @db_config ||= begin
-        opts = OptionsHash.new(YamlConfig.user_config.options)
-        opts.merge!(YamlConfig.local_config.options)
-        opts.merge!(EnvConfig.new.options)
+        opts = OptionsHash.new(opts)
+        opts.merge!(YamlConfig.user_config.options) unless opts[:ignore_yaml]
+        opts.merge!(YamlConfig.local_config.options) unless opts[:ignore_yaml]
+        opts.merge!(EnvConfig.new.options) unless opts[:ignore_env]
         opts
       end
     end
@@ -77,5 +91,15 @@ module Sequelizer
         conn.execute("SET search_path TO #{search_path}")
       end
     end
+
+    def filter_extensions(options)
+      extension_regexp = /^extension_/
+      extension_keys = options.keys.select { |k| k.to_s =~ extension_regexp }
+      extensions = extension_keys.map do |key|
+        options.delete(key)
+        key.to_s.gsub(extension_regexp, '').to_sym
+      end
+      [options, extensions]
+    end
   end
 end

data/lib/sequelizer/version.rb

@@ -1,4 +1,4 @@
 module Sequelizer
   # Version for the gem
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

data/lib/sequelizer/yaml_config.rb

@@ -16,7 +16,8 @@ module Sequelizer
       end
 
       def user_config_path
-        Pathname.new("~") + ".config" + "sequelizer" + "database.yml"
+        return nil unless ENV['HOME']
+        Pathname.new(ENV['HOME']) + ".config" + "sequelizer" + "database.yml"
       end
     end
 
@@ -48,7 +49,7 @@ module Sequelizer
 
     # The config as read from config/database.yml
     def config
-      @config ||= Psych.load(ERB.new(File.read(config_file_path)).result).tap { |c| p c }
+      @config ||= Psych.load(ERB.new(File.read(config_file_path)).result)
     end
   end
 end

data/lib/sequelizer.rb

@@ -1,16 +1,23 @@
-require 'sequelizer/version'
-require 'sequelizer/connection_maker'
+require_relative 'sequelizer/version'
+require_relative 'sequelizer/connection_maker'
+require_relative 'sequelizer/monkey_patches/database_in_after_connect'
+require_relative 'sequel/extensions/db_opts'
+require_relative 'sequel/extensions/settable'
 
 # Include this module in any class where you'd like to quickly establish
 # a Sequel connection to a database.
 module Sequelizer
+  def self.options
+    Options.new.to_hash
+  end
+
   # Instantiates and memoizes a database connection.  The +db+ method instantiates
   # the connection on the first call and then memoizes itself so only a single
   # connection is used on repeated calls
   #
   # options :: an optional set of database connection options.
   #            If no options are provided, options are read from
-  #            config/database.yml or from .env or from environment variables.
+  #            config/sequelizer.yml or from .env or from environment variables.
   def db(options = {})
     @_sequelizer_db ||= new_db(options)
   end
@@ -19,7 +26,7 @@ module Sequelizer
   #
   # options :: an optional set of database connection options.
   #            If no options are provided, options are read from
-  #            config/database.yml or from .env or from environment variables.
+  #            config/sequelizer.yml or from .env or from environment variables.
   def new_db(options = {})
     cached = find_cached(options)
     return cached if cached && !options[:force_new]

data/sequelizer.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'guard', '~> 2.0'
   spec.add_development_dependency 'guard-minitest', '~> 2.3'
   spec.add_development_dependency 'minitest', '~> 5.3'
-  spec.add_dependency 'sequel', '~> 4.12'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_dependency 'sequel', '~> 5.0'
   spec.add_dependency 'dotenv', '~> 2.1'
-  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'thor', '~> 1.0'
   spec.add_dependency 'hashie', '~> 3.2'
 end

data/test/lib/sequel/extensions/test_db_opts.rb

@@ -0,0 +1,40 @@
+require_relative '../../../test_helper'
+require 'sequel'
+require 'sequel/extensions/db_opts'
+
+class TestDbOpts < Minitest::Test
+  def with_fake_database_type_and_options(db_type, opts = {})
+    db = Sequel.mock
+    db.define_singleton_method(:database_type){db_type}
+    db.define_singleton_method(:opts){opts}
+    db.extension :db_opts
+    yield db
+  end
+
+  def sql_for(db_type, options)
+    with_fake_database_type_and_options(db_type, options) do |db|
+      db.synchronize do |conn|
+        db.db_opts.apply(conn)
+        return db.sqls
+      end
+    end
+  end
+
+  def test_should_detect_options_for_appropriate_db
+    assert_equal(sql_for(:postgres, postgres_db_opt_flim: :flam), ["SET flim=flam"])
+  end
+
+  def test_should_ignore_options_for_inappropriate_db
+    assert_equal(sql_for(:postgres, postgres_db_opt_flim: :flam, other_db_opt_foo: :bar), ["SET flim=flam"])
+  end
+
+  def test_should_ignore_non_db_opts
+    assert_equal(sql_for(:postgres, postgres_flim: :flam), [])
+  end
+
+  def test_should_properly_quote_awkward_values
+    assert_equal(sql_for(:postgres, postgres_db_opt_str: "hello there", postgres_db_opt_hyphen: "i-like-hyphens-though-they-are-dumb"),
+      ["SET str='hello there'", "SET hyphen='i-like-hyphens-though-they-are-dumb'"])
+  end
+end
+

data/test/lib/sequelizer/test_connection_maker.rb

@@ -0,0 +1,119 @@
+require_relative '../../test_helper'
+require 'sequelizer'
+
+class TestConnectionMaker < Minitest::Test
+  def setup
+    @options = { 'adapter' => 'mock', "host" => "postgres" }
+  end
+
+  def test_accepts_options_as_params
+    Sequelizer::YamlConfig.stub :user_config_path, Pathname.new('/completely/made/up/path/that/does/not/exist') do
+      assert_equal :postgres, Sequelizer::ConnectionMaker.new(@options).connection.database_type
+    end
+  end
+
+  def with_ignored_yaml_config(opts = {})
+  end
+
+
+  def with_yaml_config(options = {})
+    yaml_config = Sequelizer::YamlConfig.new
+    yaml_config.stub(:options, options) do
+      Sequelizer::YamlConfig.stub :new, yaml_config do
+        yield
+      end
+    end
+  end
+
+  def with_env_config(options = {})
+    env_config = Sequelizer::EnvConfig.new
+    env_config.stub(:options, options) do
+      Sequelizer::EnvConfig.stub :new, env_config do
+        yield env_config
+      end
+    end
+  end
+
+  def test_reads_options_from_yaml_config
+    with_yaml_config(@options) do
+      assert_equal :postgres, Sequelizer::ConnectionMaker.new.connection.database_type
+    end
+  end
+
+  def test_ignores_options_from_yaml_config_when_asked
+    with_yaml_config(@options) do
+      assert_nil Sequelizer::ConnectionMaker.new(ignore_yaml: true).options.to_hash[:adapter]
+    end
+  end
+
+  def test_applies_settings_if_given
+    with_yaml_config(@options.merge(postgres_db_opt_flim: :flam)) do
+      with_env_config do
+        conn = Sequelizer::ConnectionMaker.new.connection
+        conn.test_connection
+        assert_equal(["SET flim=flam"], conn.sqls)
+      end
+    end
+  end
+
+  def test_applies_settings_for_all_connections_if_given
+    with_yaml_config(@options.merge(postgres_db_opt_flim: :flam, max_connections: 2, preconnect: :concurrent)) do
+      with_env_config do
+        conn = Sequelizer::ConnectionMaker.new.connection
+        conn.test_connection
+        assert_equal(["SET flim=flam"] * 2, conn.sqls)
+      end
+    end
+  end
+
+  def test_reads_options_from_env_config_if_no_yaml_config
+    with_yaml_config do
+      with_env_config(@options) do
+        assert_equal :postgres, Sequelizer::ConnectionMaker.new.connection.database_type
+      end
+    end
+  end
+
+  def test_ignores_options_from_env_config_if_no_yaml_config
+    with_yaml_config do
+      with_env_config(@options) do
+        assert_nil Sequelizer::ConnectionMaker.new(ignore_env: true).options.to_hash[:adapter]
+      end
+    end
+  end
+
+  def test_applies_configuration_to_connection
+    opts = @options.merge(postgres_db_opt_search_path: "searchy", impala_db_opt_search_path: "searchy2")
+    with_yaml_config(opts) do
+      conn = Sequelizer::ConnectionMaker.new.connection
+      conn.test_connection
+      assert_equal({ search_path: "searchy" }, conn.db_opts.to_hash)
+      assert_equal(["SET search_path=searchy"], conn.db_opts.sql_statements)
+    end
+  end
+
+  def test_applies_nothing_when_no_configuration
+    Sequelizer::YamlConfig.stub :user_config_path, Pathname.new('/completely/made/up/path/that/does/not/exist') do
+      conn = Sequelizer::ConnectionMaker.new(@options).connection
+      conn.test_connection
+      assert_equal({}, conn.db_opts.to_hash)
+      assert_equal([], conn.db_opts.sql_statements)
+    end
+  end
+
+  def test_applies_quotes_when_necessary
+    Sequelizer::YamlConfig.stub :user_config_path, Pathname.new('/completely/made/up/path/that/does/not/exist') do
+      @options.merge!(postgres_db_opt_search_path: "searchy,path")
+      conn = Sequelizer::ConnectionMaker.new(@options).connection
+      conn.test_connection
+      assert_equal({ search_path: "'searchy,path'" }, conn.db_opts.to_hash)
+      assert_equal(["SET search_path='searchy,path'"], conn.db_opts.sql_statements)
+    end
+  end
+
+  def test_applies_extensions
+    with_yaml_config(@options.merge(extension_error_sql: 1)) do
+      assert Sequelizer::ConnectionMaker.new.connection.send(:instance_variable_get, "@loaded_extensions".to_sym).include?(:error_sql), "Extension wasn't set"
+    end
+  end
+end

data/test/{sequelizer → lib/sequelizer}/test_env_config.rb

@@ -1,5 +1,5 @@
-require_relative '../test_helper'
-require_relative '../../lib/sequelizer/env_config'
+require_relative '../../test_helper'
+require 'sequelizer'
 
 
 class TestEnvConfig < Minitest::Test
@@ -25,4 +25,10 @@ class TestEnvConfig < Minitest::Test
     assert_equal({ 'adapter' => 'sqlite' }, @env_config.options)
     ENV.delete('SEQUELIZER_ADAPTER')
   end
+
+  def test_converts_db_opts_to_options
+    ENV['POSTGRES_DB_OPT_HEY'] = 'there'
+    assert_equal({ 'postgres_db_opt_hey' => 'there' }, @env_config.options)
+    ENV.delete('POSTGRES_DB_OPT_HEY')
+  end
 end

data/test/{sequelizer → lib/sequelizer}/test_gemfile_modifier.rb

@@ -1,5 +1,5 @@
-require_relative '../test_helper'
-require_relative '../../lib/sequelizer/gemfile_modifier'
+require_relative '../../test_helper'
+require 'sequelizer/gemfile_modifier'
 
 class TestGemfileModifier < Minitest::Test
   def setup

data/test/{sequelizer → lib/sequelizer}/test_options.rb

@@ -1,5 +1,5 @@
-require_relative '../test_helper'
-require_relative '../../lib/sequelizer/options'
+require_relative '../../test_helper'
+require 'sequelizer/options'
 
 
 class TestOptions < Minitest::Test
@@ -43,7 +43,8 @@ class TestOptions < Minitest::Test
   def test_returns_a_hash_even_if_given_nil
     Sequelizer::YamlConfig.stub :user_config_path, Pathname.new('/completely/made/up/path/that/does/not/exist') do
       options = Sequelizer::Options.new
-      assert_equal({}, options.to_hash)
+      assert_equal(1, options.to_hash.length)
+      assert_instance_of(Proc, options.to_hash[:after_connect])
     end
   end
 
@@ -51,5 +52,27 @@ class TestOptions < Minitest::Test
     options = Sequelizer::Options.new(search_path: 'passed', adapter: 'postgres')
     assert_equal 'passed', options.search_path
   end
+
+  def test_handles_existing_after_connect
+    db = Sequel.mock(host: :postgres)
+    conny = Minitest::Mock.new
+    conny.expect :db, db
+    conny.expect :db, db
+    conny.expect :db, db
+
+    procky = Proc.new { |conn| conn.db[:table].to_a }
+
+    options = Sequelizer::Options.new(after_connect: procky)
+    options.to_hash[:after_connect].call(conny, :default, db)
+
+    assert_equal(["SELECT * FROM \"table\""], db.sqls)
+  end
+
+  def test_handles_extensions_passed_in
+    options = Sequelizer::Options.new(extension_example_1: 1, extension_example_2: 1, not_an_extension_example: 1)
+    assert_equal 1, options.to_hash[:not_an_extension_example]
+    assert options.extensions.include?(:example_1), "Failed to find example_1 in extensions"
+    assert options.extensions.include?(:example_2), "Failed to find example_2 in extensions"
+  end
 end
 

data/test/{sequelizer → lib/sequelizer}/test_yaml_config.rb

@@ -1,5 +1,5 @@
-require_relative '../test_helper'
-require_relative '../../lib/sequelizer/yaml_config'
+require_relative '../../test_helper'
+require 'sequelizer/yaml_config'
 
 
 class TestYamlConfig < Minitest::Test
@@ -7,6 +7,19 @@ class TestYamlConfig < Minitest::Test
     @yaml_config = Sequelizer::YamlConfig.new
   end
 
+  def with_empty_env
+    env_mock = Minitest::Mock.new
+    env_mock.expect :[], nil, ['SEQUELIZER_ENV']
+    env_mock.expect :[], nil, ['RAILS_ENV']
+    env_mock.expect :[], nil, ['RACK_ENV']
+
+    stub_const(Sequelizer::YamlConfig, :ENV, env_mock) do
+      yield
+    end
+
+    env_mock.verify
+  end
+
   def test_loads_from_yaml_file_if_present
     mock = Minitest::Mock.new
     file_mock = Minitest::Mock.new
@@ -29,7 +42,9 @@ class TestYamlConfig < Minitest::Test
     file_mock.expect :exist?, true
     @yaml_config.stub :config_file_path, file_mock do
       @yaml_config.stub :config, {'development' => { 'adapter' => 'sqlite' }} do
-        assert_equal({ 'adapter' => 'sqlite' }, @yaml_config.options)
+        with_empty_env do
+          assert_equal({ 'adapter' => 'sqlite' }, @yaml_config.options)
+        end
       end
     end
     file_mock.verify
@@ -60,15 +75,8 @@ class TestYamlConfig < Minitest::Test
   end
 
   def test_environment_checks_environment_variables
-    env_mock = Minitest::Mock.new
-    env_mock.expect :[], nil, ['SEQUELIZER_ENV']
-    env_mock.expect :[], nil, ['RAILS_ENV']
-    env_mock.expect :[], nil, ['RACK_ENV']
-
-    stub_const(Sequelizer::YamlConfig, :ENV, env_mock) do
+    with_empty_env do
       assert_equal 'development', @yaml_config.environment
     end
-
-    env_mock.verify
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'minitest/autorun'
+require "sequel"
 
 class Minitest::Test
   def stub_const(klass, const, replace, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -142,21 +157,25 @@ files:
 - examples/database.with_one_set_of_options.yml
 - examples/database.yml
 - examples/dot_env.txt
+- lib/sequel/extensions/db_opts.rb
+- lib/sequel/extensions/settable.rb
 - lib/sequelizer.rb
 - lib/sequelizer/cli.rb
 - lib/sequelizer/connection_maker.rb
 - lib/sequelizer/env_config.rb
 - lib/sequelizer/gemfile_modifier.rb
+- lib/sequelizer/monkey_patches/database_in_after_connect.rb
 - lib/sequelizer/options.rb
 - lib/sequelizer/options_hash.rb
 - lib/sequelizer/version.rb
 - lib/sequelizer/yaml_config.rb
 - sequelizer.gemspec
-- test/sequelizer/test_connection_maker.rb
-- test/sequelizer/test_env_config.rb
-- test/sequelizer/test_gemfile_modifier.rb
-- test/sequelizer/test_options.rb
-- test/sequelizer/test_yaml_config.rb
+- test/lib/sequel/extensions/test_db_opts.rb
+- test/lib/sequelizer/test_connection_maker.rb
+- test/lib/sequelizer/test_env_config.rb
+- test/lib/sequelizer/test_gemfile_modifier.rb
+- test/lib/sequelizer/test_options.rb
+- test/lib/sequelizer/test_yaml_config.rb
 - test/test_helper.rb
 homepage: https://github.com/outcomesinsights/sequelizer
 licenses:
@@ -177,15 +196,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Sequel database connections via config/database.yml or .env
 test_files:
-- test/sequelizer/test_connection_maker.rb
-- test/sequelizer/test_env_config.rb
-- test/sequelizer/test_gemfile_modifier.rb
-- test/sequelizer/test_options.rb
-- test/sequelizer/test_yaml_config.rb
+- test/lib/sequel/extensions/test_db_opts.rb
+- test/lib/sequelizer/test_connection_maker.rb
+- test/lib/sequelizer/test_env_config.rb
+- test/lib/sequelizer/test_gemfile_modifier.rb
+- test/lib/sequelizer/test_options.rb
+- test/lib/sequelizer/test_yaml_config.rb
 - test/test_helper.rb

data/test/sequelizer/test_connection_maker.rb

@@ -1,52 +0,0 @@
-require_relative '../test_helper'
-require_relative '../../lib/sequelizer'
-
-class TestConnectionMaker < Minitest::Test
-  def setup
-    @options = { 'adapter' => 'sqlite' }
-    @sequel_mock = Minitest::Mock.new
-    stub_const(Sequelizer::ConnectionMaker, :Sequel, @sequel_mock)
-    @sequel_mock.expect :connect, :connection, [@options]
-  end
-
-  def teardown
-    @sequel_mock.verify
-    remove_stubbed_const(Sequelizer::ConnectionMaker, :Sequel)
-  end
-
-  def test_accepts_options_as_params
-    Sequelizer::YamlConfig.stub :user_config_path, Pathname.new('/completely/made/up/path/that/does/not/exist') do
-      assert_equal :connection, Sequelizer::ConnectionMaker.new(@options).connection
-    end
-  end
-
-  def test_reads_options_from_yaml_config
-    yaml_config = Minitest::Mock.new
-    yaml_config.expect :options, @options
-    yaml_config.expect :options, @options
-
-    Sequelizer::YamlConfig.stub :new, yaml_config do
-      assert_equal :connection, Sequelizer::ConnectionMaker.new.connection
-    end
-
-    yaml_config.verify
-  end
-
-  def test_reads_options_from_env_config_if_no_yaml_config
-    yaml_config = Minitest::Mock.new
-    yaml_config.expect :options, {}
-    yaml_config.expect :options, {}
-
-    env_config = Minitest::Mock.new
-    env_config.expect :options, @options
-
-    Sequelizer::YamlConfig.stub :new, yaml_config do
-      Sequelizer::EnvConfig.stub :new, env_config do
-        assert_equal :connection, Sequelizer::ConnectionMaker.new.connection
-      end
-    end
-
-    env_config.verify
-    yaml_config.verify
-  end
-end