sequelizer 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0efeede798cbe0762a40b9e46a4a65da61a6c12c
-  data.tar.gz: ca6bb26204613c27fc29e20f7c5111de3a754621
+  metadata.gz: 8d676f724540c01e7cbd2bc6b2a354d78a2e9d15
+  data.tar.gz: e6872a70bdf5d268687f667273edced41abd13aa
 SHA512:
-  metadata.gz: 082275d6849a28d57325d50045b15d6e62427ad3460ea3c7d15676bf48948b03ecdd23e4fb67aa5b36220cd22504adf89ec12c9104631a7dc147850307388fc3
-  data.tar.gz: 206f9f517384d3530c3a326c2a5c8a183ca183869b34039bcade3718879196274447768cee6ef85afaf46ab6792b35ccbf914973749b0ccef0c63eba041f641f
+  metadata.gz: 8fb25153b51b05926e5da76fd977f88b8b3077b9dccedb6282edd40486bea4bc1d1e6be70fd8a576f2102a80c406663b40ef396a6ad32897730fd510cd6bddcd
+  data.tar.gz: ace9f653827f44fac941f1bbd6b2e6e854d3128bcf8d3a8f14343304b5f7350f2e6efe1c7ee11271cd3aa6f8f659bd6dd7b19145223372a3eecac56ac33aa4e7

data/CHANGELOG.md

@@ -1,82 +1,47 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## [0.1.0] - 2016-11-08
 
 ### Added
-- Nothing.
+- Connections are cached by options to avoid over-allocation
+- URL or URI option represent connection string
+- sequelizer.yml is passed through ERB
 
-### Deprecated
-- Nothing.
+### Changed
+- Format of this [CHANGELOG](http://keepachangelog.com/en/0.3.0/)
+- Prefer environment variables over other options
+- Use config/sequelizer.yml instead of config/database.yml
 
-### Removed
-- Nothing.
-
-### Fixed
-- Nothing.
-
-## 0.0.6 - 2015-08-21
+## [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
+## [0.0.5] - 2014-08-29
 
 ### Added
 - Support for TinyTDS (SQL Server) in update_gemfile command
 
-### Deprecated
-- Nothing.
-
-### Removed
-- Nothing.
-
 ### Fixed
 - timeout is always converted to integer before passing to Sequel.connect
 
-
-## 0.0.4 - 2014-08-18
+## [0.0.4] - 2014-08-18
 
 ### Added
 - `init_env` command to bin/sequelizer
 - Prefer `search_path` over `schema_search_path` option
 
-### Deprecated
-- Nothing.
-
-### Removed
-- Nothing.
-
-### Fixed
-- Nothing.
-
-
-## 0.0.3 - 2014-07-10
+## [0.0.3] - 2014-07-10
 
 ### Added
 - Ability to view configuration by running `sequelizer config`
 
-### Deprecated
-- Nothing.
-
-### Removed
-- Nothing.
-
-### Fixed
-- Nothing.
-
-## 0.0.2 - 2014-07-10
+## [0.0.2] - 2014-07-10
 
 ### Added
 - This [CHANGELOG](http://keepachangelog.com/)
@@ -86,25 +51,10 @@ All notable changes to this project will be documented in this file.
 - 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
+## [0.0.1] - 2014-07-10
 
 ### Added
 - The project itself
-
-### Deprecated
-- Nothing.
-
-### Removed
-- Nothing.
-
-### Fixed
-- Nothing.

data/lib/sequelizer.rb

@@ -11,7 +11,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.
-  def db(options = nil)
+  def db(options = {})
     @_sequelizer_db ||= new_db(options)
   end
 
@@ -20,7 +20,14 @@ 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.
-  def new_db(options = nil)
-    ConnectionMaker.new(options).connection
+  def new_db(options = {})
+    cached = find_cached(options)
+    return cached if cached && !options[:force_new]
+    @cache[options] = ConnectionMaker.new(options).connection
+  end
+
+  def find_cached(options)
+    @cache ||= {}
+    @cache[options]
   end
 end

data/lib/sequelizer/connection_maker.rb

@@ -22,7 +22,12 @@ module Sequelizer
 
     # Returns a Sequel connection to the database
     def connection
-      Sequel.connect(options.to_hash)
+      opts = options.to_hash
+      if url = (opts.delete(:uri) || opts.delete(:url))
+        Sequel.connect(url, opts)
+      else
+        Sequel.connect(options.to_hash)
+      end
     end
   end
 end

data/lib/sequelizer/version.rb

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

data/lib/sequelizer/yaml_config.rb

@@ -1,5 +1,6 @@
 require 'psych'
 require 'pathname'
+require 'erb'
 
 module Sequelizer
   class YamlConfig
@@ -20,14 +21,14 @@ module Sequelizer
     end
 
     def initialize(config_file_path = nil)
-      @config_file_path = Pathname.new(config_file_path || Pathname.pwd + "config" + "database.yml").expand_path
+      @config_file_path = Pathname.new(config_file_path || Pathname.pwd + "config" + "sequelizer.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 {} unless config_file_path.exist?
-      config['adapter'] || config[:adapter] ? config : config[environment]
+      config[environment] || config
     end
 
     # The environment to load from database.yml
@@ -47,7 +48,7 @@ module Sequelizer
 
     # The config as read from config/database.yml
     def config
-      @config ||= Psych.load_file(config_file_path)
+      @config ||= Psych.load(ERB.new(File.read(config_file_path)).result).tap { |c| p c }
     end
   end
 end

data/sequelizer.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest', '~> 2.3'
   spec.add_development_dependency 'minitest', '~> 5.3'
   spec.add_dependency 'sequel', '~> 4.12'
-  spec.add_dependency 'dotenv', '~> 0.11'
+  spec.add_dependency 'dotenv', '~> 2.1'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'hashie', '~> 3.2'
 end

data/test/sequelizer/test_yaml_config.rb

@@ -11,8 +11,8 @@ class TestYamlConfig < Minitest::Test
     mock = Minitest::Mock.new
     file_mock = Minitest::Mock.new
 
-    stub_const(Sequelizer::YamlConfig, :Psych, mock) do
-      mock.expect :load_file, { 'adapter' => 'sqlite' }, [file_mock]
+    stub_const(Sequelizer::YamlConfig, :File, mock) do
+      mock.expect :read, 'adapter: <%= "sqlite" %>', [file_mock]
       file_mock.expect :exist?, true
 
       @yaml_config.stub :config_file_path, file_mock do
@@ -40,7 +40,7 @@ class TestYamlConfig < Minitest::Test
   end
 
   def test_path_defaults_to_local_config
-    assert_equal(@yaml_config.config_file_path, Pathname.pwd + "config" + "database.yml")
+    assert_equal(@yaml_config.config_file_path, Pathname.pwd + "config" + "sequelizer.yml")
   end
 
   def test_path_can_be_fed_pathanem_from_initialize
@@ -52,7 +52,7 @@ class TestYamlConfig < Minitest::Test
   end
 
   def test_local_is_current_directory
-    assert_equal(Sequelizer::YamlConfig.local_config.config_file_path, Pathname.pwd + "config" + "database.yml")
+    assert_equal(Sequelizer::YamlConfig.local_config.config_file_path, Pathname.pwd + "config" + "sequelizer.yml")
   end
 
   def test_home_uses_home_directory

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sequel database connections via config/database.yml or .env
@@ -189,4 +189,3 @@ test_files:
 - test/sequelizer/test_options.rb
 - test/sequelizer/test_yaml_config.rb
 - test/test_helper.rb
-has_rdoc: