cloudcontrol-rails 0.0.5 → 0.0.6

data/cloudcontrol-rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'cloudcontrol-rails'
-  s.version       = "0.0.5"
+  s.version       = "0.0.6"
   s.authors       = ["Alexander Rösel", "Ivan Kusalic"]
   s.email         = ["info@netzok.net"]
   s.summary       = "Autoload MySQL and Postgres credentials from ENV vars on cloudControl"

data/lib/cloudcontrol/cloudcontrol.rb

@@ -2,9 +2,17 @@ require 'cloudcontrol/mysql'
 require 'cloudcontrol/postgres'
 
 module Cloudcontrol
+  def self.update_with_defaults(config, rails_env)
+    %W[ host port database username password ].each do |key|
+      config[rails_env][key] = nil
+    end
+  end
+
   def self.reconfigure_database_configuration(config)
     rails_env = ENV['RAILS_ENV'] || 'development'
 
+    update_with_defaults(config, rails_env) if config[rails_env].size == 1
+
     # set creds for the different adapters
     case config[rails_env]['adapter']
       when 'mysql2'

data/spec/database_configuration_spec.rb

@@ -5,11 +5,22 @@ require 'yaml'
 require 'spec_helper'
 require 'cloudcontrol/cloudcontrol'
 
-# TODO refactor using shared examples/contexts
+shared_examples "a configuration test" do |env|
+  it "should return proper value" do
+    other_env = (env == 'production') ? 'development' : 'production'
 
-describe "Cloudcontrol" do
-  let(:db_config_dev) { [ adapter, 'env', 42, 'env', 'env', 'env' ] }
-  let(:db_config_prod) { [ adapter, 'env', 42, 'env', 'env', 'env' ] }
+    ENV["RAILS_ENV"] = env
+
+    res = Cloudcontrol::reconfigure_database_configuration config
+    res[env].should include(expected_res)
+    res[other_env].should include(not_modified)
+  end
+end
+
+shared_examples "a database" do |env_vars|
+  let(:db_config_dev) { [ adapter, 'env.env.env', 42, 'env', 'env', 'env' ] }
+  let(:db_config_prod) { [ adapter, 'env.env.env', 42, 'env', 'env', 'env' ] }
+  let(:db_config) { db_config_dev + db_config_prod }
 
   let(:database_yml) do
     yml = <<END
@@ -36,9 +47,7 @@ production:
 END
 
     yml % db_config
-end
-
-  let(:db_config) { db_config_dev + db_config_prod }
+  end
 
   let(:config) do
     IO.stub!(:read).and_return database_yml
