sequelizer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e093599e70651e91335650ab1356e697c514ee
-  data.tar.gz: b46f6b86d1fe965767ed5c2a117631c44ff4ae07
+  metadata.gz: 0efeede798cbe0762a40b9e46a4a65da61a6c12c
+  data.tar.gz: ca6bb26204613c27fc29e20f7c5111de3a754621
 SHA512:
-  metadata.gz: 248907aecabe87161db1b2a4ce3c3ee2a917cecb8436d995ca26653e2838bedecd770731189ab01b150c48d9f12ff122290c60432f458daede237547d32154a9
-  data.tar.gz: 8584066aec604be6eee2f22411bb12df2d72a350218727dab1f0a0108a8395325ed8f8db5acd1a85c4936fb1846713139bc0707fa6aa6cc90d46a46eb9ec2ce6
+  metadata.gz: 082275d6849a28d57325d50045b15d6e62427ad3460ea3c7d15676bf48948b03ecdd23e4fb67aa5b36220cd22504adf89ec12c9104631a7dc147850307388fc3
+  data.tar.gz: 206f9f517384d3530c3a326c2a5c8a183ca183869b34039bcade3718879196274447768cee6ef85afaf46ab6792b35ccbf914973749b0ccef0c63eba041f641f

data/CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+### Added
+- Nothing.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Nothing.
+
+## 0.0.6 - 2015-08-21
+
+### Added
+- Support for ruby-oci8 (Oracle) in update_gemfile command
+- Read user-level configuration from ~/.config/sequelizer/database.yml
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Bug where options passed as symbols where sometimes ignored.
+
+
 ## 0.0.5 - 2014-08-29
 
 ### Added

data/README.md

@@ -61,7 +61,7 @@ end
 
 Both take a hash of database options if you don't want to create a config/database.yml or .env file, or simply wish to override those options.  Options are merged together from all sources with the following precedence:
 
-    passed_options > .env > manually defined environment variables > config/database.yml
+    passed_options > .env > manually defined environment variables > config/database.yml > ~/.config/sequelizer/database.yml
 
 So if config/database.yml specifies a connection, you can set an environment variable (either manually, or through .env) to override one of those options.  Similarly, if you pass an option to the method directly, that option will override the YAML and ENV-based options.  See #3 for further discussion.
 

data/lib/sequelizer/env_config.rb

@@ -14,7 +14,7 @@ module Sequelizer
         config[new_key] = ENV[key]
         config
       end
-      env_config.empty? ? nil : env_config
+      env_config.empty? ? {} : env_config
     end
   end
 end

data/lib/sequelizer/gemfile_modifier.rb

@@ -38,6 +38,8 @@ module Sequelizer
         'mysql2'
       when 'tinytds'
         'tiny_tds'
+      when 'oracle'
+        'ruby-oci8'
       when nil
         raise "No database adapter defined in your Sequelizer configuration"
       else

data/lib/sequelizer/options.rb

@@ -27,7 +27,7 @@ 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((passed_options || {}).to_hash)
+      sequelizer_options = db_config.merge(OptionsHash.new(passed_options || {}).to_hash)
 
       if sequelizer_options[:adapter] =~ /^postgres/
         sequelizer_options[:adapter] = 'postgres'
@@ -50,12 +50,14 @@ module Sequelizer
     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
       @db_config ||= begin
-        opts = OptionsHash.new(YamlConfig.new.options || {})
-        opts.merge!(EnvConfig.new.options || {})
+        opts = OptionsHash.new(YamlConfig.user_config.options)
+        opts.merge!(YamlConfig.local_config.options)
+        opts.merge!(EnvConfig.new.options)
         opts
       end
     end

data/lib/sequelizer/version.rb

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

data/lib/sequelizer/yaml_config.rb

@@ -1,12 +1,33 @@
 require 'psych'
+require 'pathname'
 
 module Sequelizer
   class YamlConfig
+    attr_reader :config_file_path
+
+    class << self
+      def local_config
+        new
+      end
+
+      def user_config
+        new(user_config_path)
+      end
+
+      def user_config_path
+        Pathname.new("~") + ".config" + "sequelizer" + "database.yml"
+      end
+    end
+
+    def initialize(config_file_path = nil)
+      @config_file_path = Pathname.new(config_file_path || Pathname.pwd + "config" + "database.yml").expand_path
+    end
+
     # Returns a set of options pulled from config/database.yml
     # or +nil+ if config/database.yml doesn't exist
     def options
-      return nil unless config_file.exist?
-      config['adapter'] ? config : config[environment]
+      return {} unless config_file_path.exist?
+      config['adapter'] || config[:adapter] ? config : config[environment]
     end
 
     # The environment to load from database.yml
@@ -24,21 +45,9 @@ module Sequelizer
 
     private
 
