database_url 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87af4247427018bbd5ac82d5870048f58ca83c4e
-  data.tar.gz: eb3191147c79c95486e1bf92c9ad48496a23c9a0
+  metadata.gz: 256db9f7d4254aab47bdd049378a1056b5a35842
+  data.tar.gz: 85089906f1ddc02b093ccc152412954727261a6a
 SHA512:
-  metadata.gz: d1478e21ef47dd6056dbb8eb93b4ceb99fb03498c452c9a367f38cfd216405cc49ae6eba275d24c2f22825c52dd5fdeee8a6e1c9fad9a93e5a7f1be8ecf1ca6a
-  data.tar.gz: 1fce4ae92ffdde01d6f22d4d6d42ed8b52bcb1f9b19738e838c3f170096bf65c6808d28583487dfe33c902dbf5192b5218d1d9e764ac8d13197279c1bb8f94ea
+  metadata.gz: 6365de408b836f969e1650deb6cc5efdedde7e2a2a1486acfd46b106e28cb3c1d7f445db0a05fb66d94d43f753544e9e361d5fba86e7f740a98c32fecb4ef0d0
+  data.tar.gz: def6c80427b9796fd1ea029348bb4d2c4d97b2d8e954f728bd51ff61f0682a42c42b91804e890e27ebe33784cbf082891c22c37ee4d9e8ed3554e807da8f8bcd

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.2 / 2017-06-12
+
+* Enhancements
+
+  * Remove deprec warning on mysql2 - thanks @Paxa ! https://github.com/seamusabshere/database_url/pull/3
+
 0.1.1 / 2014-10-28
 
 * Bug fixes

data/lib/database_url.rb

@@ -6,7 +6,13 @@ require 'cgi'
 module DatabaseUrl
   class << self
     def to_active_record_hash(url = nil)
-      to_hash ACTIVE_RECORD_FIELD_MAP, url
+      result_hash = to_hash ACTIVE_RECORD_FIELD_MAP, url
+
+      if result_hash[:adapter] == 'mysql2'
+        result_hash[:username] = result_hash.delete(:user)
+      end
+
+      result_hash
     end
 
     def to_active_record_url(hash)

data/lib/database_url/version.rb

@@ -1,3 +1,3 @@
 module DatabaseUrl
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/database_url_spec.rb

@@ -45,6 +45,18 @@ describe DatabaseUrl do
         encoding: 'latin1',
       }
     end
+
+    it "builds config hashes for mysql2 without warnings" do
+      ENV['DATABASE_URL'] = "mysql2://user:xxx@127.0.0.1/dbname?encoding=utf8" # should be ignored!
+      DatabaseUrl.to_active_record_hash(ENV['DATABASE_URL']).should == {
+        adapter: 'mysql2',
+        host: '127.0.0.1',
+        database: 'dbname',
+        username: 'user',
+        password: 'xxx',
+        encoding: 'utf8',
+      }
+    end
   end
 
   describe 'Sequel' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_url
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Sequel/ActiveRecord-style
@@ -115,4 +115,3 @@ summary: Convert back and forth between Heroku-style ENV['DATABASE_URL'] and Seq
 test_files:
 - spec/database_url_spec.rb
 - spec/spec_helper.rb
-has_rdoc: