sequelizer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6628c636f7aee3fc9ffc3c36b9877167756c2cc0
-  data.tar.gz: b24750aba87b1a882ee81dd18d0ec078deab4e9c
+  metadata.gz: f543366458873761352e0464a1113a9c2f791c7e
+  data.tar.gz: 36531d0c933c330511d8e15a546e7d9cd391bffa
 SHA512:
-  metadata.gz: 986d3122766c0f9cac14bba4196469edc93d4c32718a716ae93e823898a84b35d7117d8c70d341f203c98d850cd83ceaa5867e57dab45ff5682e5a01bb405eec
-  data.tar.gz: cd2f304548d984e8d4229350bee9b8328f2bc7193b30c4b73c4d14c2dc90bc3a955d8349855b45c8f3eadd291a613f7b587efaf9446e6220ba9fa64490df9fa4
+  metadata.gz: 8b6dae1e942d5ef102eaed5ba14fb98c84b827079c67ed6171d87b88620608b1a82aaf84b19e93ab3444c79fbfb1d4ce3aa7e9b52223180708abd66428bb3a7d
+  data.tar.gz: 29dc04d9f2e5ab95f8ea1062f039a5451acc921d65cd8d39783d1e611cb4ae95eb45d991f307c1c23dd8ea6343cd9cec8fd9a52a5a6fb10484020f454de3c1d4

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+## 0.0.2 - 2014-07-10
+
+### Added
+- This [CHANGELOG](http://keepachangelog.com/)
+- Behavior to merge options from all sources (#3)
+- Dependency on hashie gem
+- Some tests for Sequelizer::Options
+- Sequelizer::OptionsHash
+- Reference to issues #1, #3 in README
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Prevented TestEnvConfig from polluting environment variables
+
+## 0.0.1 - 2014-07-10
+
+### Added
+- The project itself
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Nothing.

data/README.md

@@ -51,13 +51,17 @@ end
 
 `new_db` will create a new connection to the database on each call.
 
-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.  The options you pass in aren't merged against any other configuration files you might have set up.
+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
+
+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.
 
 Take a look at the examples directory for a few ways you can specify your database configuration options.
 
 ## Frustrations
 
-I can't seem to figure out a way to avoid having to specify the database gem in the a user's bundler file.  If anyone has ideas on how to automagically load the correct database gem based on the database options fed to Sequelizer, please let me know!
+I can't seem to figure out a way to avoid having to specify the database gem in the a user's bundler file.  If anyone has ideas on how to automagically load the correct database gem based on the database options fed to Sequelizer, please let me know (#1)!
 
 ## Contributing
 

data/lib/sequelizer/options.rb

@@ -1,17 +1,18 @@
 require 'sequelizer/yaml_config'
 require 'sequelizer/env_config'
+require 'sequelizer/options_hash'
 
 module Sequelizer
   class Options
     def initialize(options = nil)
-      @options = fix_options(options || db_config)
+      @options = fix_options(options)
     end
 
     def to_hash
       @options
     end
 
-    %w(adapter database username password search_path).each do |name|
+    %w(adapter database username password schema_search_path).each do |name|
       define_method(name) do
         @options[name]
       end
@@ -24,13 +25,18 @@ module Sequelizer
     #
     # If fed anything, like a string that represents the URL for a DB,
     # the string is returned without modification
-    def fix_options(sequelizer_options)
-      return sequelizer_options unless sequelizer_options.is_a?(Hash)
+    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)
 
-      search_path = sequelizer_options['search_path'] || sequelizer_options['schema_search_path']
-      sequelizer_options['adapter'] = 'postgres' if sequelizer_options['adapter'] =~ /^postgres/
-      if search_path && sequelizer_options['adapter'] =~ /postgres/i
-        sequelizer_options['after_connect'] = after_connect(search_path)
+      if sequelizer_options[:adapter] =~ /^postgres/
+        sequelizer_options[:adapter] = 'postgres'
+        paths = %w(schema_search_path search_path schema).map { |key| sequelizer_options.delete(key) }.compact
+
+        unless paths.empty?
+          sequelizer_options[:schema_search_path] = paths.first
+          sequelizer_options[:after_connect] = after_connect(paths.first)
+        end
       end
 
       sequelizer_options
@@ -41,7 +47,9 @@ module Sequelizer
     #  - environment variables (also reads from .env)
     def db_config
       @db_config ||= begin
-        YamlConfig.new.options || EnvConfig.new.options
+        opts = OptionsHash.new(YamlConfig.new.options || {})
+        opts.merge!(EnvConfig.new.options || {})
+        opts
       end
     end
 

data/lib/sequelizer/options_hash.rb

@@ -0,0 +1,7 @@
+require 'hashie'
+module Sequelizer
+  class OptionsHash < Hash
+    include Hashie::Extensions::IndifferentAccess
+    include Hashie::Extensions::MergeInitializer
+  end
+end

data/lib/sequelizer/version.rb

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

data/sequelizer.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sequel', '~> 4.12'
   spec.add_dependency 'dotenv', '~> 0.11'
   spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'hashie', '~> 3.2'
 end

data/test/sequelizer/test_env_config.rb

@@ -18,5 +18,6 @@ class TestEnvConfig < Minitest::Test
   def test_converts_sequelizer_vars_to_options
     ENV['SEQUELIZER_ADAPTER'] = 'sqlite'
     assert_equal({ 'adapter' => 'sqlite' }, @env_config.options)
+    ENV.delete('SEQUELIZER_ADAPTER')
   end
 end

data/test/sequelizer/test_options.rb

@@ -0,0 +1,37 @@
+require_relative '../test_helper'
+require_relative '../../lib/sequelizer/options'
+
+
+class TestOptions < Minitest::Test
+  def test_changes_postgresql_adapter_to_postgres
+    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgresql'))
+
+    assert_equal('postgres', options.adapter)
+    assert_equal('postgres', options.to_hash[:adapter])
+    assert_equal('postgres', options.to_hash['adapter'])
+  end
+
+  def test_finds_schema_as_search_path
+    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', search_path: 'path'))
+
+    assert_equal('path', options.schema_search_path)
+  end
+
+  def test_finds_schema_as_schema
+    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', schema: 'path'))
+
+    assert_equal('path', options.schema_search_path)
+  end
+
+  def test_finds_schema_as_schema_search_path
+    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', schema_search_path: 'path'))
+
+    assert_equal('path', options.schema_search_path)
+  end
+
+  def test_returns_a_hash_even_if_given_nil
+    options = Sequelizer::Options.new
+    assert_equal({}, options.to_hash)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryan Duryea
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Easily establish a connection to a database via Sequel gem using options
   specified in config/database.yml or .env files
 email:
@@ -118,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -133,12 +148,14 @@ files:
 - lib/sequelizer/env_config.rb
 - lib/sequelizer/gemfile_modifier.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/test_helper.rb
 homepage: https://github.com/outcomesinsights/sequelizer
@@ -169,5 +186,7 @@ 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/test_helper.rb
+has_rdoc: