database_url 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ba2ea5185f9833e0f0b30d7e4440c138019b6427
+  data.tar.gz: 87bd701c1f3eea559518ca379f6361d795f68e0d
+SHA512:
+  metadata.gz: e016566a71450259e626674d6725ca26dcb41651a929ea342a42023eeb3c4c50c7044536cb154c1e7b7f0078fa839f6d2e270c045decf098c7b6a99376408837
+  data.tar.gz: 34cb07b00a0673467d9c747a3251efe2da3bffbde41eca00f6989ee3b04b8b3cd006d5b8a7fdb13d3c66f5646e90517d234a33e1e7f088d778887aa13263da02

data/CHANGELOG

@@ -1,3 +1,15 @@
+0.1.0 / 2014-07-12
+
+* Breaking changes
+
+  * replaced .active_record_config(url = nil) with .to_active_record_hash(url = nil)
+  * replaced .database_url(hash) with .to_active_record_url(hash)
+
+* Enhancements
+
+  * .to_sequel_hash(url = nil)
+  * .to_sequel_url(hash)
+
 0.0.1 / 2013-09-19
 
 Initial release!

data/README.md

@@ -4,29 +4,40 @@ Convert back and forth between Heroku-style `ENV['DATABASE_URL']` and Rails/Acti
 
 ## Usage
 
+### Methods
+
+    DatabaseUrl.to_active_record_hash(url = nil)
+    DatabaseUrl.to_active_record_url(hash)
+    DatabaseUrl.to_sequel_hash(url = nil)
+    DatabaseUrl.to_sequel_url(hash)
+
 ### Get `DATABASE_URL` from config hash
 
 You pass it a hash (string or symbol keys, doesn't matter) and it gives you a URL:
 
     >> c = YAML.load_file('/path/to/config/database.yml')
     => {"development"=>{"adapter"=>"mysql2", "database"=>"myapp_development", "username"=>"root", "password"=>"password", "encoding"=>"utf8"}, "test"=>{"adapter"=>"mysql2", "database"=>"myapp_test", "username"=>"root", "password"=>"password", "encoding"=>"utf8"}, "production"=>{"adapter"=>"mysql2", "database"=>"myapp", "username"=>"myapp", "password"=>"XXX", "encoding"=>"utf8"}, "cucumber"=>{"adapter"=>"mysql2", "database"=>"myapp_cucumber", "username"=>"root", "password"=>"password", "encoding"=>"utf8"}}
-    >> DatabaseUrl.database_url c['development']
+    >> DatabaseUrl.to_active_record_url c['development']
     => "mysql2://root:password@127.0.0.1/myapp_development?encoding=utf8"
 
 ### Get config hash from `DATABASE_URL`
 
-Let's assume `DATABASE_URL` is set to `postgres://uuu:xxx@127.0.0.1:1234/abc`...
-
-    >> DatabaseUrl.active_record_config
+    >> DatabaseUrl.to_active_record_hash('postgres://uuu:xxx@127.0.0.1:1234/abc')
     => {:adapter=>"postgres", :host=>"127.0.0.1", :port=>1234, :database=>"abc", :user=>"uuu", :password=>"xxx"}
 
-You can also pass a URL as the first argument to `DatabaseUrl.active_record_config`.
+If you omit the argument, it will try `ENV['DATABASE_URL']`
 
 ## Query parameters supported
 
 * `encoding`
 * `pool`
 
+## TODO
+
+* all query params
+* automatically pull from config/database.yml
+* automatically pull from ActiveRecord::Base.connection_config
+
 ## Copyright
 
-Copyright 2013 Seamus Abshere
+Copyright 2014 Seamus Abshere

data/database_url.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = DatabaseUrl::VERSION
   spec.authors       = ["Seamus Abshere"]
   spec.email         = ["seamus@abshere.net"]
-  spec.description   = %q{Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Rails/ActiveRecord-style config/database.yml hashes.}
-  spec.summary       = %q{Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Rails/ActiveRecord-style config/database.yml hashes.}
+  spec.description   = %q{Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Sequel/ActiveRecord-style config hashes.}
+  spec.summary       = %q{Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Sequel/ActiveRecord-style config hashes.}
   spec.homepage      = "https://github.com/seamusabshere/database_url"
   spec.license       = "MIT"
 
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

data/lib/database_url.rb

@@ -5,38 +5,56 @@ require 'cgi'
 
 module DatabaseUrl
   class << self
-    def active_record_config(url = nil)
+    def to_active_record_hash(url = nil)
+      to_hash ACTIVE_RECORD_FIELD_MAP, url
+    end
+
+    def to_active_record_url(hash)
+      to_url ACTIVE_RECORD_FIELD_MAP, hash
+    end
+
+    def to_sequel_hash(url = nil)
+      to_hash SEQUEL_FIELD_MAP, url
+    end
+
+    def to_sequel_url(hash)
+      to_url SEQUEL_FIELD_MAP, hash
+    end
+
+    private
+
+    def to_hash(field_map, url = nil)
       if url.nil?
         url = ENV.fetch 'DATABASE_URL'
       end
       uri = URI.parse url
-      retval = {
+      memo = {
         adapter: uri.scheme,
         host: uri.host,
         database: File.basename(uri.path),
       }
       if uri.port
-        retval[:port] = uri.port
+        memo[:port] = uri.port
       end
       if uri.user
-        retval[:user] = uri.user
+        memo[:user] = uri.user
       end
       if uri.password
-        retval[:password] = uri.password
+        memo[:password] = uri.password
       end
       query = CGI.parse uri.query
       if query.has_key?('encoding')
-        retval[:encoding] = query['encoding'][0]
+        memo[:encoding] = query['encoding'][0]
       end
-      if query.has_key?('pool')
-        retval[:pool] = query['pool'][0].to_i
+      if (pool = query['pool'] || query['max_connections']) and pool.length > 0 # CGI.parse creates a Hash that defaults to []
+        memo[field_map.fetch('pool').to_sym] = pool[0].to_i
       end
-      retval
+      memo
     end
 
-    def database_url(active_record_config)
+    def to_url(field_map, hash)
       # stringify keys
-      c = active_record_config.inject({}) { |memo, (k, v)| memo[k.to_s] = v; memo }
+      c = hash.inject({}) { |memo, (k, v)| memo[k.to_s] = v; memo }
       userinfo = if c.has_key?('user') or c.has_key?('username') or c.has_key?('password')
         username = c.values_at('user', 'username').compact.first
         [ username, c['password'] ].join ':'
@@ -45,8 +63,8 @@ module DatabaseUrl
       if c.has_key?('encoding')
         query['encoding'] = c['encoding']
       end
-      if c.has_key?('pool')
-        query['pool'] = c['pool'].to_i
+      if pool = c['pool'] || c['max_connections']
+        query[field_map.fetch('pool')] = pool.to_i
       end
       query = if query.length > 0
         URI.encode_www_form query
@@ -69,4 +87,11 @@ module DatabaseUrl
   end
 
   DEFAULT_HOST = '127.0.0.1'
+
+  SEQUEL_FIELD_MAP = {
+    'pool' => 'max_connections',
+  }
+  ACTIVE_RECORD_FIELD_MAP = {
+    'pool' => 'pool',
+  }
 end

data/lib/database_url/version.rb

@@ -1,3 +1,3 @@
 module DatabaseUrl
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/database_url_spec.rb

@@ -5,43 +5,87 @@ describe DatabaseUrl do
     ENV.delete 'DATABASE_URL'
   end
 
-  it "should build Rails/ActiveRecord-style config hashes using ENV['DATABASE_URL']" do
-    ENV['DATABASE_URL'] = "postgres://uuu:xxx@127.0.0.1:1234/abc?encoding=latin1&pool=9"
-    DatabaseUrl.active_record_config.should == {
-      adapter: 'postgres',
-      host: '127.0.0.1',
-      port: 1234,
-      database: 'abc',
-      user: 'uuu',
-      password: 'xxx',
-      encoding: 'latin1',
-      pool: 9,
-    }
-  end
+  describe 'ActiveRecord' do
+    it "builds config hashes using ENV['DATABASE_URL']" do
+      ENV['DATABASE_URL'] = "postgres://uuu:xxx@127.0.0.1:1234/abc?encoding=latin1&pool=9"
+      DatabaseUrl.to_active_record_hash.should == {
+        adapter: 'postgres',
+        host: '127.0.0.1',
+        port: 1234,
+        database: 'abc',
+        user: 'uuu',
+        password: 'xxx',
+        encoding: 'latin1',
+        pool: 9,
+      }
+    end
+
+    it "builds URL from config hash" do
+      DatabaseUrl.to_active_record_url({
+        adapter: 'postgreq',
+        host: '127.0.0.2',
+        port: 1235,
+        database: 'abd',
+        user: 'uu1',
+        password: 'xx1',
+        encoding: 'utf8',
+        pool: 15,
+      }).should == "postgreq://uu1:xx1@127.0.0.2:1235/abd?encoding=utf8&pool=15"
+    end
 
-  it "should build DATABASE_URL-style URL from Rails/ActiveRecord-style config hash" do
-    DatabaseUrl.database_url({
-      adapter: 'postgreq',
-      host: '127.0.0.2',
-      port: 1235,
-      database: 'abd',
-      user: 'uu1',
-      password: 'xx1',
-      encoding: 'utf8',
-      pool: 15,
-    }).should == "postgreq://uu1:xx1@127.0.0.2:1235/abd?encoding=utf8&pool=15"
+    it "builds config hashes given a URL" do
+      ENV['DATABASE_URL'] = "postgres://uuu:xxx@127.0.0.1:1234/abc" # should be ignored!
+      DatabaseUrl.to_active_record_hash("postgres://uu2:xxx@127.0.0.3:1236/abc?encoding=latin1").should == {
+        adapter: 'postgres',
+        host: '127.0.0.3',
+        port: 1236,
+        database: 'abc',
+        user: 'uu2',
+        password: 'xxx',
+        encoding: 'latin1',
+      }
+    end
   end
 
-  it "should build Rails/ActiveRecord-style config hashes given a URL" do
-    ENV['DATABASE_URL'] = "postgres://uuu:xxx@127.0.0.1:1234/abc" # should be ignored!
-    DatabaseUrl.active_record_config("postgres://uu2:xxx@127.0.0.3:1236/abc?encoding=latin1").should == {
-      adapter: 'postgres',
-      host: '127.0.0.3',
-      port: 1236,
-      database: 'abc',
-      user: 'uu2',
-      password: 'xxx',
-      encoding: 'latin1',
-    }
+  describe 'Sequel' do
+    it "builds config hashes using ENV['DATABASE_URL']" do
+      ENV['DATABASE_URL'] = "postgres://uuu:xxx@127.0.0.1:1234/abc?encoding=latin1&pool=9"
+      DatabaseUrl.to_sequel_hash.should == {
+        adapter: 'postgres',
+        host: '127.0.0.1',
+        port: 1234,
+        database: 'abc',
+        user: 'uuu',
+        password: 'xxx',
+        encoding: 'latin1',
+        max_connections: 9,
+      }
+    end
+
+    it "builds URL from config hash" do
+      DatabaseUrl.to_sequel_url({
+        adapter: 'postgreq',
+        host: '127.0.0.2',
+        port: 1235,
+        database: 'abd',
+        user: 'uu1',
+        password: 'xx1',
+        encoding: 'utf8',
+        pool: 15,
+      }).should == "postgreq://uu1:xx1@127.0.0.2:1235/abd?encoding=utf8&max_connections=15"
+    end
+
+    it "builds config hashes given a URL" do
+      ENV['DATABASE_URL'] = "postgres://uuu:xxx@127.0.0.1:1234/abc" # should be ignored!
+      DatabaseUrl.to_sequel_hash("postgres://uu2:xxx@127.0.0.3:1236/abc?encoding=latin1").should == {
+        adapter: 'postgres',
+        host: '127.0.0.3',
+        port: 1236,
+        database: 'abc',
+        user: 'uu2',
+        password: 'xxx',
+        encoding: 'latin1',
+      }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
+require 'pry'
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'database_url'

metadata

@@ -1,75 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: database_url
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Rails/ActiveRecord-style
-  config/database.yml hashes.
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Sequel/ActiveRecord-style
+  config hashes.
 email:
 - seamus@abshere.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -83,29 +90,28 @@ files:
 homepage: https://github.com/seamusabshere/database_url
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Rails/ActiveRecord-style
-  config/database.yml hashes.
+specification_version: 4
+summary: Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Sequel/ActiveRecord-style
+  config hashes.
 test_files:
 - spec/database_url_spec.rb
 - spec/spec_helper.rb