@@ -48,7 +57,7 @@ end
   let(:not_modified) do
     {
       "adapter" => adapter,
-      "host" => 'env',
+      "host" => 'env.env.env',
       "port" => 42,
       "database" => 'env',
       "username" => 'env',
@@ -57,189 +66,117 @@ end
   end
 
   before do
-    ENV = {
-      'RAILS_ENV' => "production",
-      'MYSQLS_HOSTNAME' => "env",
-      'MYSQLS_PORT' => "42",
-      'MYSQLS_DATABASE' => "env",
-      'MYSQLS_USERNAME' => "env",
-      'MYSQLS_PASSWORD' => "env",
-      'ELEPHANTSQL_URL' => 'postgres://env:env@env.env.env:42/env',
-    }
+    ENV = env_vars
+  end
+
+  describe "with only adapter" do
+    let(:expected_res) { not_modified }  # HACK
+    let(:db_config_prod) { [ adapter ] + [ nil] * 5 }
+    let(:database_yml) do
+      yml = <<END
+development:
+  adapter: %s
+  encoding: utf8
+  reconnect: false
+  pool: 5
+  host: %s
+  port: %s
+  database: %s
+  username: %s
+  password: %s
+production:
+  adapter: %s
+END
 
-    #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',
-    #}
+      yml % (db_config_dev + [ adapter ])
+    end
+
+    it_should_behave_like "a configuration test", 'production'
   end
 
-  describe "MySQL" do
-    let(:adapter) { 'mysql2' }
+  describe "without provided values" do
+    let(:expected_res) { not_modified }  # HACK
+    let(:db_config_prod) { [ adapter ] + [ nil] * 5 }
 
-    describe "without provided values" do
-      let(:db_config_prod) { [ adapter ] + [ nil] * 5 }
-      let(:expected_res) { not_modified }  # HACK
+    it_should_behave_like "a configuration test", 'production'
+  end
 
-      it "should return proper value" do
-        env = 'production'
-        ENV["RAILS_ENV"] = env
-        res = Cloudcontrol::reconfigure_database_configuration config
-        res[env].should include(expected_res)
-      end
+  describe "with partially provided values" do
+    let(:expected_res) do
+      {
+        "adapter"=>adapter,
+        "host"=>"host",
+        "port"=>42,
+        "database"=>"db",
+        "username"=>"env",
+        "password"=>"env"
+      }
     end
 
-    describe "with partially provided values" do
-      let(:expected_res) do
-        {
-          "adapter"=>adapter,
-          "host"=>"host",
-          "port"=>42,
-          "database"=>"db",
-          "username"=>"env",
-          "password"=>"env"
-        }
-      end
-
-      describe "for production" do
-        let(:db_config_prod) { [ adapter, 'host', '42', 'db', nil, nil ] }
-
-        it "should return proper value" do
-          env = 'production'
-          other_env = 'development'
-          ENV["RAILS_ENV"] = env
-
-          res = Cloudcontrol::reconfigure_database_configuration config
-          res[env].should include(expected_res)
-          res[other_env].should include(not_modified)
-        end
-      end
-
-      describe "for development" do
-        let(:db_config_dev) { [ adapter, 'host', '42', 'db', nil, nil ] }
-
-        it "should return proper value" do
-          env = 'development'
-          other_env = 'production'
-          ENV["RAILS_ENV"] = env
-
-          res = Cloudcontrol::reconfigure_database_configuration config
-          res[env].should include(expected_res)
-          res[other_env].should include(not_modified)
-        end
-      end
+    describe "for production" do
+      let(:db_config_prod) { [ adapter, 'host', 42, 'db', nil, nil ] }
+      it_should_behave_like "a configuration test", 'production'
     end
 
-    describe "with fully provided values" do
-      let(:db_config_prod) { [ adapter, 'host', '42', 'db', 'username', 'pass' ] }
-      let(:expected_res) do
-        {
-          "adapter"=>adapter,
-          "host"=>"host",
-          "port"=>42,
-          "database"=>"db",
-          "username"=>"username",
-          "password"=>"pass"
-        }
-      end
-
-      it "should return proper value" do
-        env = 'production'
-        ENV["RAILS_ENV"] = env
-        res = Cloudcontrol::reconfigure_database_configuration config
-        res[env].should include(expected_res)
-      end
+    describe "for development" do
+      let(:db_config_dev) { [ adapter, 'host', 42, 'db', nil, nil ] }
+      it_should_behave_like "a configuration test", 'development'
     end
   end
 
-  describe "PostgreSQL" do
-    let(:adapter) { 'postgresql' }
+  describe "with fully provided values" do
+    let(:db_config_prod) { [ adapter, 'host', 42, 'db', 'username', 'pass' ] }
+    let(:expected_res) do
+      {
+        "adapter"=>adapter,
+        "host"=>"host",
+        "port"=>42,
+        "database"=>"db",
+        "username"=>"username",
+        "password"=>"pass"
+      }
+    end
 
-    describe "without provided values" do
-      let(:db_config_prod) { [ adapter ] + [ nil] * 5 }
-      let(:expected_res) do
-        {
-          "adapter" => adapter,
-          "host" => 'env.env.env',
-          "port" => 42,
-          "database" => 'env',
-          "username" => 'env',
-          "password" => 'env',
-        }
-      end
-
-      it "should return proper value" do
-        env = 'production'
-        ENV["RAILS_ENV"] = env
-        res = Cloudcontrol::reconfigure_database_configuration config
-        res[env].should include(expected_res)
-      end
+    it_should_behave_like "a configuration test", 'production'
+  end
+end
+
+
+describe "Cloudcontrol" do
+  describe "MySQL" do
+    let(:adapter) { 'mysql2' }
+
+    describe "with MySQLs addon" do
+      it_should_behave_like "a database", {
+        'RAILS_ENV' => "production",
+        'MYSQLS_HOSTNAME' => "env.env.env",
+        'MYSQLS_PORT' => "42",
+        'MYSQLS_DATABASE' => "env",
+        'MYSQLS_USERNAME' => "env",
+        'MYSQLS_PASSWORD' => "env",
+      }
     end
 
-    describe "with partially provided values" do
-      let(:expected_res) do
-        {
-          "adapter"=>adapter,
-          "host"=>"host",
-          "port"=>42,
-          "database"=>"db",
-          "username"=>"env",
-          "password"=>"env"
-        }
-      end
-
-      describe "for production" do
-        let(:db_config_prod) { [ adapter, 'host', 42, 'db', nil, nil ] }
-
-        it "should return proper value" do
-          env = 'production'
-          other_env = 'development'
-          ENV["RAILS_ENV"] = env
-
-          res = Cloudcontrol::reconfigure_database_configuration config
-          res[env].should include(expected_res)
-          res[other_env].should include(not_modified)
-        end
-      end
-
-      describe "for development" do
-        let(:db_config_dev) { [ adapter, 'host', 42, 'db', nil, nil ] }
-
-        it "should return proper value" do
-          env = 'development'
-          other_env = 'production'
-          ENV["RAILS_ENV"] = env
-
-          res = Cloudcontrol::reconfigure_database_configuration config
-          res[env].should include(expected_res)
-          res[other_env].should include(not_modified)
-        end
-      end
+    describe "with MySQLd addon" do
+      it_should_behave_like "a database", {
+        'RAILS_ENV' => "production",
+        'MYSQLD_HOST' => "env.env.env",
+        'MYSQLD_PORT' => "42",
+        'MYSQLD_DATABASE' => "env",
+        'MYSQLD_USER' => "env",
+        'MYSQLD_PASSWORD' => "env",
+      }
     end
+  end
+
+  describe "PostgreSQL" do
+    let(:adapter) { 'postgresql' }
 
-    describe "with fully provided values" do
-      let(:db_config_prod) { [ adapter, 'host', 42, 'db', 'username', 'pass' ] }
-      let(:expected_res) do
-        {
-          "adapter"=>adapter,
-          "host"=>"host",
-          "port"=>42,
-          "database"=>"db",
-          "username"=>"username",
-          "password"=>"pass"
-        }
-      end
-
-      it "should return proper value" do
-        env = 'production'
-        ENV["RAILS_ENV"] = env
-        res = Cloudcontrol::reconfigure_database_configuration config
-        res[env].should include(expected_res)
-      end
+    describe "with ElephantSQL addon" do
+      it_should_behave_like "a database", {
+        'RAILS_ENV' => "production",
+        'ELEPHANTSQL_URL' => 'postgres://env:env@env.env.env:42/env',
+      }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudcontrol-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-02-22 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.
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Autoload MySQL and Postgres credentials from ENV vars on cloudControl