sequelizer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96e14a988922e4e961273049b4ec5137332a6276702fbc7ff4c7ece29dbf10da
-  data.tar.gz: e8eb82b04cbacfebdc8abd98ac4a85614d366097a455f0b6b9bf7ed7df8d41bc
+  metadata.gz: 4cfd3663b92545f1bffb3c811297f81f26a2a1c237bc621c31d22d905be4bc0b
+  data.tar.gz: 1865666d4f264967f909820d9c7572dfff2b74bc3c80219c589c8197f18e5e59
 SHA512:
-  metadata.gz: 98e32334ee46938dc39b5ae853ec54e56f6577fdefb86637f50ea24a77f33730f6059ba7ee75138b150ae46191a9f6957f86c44183b26564c934b56bdc3b286e
-  data.tar.gz: d56db775cf833b2935afa22d9308d91820d980150a6e0d7c8ef058d3d2727cabc7b3e949444fe195ddf1109e62b46671e0396629b81d58ae4bb7e561d2d93a73
+  metadata.gz: c02b029eb0bf30bfb6498d75fbde32aa7a1576074c74dd55993a91a3f4d6458c53e0e1ed45c16d3177767ddde7b44ce706cbafce0269681f025acbe80f46ea35
+  data.tar.gz: f123e5d48c8178d9b5609f6f44d9744fb00f31085b11364aa839b902784f9de60beedabc7b90a7c6e4ae6b84a62d9d9a1b338190a0597fec40107518632b94f8

data/lib/sequelizer/options.rb

@@ -39,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'
@@ -65,11 +66,12 @@ module Sequelizer
     #  - ~/.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

data/lib/sequelizer/version.rb

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

data/sequelizer.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   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/sequelizer/test_connection_maker.rb

@@ -12,23 +12,26 @@ class TestConnectionMaker < Minitest::Test
     end
   end
 
+  def with_ignored_yaml_config(opts = {})
+  end
+
+
   def with_yaml_config(options = {})
-    yaml_config = Minitest::Mock.new
-    yaml_config.expect :options, options
-    yaml_config.expect :options, options
-    Sequelizer::YamlConfig.stub :new, yaml_config do
-      yield
+    yaml_config = Sequelizer::YamlConfig.new
+    yaml_config.stub(:options, options) do
+      Sequelizer::YamlConfig.stub :new, yaml_config do
+        yield
+      end
     end
-    yaml_config.verify
   end
 
   def with_env_config(options = {})
-    env_config = Minitest::Mock.new
-    env_config.expect :options, options
-    Sequelizer::EnvConfig.stub :new, env_config do
-      yield
+    env_config = Sequelizer::EnvConfig.new
+    env_config.stub(:options, options) do
+      Sequelizer::EnvConfig.stub :new, env_config do
+        yield env_config
+      end
     end
-    env_config.verify
   end
 
   def test_reads_options_from_yaml_config
@@ -37,6 +40,12 @@ class TestConnectionMaker < Minitest::Test
     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
@@ -65,6 +74,14 @@ class TestConnectionMaker < Minitest::Test
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,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
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Sequel database connections via config/database.yml or .env