heroku_external_db 1.0.1 → 1.0.3

data/.gitignore

@@ -0,0 +1,42 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2-p180@heroku_external_db --create

data/Gemfile

@@ -1,16 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'http://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rspec", ">= 2.4.0"
-  gem "rcov"
-  gem "mocha"
-  gem "rails", "~> 3.0.0"
-end
+# Specify your gem's dependencies in heroku_external_db.gemspec
+gemspec

data/Gemfile.lock

@@ -1,96 +1,111 @@
+PATH
+  remote: .
+  specs:
+    heroku_external_db (1.0.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.10)
-      rake
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.0.3)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.7.0)
     shoulda (2.11.3)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  heroku_external_db!
   mocha
-  rails (~> 3.0.0)
+  rails (>= 3.0.0)
   rcov
   rspec (>= 2.4.0)
   shoulda

data/LICENSE.txt

@@ -1,5 +1,7 @@
 Copyright (c) 2011 Nat Budin
 
+(The MIT License)
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including

data/README.rdoc

@@ -6,18 +6,128 @@ Allows you to easily set up one or more external databases in Rails applications
 * You want to share a database between applications and aren't on the Heroku dedicated database plan.
 * You want to host your application database somewhere besides Heroku, and run the app using Heroku dynos.
 
-== Usage
+== Installation
 
 Add the following to your Gemfile:
 
   gem 'heroku_external_db'
+  # Or with the version number (easily found at https://rubygems.org/gems/heroku_external_db)
+  gem 'heroku_external_db', '~> x.y.z'
   
 Then run:
   
   bundle install
   rails generate heroku_external_db:generator
 
-This will set up a default initializer in your app's config/initializers/heroku_external_db.rb.  This makes the assumption that you're happy with using EXTERNAL_DATABASE_URL and (optionally) EXTERNAL_DATABASE_CA as your environment variables and that you want to use the external database as your main production DB.  If that's not true, please edit the initializer as needed.
+This will set up a default initializer in your app's +config/initializers/heroku_external_db.rb+.
+
+NOTE: If the generator does not work on your setup, you can copy the initializer by hand.
+
+== Tutorial
+
+The generator makes the assumption that you're happy with using +EXTERNAL_DATABASE_URL+ and (optionally) +EXTERNAL_DATABASE_CA+ as your environment variables and that you want to use the external database as your main production DB.  If that's not true, please edit the initializer as needed.
+
+=== Example: MySQL with a CA Certificate
+
+In this example, we are setting up a connection to an external MySQL server using the default initializer.
+
+What we have:
+
+* A CA certificate called +ca-cert.pem+
+* A database is available at mysql://username:password@server/dbname (where +username+, +password+, +server+, and +dbname+ are the appropriate values for our server)
+* Other security, e.g. firewalls.  Please make sure to open the appropriate ports and grant the necessary access for your database to be available externally.  Further discussion is outside the scope of this document, but for accessing EC2, you might start at http://devcenter.heroku.com/articles/external-services.
+
+First, we configure Heroku with the appropriate environment variables:
+
+  # You may have to specify the app name or remote name here via --app or --remote, respectively
+  heroku config:add EXTERNAL_DATABASE_CA='ca-cert.pem'
+  heroku config:add EXTERNAL_DATABASE_URL='mysql://username:password@server/dbname'
+
+By default, +heroku_external_db+ looks for the CA cert in +config/ca+, so we need to commit it:
+
+  mkdir -p config/ca
+  cp path/to/ca-cert.pem config/ca
+  git add config/ca
+  git commit -v # Using -v since we want to make sure the contents are what we expect (e.g. not a private key)
+
+Additionally, we need the +mysql+ gem in our Gemfile since we are setting up a MySQL server:
+
+  echo "gem 'mysql', '~> 2.8.1'" >> Gemfile
+  bundle install # Need Gemfile.lock too
+
+Keep in mind that Heroku installs its own +database.yml+ for Rails apps and we have to install +pg+ as well.  Unfortunately, shared databases are mandatory (but are free).
+
+  $ heroku addons:remove shared-database:5mb
+  -----> Removing shared-database:5mb from our-app... failed
+   !     Shared databases cannot be removed
+
+PostgreSQL may still be useful to you if, for example, you want to have feature toggles in a local database, but the main data kept externally.  However in our case, it also means all developers will need MySQL and PostgreSQL running locally, which is unfortunate.
+
+One workaround is only installing +pg+ in production:
+
+  # File: Gemfile
+
+  # *Only* needed on production.
+  group :production do
+    gem 'pg', '~> 0.11.0' # Regardless of whether you plan to use the database or not, Heroku requires you have 'pg' installed.
+  end
+
+Then +bundle+ like so:
+
+  $ bundle install --without production
+
+With our gems updated, commit:
+
+  git commit -av # Commit Gemfile and Gemfile.lock
+
+Another option may be overriding +database.yml+ somehow, although it would add complexity.  For more info, please see http://stackoverflow.com/questions/4204724/strategies-for-overriding-database-yml.
+
+With our dependencies out of the way, we can move on to testing the connection.
+
+If you are making a new application, you may wish to have a simple MVC for testing that the connection works.  E.g., for a blog style application with posts do:
+
+  rails generate scaffold post
+  # NOTE you probably want to change the default "Post.all" to "Post.limit(5)" or something similar
+  git add .
+  git commit # ...
+  # Don't forget to set a default route, etc.
+
+With all these changes committed, we can deploy to our Heroku app:
+
+  git push heroku master # Your remote may be different
+
+Now, since we are connecting to an existing database, we don't need to run any migrations.  (Keep in mind that when sharing a database, it is best to have one authoritative source for migrations to live.)  If in your situation you're creating a new database, you may need to do that, run migrations, seed the database, etc at this point.
+
+Open http://our-app.heroku.com and we should see our data.  If you happen to run into a problem, please check the logs first:
+
+  heroku logs --tail # Again, you may need to specify an app
+
+If you are having a problem, a good starting point is double checking your passwords, usernames, security settings, etc.
+
+=== Example: MySQL with X.509
+
+The process is very much the same as the above example, except two extra environment variables and files are required.  Below are the extra steps.
+
+What we have:
+
+* A CA certificate called +ca-cert.pem+
+* A client certificate called +client-cert.pem+
+* A client key called +client-key.pem+
+
+First, we configure Heroku with the appropriate environment variables:
+
+  heroku config:add EXTERNAL_DATABASE_CA='ca-cert.pem'
+  heroku config:add EXTERNAL_DATABASE_CERT='client-cert.pem'
+  heroku config:add EXTERNAL_DATABASE_KEY='client-key.pem'
+
+By default, +heroku_external_db+ looks for the files in +config/ca+, so we need to commit them:
+
+  mkdir -p config/ca
+  cp path/to/ca-cert.pem path/to/client-cert.pem path/to/client-key.pem config/ca
+  git add config/ca
+  git commit
+
+The rest of the process is the same as in "MySQL with a CA Certificate".
 
 == Contributing to heroku_external_db
  
@@ -29,8 +139,11 @@ This will set up a default initializer in your app's config/initializers/heroku_
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+=== Setting up Environment and Running Specs
 
-Copyright (c) 2011 Nat Budin. See LICENSE.txt for
-further details.
+  ./configure
+  rake
+
+== Copyright
 
+Copyright (c) 2011 Nat Budin. See LICENSE.txt for further details.

data/Rakefile

