sinatra-activerecord 0.1.1 → 0.1.2

data/lib/sinatra/activerecord.rb

@@ -31,21 +31,22 @@ module Sinatra
 
     def database_options
       url = URI(database_url)
-      if url.scheme == "sqlite"
-        {
-          :adapter => "sqlite3",
-          :database => url.host
-        }
-      else
-        {
-          :adapter => url.scheme,
-          :host => url.host,
-          :port => url.port,
-          :database => url.path[1..-1],
-          :username => url.user,
-          :password => url.password
-        }
-      end.merge(database_extras)
+      options = {
+        :adapter => url.scheme,
+        :host => url.host,
+        :port => url.port,
+        :database => url.path[1..-1],
+        :username => url.user,
+        :password => url.password
+      }
+      case url.scheme
+      when "sqlite"
+        options[:adapter] = "sqlite3"
+        options[:database] = url.host
+      when "postgres"
+        options[:adapter] = "postgresql"
+      end
+      options.merge(database_extras)
     end
 
     def self.registered(app)

data/sinatra-activerecord.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra-activerecord'
-  s.version = '0.1.1'
+  s.version = '0.1.2'
   s.date = '2009-09-21'
 
   s.description = "Extends Sinatra with activerecord helpers for instant activerecord use"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Blake Mizerany