cloudcontrol-rails 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudcontrol-rails (0.0.4)
+    cloudcontrol-rails (0.0.5)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -6,7 +6,7 @@ Override empty database.yml settings with the ENV vars on the cloudControl platt
 
 Add the following to your gemfile
 ~~~
-gem "cloudcontrol-rails", :git => "git://github.com/Traxmaxx/cctrl_database_configuration.git"
+gem "cloudcontrol-rails"
 ~~~
 
 And run `bundle install`

data/cloudcontrol-rails.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'cloudcontrol-rails'
-  s.version       = "0.0.4"
-  s.authors       = ["Alexander Rösel"]
+  s.version       = "0.0.5"
+  s.authors       = ["Alexander Rösel", "Ivan Kusalic"]
   s.email         = ["info@netzok.net"]
   s.summary       = "Autoload MySQL and Postgres credentials from ENV vars on cloudControl"
   s.description   = "Use credentials set in ENV vars if database.yml credentials are empty. Supports MySQL and ElephantSQL (Postgres) on the cloudControl platform."

data/lib/cloudcontrol/mysql.rb

@@ -1,12 +1,19 @@
 module Cloudcontrol
-  def self.configure_mysql(config, rails_env)  # NOTE addons MySQLS and MySQLD
+  ADDON_KEYS = {  # NOTE addons MySQLS and MySQLD
+    'database' => %w[ MYSQLD_DATABASE MYSQLS_DATABASE ],
+    'host' => %w[ MYSQLD_HOST MYSQLS_HOSTNAME ],
+    'port' => %w[ MYSQLD_PORT MYSQLS_PORT ],
+    'username' => %w[ MYSQLD_USER MYSQLS_USERNAME ],
+    'password' => %w[ MYSQLD_PASSWORD MYSQLS_PASSWORD ],
+  }
+
+  def self.configure_mysql(config, rails_env)
     config[rails_env].each do |key, value|
       if value.nil?
-        if key == 'username'  # NOTE auto match breaks on username so we need to look for it manually
-          config[rails_env][key] = ENV['MYSQLD_USER'] || ENV['MYSQLS_USER'] || nil
-        else
-          config[rails_env][key] = ENV["MYSQLD_#{ key.upcase }"] || ENV["MYSQLS_#{ key.upcase }"] || nil
-        end
+        new_value = ADDON_KEYS[key].reduce(nil) { |acc, e| acc ||= ENV[e] }
+        new_value = new_value.to_i if key == 'port' && new_value
+
+        config[rails_env][key] = new_value
       end
     end
 

data/spec/database_configuration_spec.rb

@@ -5,9 +5,11 @@ require 'yaml'
 require 'spec_helper'
 require 'cloudcontrol/cloudcontrol'
 
+# TODO refactor using shared examples/contexts
+
 describe "Cloudcontrol" do
-  let(:db_config_dev) { [ adapter ] + [ 'env' ] * 5 }
-  let(:db_config_prod) { [ adapter ] + [ 'env' ] * 5 }
+  let(:db_config_dev) { [ adapter, 'env', 42, 'env', 'env', 'env' ] }
+  let(:db_config_prod) { [ adapter, 'env', 42, 'env', 'env', 'env' ] }
 
   let(:database_yml) do
     yml = <<END
@@ -47,7 +49,7 @@ end
     {
       "adapter" => adapter,
       "host" => 'env',
-      "port" => 'env',
+      "port" => 42,
       "database" => 'env',
       "username" => 'env',
       "password" => 'env',
@@ -57,13 +59,23 @@ end
   before do
     ENV = {
       'RAILS_ENV' => "production",
-      'MYSQLS_HOST' => "env",
-      'MYSQLS_PORT' => "env",
+      'MYSQLS_HOSTNAME' => "env",
+      'MYSQLS_PORT' => "42",
       'MYSQLS_DATABASE' => "env",
-      'MYSQLS_USER' => "env",
+      'MYSQLS_USERNAME' => "env",
       'MYSQLS_PASSWORD' => "env",
       'ELEPHANTSQL_URL' => 'postgres://env:env@env.env.env:42/env',
     }
+
+    #ENV = {  # TODO
+      #'RAILS_ENV' => "production",
+      #'MYSQLD_HOST' => "env",
+      #'MYSQLD_PORT' => "42",
+      #'MYSQLD_DATABASE' => "env",
+      #'MYSQLD_USER' => "env",
+      #'MYSQLD_PASSWORD' => "env",
+      #'ELEPHANTSQL_URL' => 'postgres://env:env@env.env.env:42/env',
+    #}
   end
 
   describe "MySQL" do
@@ -181,7 +193,7 @@ end
       end
 
       describe "for production" do
-        let(:db_config_prod) { [ adapter, 'host', '42', 'db', nil, nil ] }
+        let(:db_config_prod) { [ adapter, 'host', 42, 'db', nil, nil ] }
 
         it "should return proper value" do
           env = 'production'
@@ -195,7 +207,7 @@ end
       end
 
       describe "for development" do
-        let(:db_config_dev) { [ adapter, 'host', '42', 'db', nil, nil ] }
+        let(:db_config_dev) { [ adapter, 'host', 42, 'db', nil, nil ] }
 
         it "should return proper value" do
           env = 'development'
@@ -210,7 +222,7 @@ end
     end
 
     describe "with fully provided values" do
-      let(:db_config_prod) { [ adapter, 'host', '42', 'db', 'username', 'pass' ] }
+      let(:db_config_prod) { [ adapter, 'host', 42, 'db', 'username', 'pass' ] }
       let(:expected_res) do
         {
           "adapter"=>adapter,

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cloudcontrol-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
 - Alexander Rösel
+- Ivan Kusalic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies: []
 description: Use credentials set in ENV vars if database.yml credentials are empty.
   Supports MySQL and ElephantSQL (Postgres) on the cloudControl platform.