@@ -1,36 +1,7 @@
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/gem_tasks'
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "heroku_external_db"
-  gem.homepage = "http://github.com/nbudin/heroku_external_db"
-  gem.license = "MIT"
-  gem.summary = %Q{Makes it easy to connect Heroku apps to external databases}
-  gem.description = <<-DESC
-  heroku_external_db lets you specify multiple databases using Heroku-style DATABASE_URL parameters, wire
-  them up to different ActiveRecord configurations, and automatically configure it from the Rails
-  environment.  It also adds support for the :sslca configuration parameter so you can talk to external
-  MySQL servers over SSL.
-  DESC
-  gem.email = "natbudin@gmail.com"
-  gem.authors = ["Nat Budin"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require "rspec/core/rake_task"
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|

data/configure

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+gem install bundler --version "~> 1.0" --no-rdoc --no-ri
+bundle install

data/heroku_external_db.gemspec

@@ -1,81 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{heroku_external_db}
-  s.version = "1.0.1"
+Gem::Specification.new do |gem|
+  gem.version       = "1.0.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nat Budin"]
-  s.date = %q{2011-07-06}
-  s.description = %q{  heroku_external_db lets you specify multiple databases using Heroku-style DATABASE_URL parameters, wire
+  gem.authors       = ["Nat Budin", "Ben Oakes"]
+  gem.email         = ["natbudin@gmail.com", "hello@benjaminoakes.com"]
+  gem.description   = %q{  heroku_external_db lets you specify multiple databases using Heroku-style DATABASE_URL parameters, wire
   them up to different ActiveRecord configurations, and automatically configure it from the Rails
   environment.  It also adds support for the :sslca configuration parameter so you can talk to external
   MySQL servers over SSL.
 }
-  s.email = %q{natbudin@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "heroku_external_db.gemspec",
-    "init.rb",
-    "lib/generators/heroku_external_db/USAGE",
-    "lib/generators/heroku_external_db/heroku_external_db_generator.rb",
-    "lib/generators/heroku_external_db/templates/initializer.rb",
-    "lib/heroku_external_db.rb",
-    "rails/init.rb",
-    "spec/heroku_external_db_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/nbudin/heroku_external_db}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Makes it easy to connect Heroku apps to external databases}
-  s.test_files = [
-    "spec/heroku_external_db_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  gem.summary       = %q{Makes it easy to connect Heroku apps to external databases}
+  gem.homepage      = %q{http://github.com/nbudin/heroku_external_db}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "heroku_external_db"
+  gem.require_paths = ["lib"]
+  gem.licenses      = ["MIT"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rspec>, [">= 2.4.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rspec>, [">= 2.4.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rspec>, [">= 2.4.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
-  end
+  gem.add_development_dependency "shoulda", ">= 0"
+  gem.add_development_dependency "rspec", ">= 2.4.0"
+  gem.add_development_dependency "rcov"
+  gem.add_development_dependency "mocha"
+  gem.add_development_dependency "rails", ">= 3.0.0"
 end
-

data/lib/heroku_external_db.rb

@@ -76,15 +76,27 @@ module HerokuExternalDb
     # Returns a partial ActiveRecord configuration hash for the given SSL CA certificate.
     # Checks to make sure the given filename actually exists, and raises an error if it
     # does not.
-    def db_ca_configuration(ca_filename)
-      return {} unless ca_filename
-    
-      raise "ca_path for #{ca_filename} cannot be determined from Rails root; please set it explicitly" unless ca_path
-      
-      ca_filepath = File.join(ca_path, ca_filename)
-      raise "CA file #{ca_filepath} does not exist!" unless File.exists?(ca_filepath)
+    def db_configuration(opts)
+      return {} unless opts
+      raise "ca_path for #{opts.inspect} cannot be determined from Rails root; please set it explicitly" unless ca_path
+
+      config = {}
+
+      [
+        :sslca,
+
+        # Needed when using X.509
+        :sslcert,
+        :sslkey,
+      ].each do |k|
+        if value = opts[k]
+          filepath = File.join(ca_path, value)
+          raise "File #{filepath.inspect} does not exist!" unless File.exists?(filepath)
+          config[k] = filepath
+        end
+      end
     
-      return { :sslca => ca_filepath }
+      return config
     end
   
     # Returns an ActiveRecord configuration hash based on the environment variables.
@@ -94,7 +106,11 @@ module HerokuExternalDb
         config = parse_db_uri(ENV["#{env_prefix}_DATABASE_URL"])
     
         if ENV["#{env_prefix}_DATABASE_CA"]
-          config.merge!(db_ca_configuration(ENV["#{env_prefix}_DATABASE_CA"]))
+          config.merge!(db_configuration({
+            :sslca => ENV["#{env_prefix}_DATABASE_CA"],
+            :sslcert => ENV["#{env_prefix}_DATABASE_CERT"],
+            :sslkey => ENV["#{env_prefix}_DATABASE_KEY"],
+          }))
         end
       
         config
@@ -118,4 +134,4 @@ module HerokuExternalDb
       end
     end
   end
-end
+end

data/spec/heroku_external_db_spec.rb

@@ -74,24 +74,59 @@ describe HerokuExternalDb::Configuration do
     end
   end
   
-  describe "#db_ca_configuration" do
+  describe "#db_configuration" do
+    # Help make a "mock" certificate file
+    def mock_cert(name)
+      path = Tempfile.new(name).path
+      ca_path, cert_filename = File.split(path)
+      return path, cert_filename
+    end
+
     context "with a CA path" do
       before do
         @cert_path, @cert_filename = setup_ca_cert(@extdb)
       end
       
       it "should return an empty hash if not given a filename" do
-        @extdb.db_ca_configuration(nil).should == {}
+        @extdb.db_configuration(nil).should == {}
       end
     
       it "should have the correct pathname to the CA cert" do
-        @config = @extdb.db_ca_configuration(@cert_filename)
+        @config = @extdb.db_configuration(:sslca => @cert_filename)
         @config[:sslca].should == @cert_path
       end
+
+      context 'when using X.509' do
+        it "should have the correct pathname to the client cert" do
+          @config = @extdb.db_configuration(:sslcert => @cert_filename)
+          @config[:sslcert].should == @cert_path
+        end
+
+        it "should have the correct pathname to the client key" do
+          @config = @extdb.db_configuration(:sslkey => @cert_filename)
+          @config[:sslkey].should == @cert_path
+        end
+
+        it 'should support setting all 3 X.509 certs' do
+          ca_cert_path, ca_cert_filename = mock_cert("ca-cert.pem")
+          client_cert_path, client_cert_filename = mock_cert("client-cert.pem")
+          client_key_path, client_key_filename = mock_cert("client-key.pem")
+
+          @config = @extdb.db_configuration({
+            :sslca => ca_cert_filename,
+            :sslcert => client_cert_filename,
+            :sslkey => client_key_filename,
+          })
+
+          @config[:sslca].should == ca_cert_path
+          @config[:sslcert].should == client_cert_path
+          @config[:sslkey].should == client_key_path
+        end
+      end
     
       it "should throw an error if the file doesn't exist" do
         File.delete(@cert_path)
-        lambda { @extdb.db_ca_configuration(@cert_filename) }.should raise_error
+        lambda { @extdb.db_configuration(:sslca => @cert_filename) }.should raise_error
       end
     
       after do
@@ -101,11 +136,11 @@ describe HerokuExternalDb::Configuration do
     
     context "without a CA path" do
       it "should return an empty hash if not given a filename" do
-        @extdb.db_ca_configuration(nil).should == {}
+        @extdb.db_configuration(nil).should == {}
       end
       
       it "should raise an error if given a filename" do
-        lambda { @extdb.db_ca_configuration("filename") }.should raise_error
+        lambda { @extdb.db_configuration(:sslca => "filename") }.should raise_error
       end
     end
   end
@@ -230,4 +265,4 @@ describe HerokuExternalDb::Configuration do
       ENV.delete("EXTERNAL_DATABASE_URL")
     end
   end
-end
+end

metadata

@@ -1,112 +1,113 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_external_db
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Nat Budin
+- Ben Oakes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -04:00
+date: 2011-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
         version: 2.4.0
   type: :development
-  prerelease: false
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :development
-  prerelease: false
-  version_requirements: *id007
+  version_requirements: *id005
 description: "  heroku_external_db lets you specify multiple databases using Heroku-style DATABASE_URL parameters, wire\n  them up to different ActiveRecord configurations, and automatically configure it from the Rails\n  environment.  It also adds support for the :sslca configuration parameter so you can talk to external\n  MySQL servers over SSL.\n"
-email: natbudin@gmail.com
+email: 
+- natbudin@gmail.com
+- hello@benjaminoakes.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- configure
 - heroku_external_db.gemspec
 - init.rb
 - lib/generators/heroku_external_db/USAGE
@@ -130,7 +131,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -147050405772207697
       segments: 
       - 0
       version: "0"
@@ -139,11 +139,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Makes it easy to connect Heroku apps to external databases