-    # The Pathname to config/database.yml
-    def config_file
-      @config_file ||= begin
-        root + 'config' + 'database.yml'
-      end
-    end
-
-    # The root directory to search for config/database.yml
-    def root
-      @root ||= Pathname.pwd
-    end
-
     # The config as read from config/database.yml
     def config
-      @config ||= Psych.load_file(config_file)
+      @config ||= Psych.load_file(config_file_path)
     end
   end
 end

data/test/sequelizer/test_connection_maker.rb

@@ -15,12 +15,15 @@ class TestConnectionMaker < Minitest::Test
   end
 
   def test_accepts_options_as_params
-    assert_equal :connection, Sequelizer::ConnectionMaker.new(@options).connection
+    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
@@ -31,7 +34,8 @@ class TestConnectionMaker < Minitest::Test
 
   def test_reads_options_from_env_config_if_no_yaml_config
     yaml_config = Minitest::Mock.new
-    yaml_config.expect :options, nil
+    yaml_config.expect :options, {}
+    yaml_config.expect :options, {}
 
     env_config = Minitest::Mock.new
     env_config.expect :options, @options

data/test/sequelizer/test_env_config.rb

@@ -6,6 +6,7 @@ class TestEnvConfig < Minitest::Test
   def setup
     @env_config = Sequelizer::EnvConfig.new
   end
+
   def test_loads_dotenv
     mock = Minitest::Mock.new
     stub_const(Sequelizer::EnvConfig, :Dotenv, mock) do
@@ -15,6 +16,10 @@ class TestEnvConfig < Minitest::Test
     end
   end
 
+  def test_options_default_to_empty_hash
+    assert_equal(@env_config.options, {})
+  end
+
   def test_converts_sequelizer_vars_to_options
     ENV['SEQUELIZER_ADAPTER'] = 'sqlite'
     assert_equal({ 'adapter' => 'sqlite' }, @env_config.options)

data/test/sequelizer/test_options.rb

@@ -41,8 +41,15 @@ class TestOptions < Minitest::Test
   end
 
   def test_returns_a_hash_even_if_given_nil
-    options = Sequelizer::Options.new
-    assert_equal({}, options.to_hash)
+    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)
+    end
+  end
+
+  def test_handles_symbolized_search_path
+    options = Sequelizer::Options.new(search_path: 'passed', adapter: 'postgres')
+    assert_equal 'passed', options.search_path
   end
 end
 

data/test/sequelizer/test_yaml_config.rb

@@ -15,7 +15,7 @@ class TestYamlConfig < Minitest::Test
       mock.expect :load_file, { 'adapter' => 'sqlite' }, [file_mock]
       file_mock.expect :exist?, true
 
-      @yaml_config.stub :config_file, file_mock do
+      @yaml_config.stub :config_file_path, file_mock do
         assert_equal({ 'adapter' => 'sqlite' }, @yaml_config.options)
       end
 
@@ -27,7 +27,7 @@ class TestYamlConfig < Minitest::Test
   def test_loads_by_environment_if_present
     file_mock = Minitest::Mock.new
     file_mock.expect :exist?, true
-    @yaml_config.stub :config_file, file_mock do
+    @yaml_config.stub :config_file_path, file_mock do
       @yaml_config.stub :config, {'development' => { 'adapter' => 'sqlite' }} do
         assert_equal({ 'adapter' => 'sqlite' }, @yaml_config.options)
       end
@@ -35,6 +35,30 @@ class TestYamlConfig < Minitest::Test
     file_mock.verify
   end
 
+  def test_options_default_to_empty_hash
+    assert_equal(@yaml_config.options, {})
+  end
+
+  def test_path_defaults_to_local_config
+    assert_equal(@yaml_config.config_file_path, Pathname.pwd + "config" + "database.yml")
+  end
+
+  def test_path_can_be_fed_pathanem_from_initialize
+    assert_equal(Sequelizer::YamlConfig.new(Pathname.new("~") + ".config").config_file_path, Pathname.new("~").expand_path + ".config")
+  end
+
+  def test_path_can_be_fed_string_from_initialize
+    assert_equal(Sequelizer::YamlConfig.new("~/.config").config_file_path, Pathname.new("~").expand_path + ".config")
+  end
+
+  def test_local_is_current_directory
+    assert_equal(Sequelizer::YamlConfig.local_config.config_file_path, Pathname.pwd + "config" + "database.yml")
+  end
+
+  def test_home_uses_home_directory
+    assert_equal(Sequelizer::YamlConfig.user_config.config_file_path, Pathname.new("~").expand_path + ".config" + "sequelizer" + "database.yml")
+  end
+
   def test_environment_checks_environment_variables
     env_mock = Minitest::Mock.new
     env_mock.expect :[], nil, ['SEQUELIZER_ENV']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Sequel database connections via config/database.yml or .env