sinatra-activerecord 1.2.0 → 1.2.1

data/README.md

@@ -88,9 +88,8 @@ class User < ActiveRecord::Base
 end
 ```
 
-You can put your models anywhere you want. If you put them in a separate file,
-just remember to require the file, and to load the models **after** requiring
-`"sinatra/activerecord"`.
+You can put your models anywhere you want, only remember to require them if
+they're in a separate file, and that they're loaded after `require "sinatra/activerecord"`.
 
 Now everything just works:
 

data/lib/sinatra/activerecord.rb

@@ -11,8 +11,8 @@ module Sinatra
   end
 
   module ActiveRecordExtension
-    def database=(url)
-      set :database_url, url
+    def database=(spec)
+      set :database_spec, spec
       @database = nil
       database
     end
@@ -20,7 +20,7 @@ module Sinatra
     def database
       @database ||= begin
         ActiveRecord::Base.logger = activerecord_logger
-        ActiveRecord::Base.establish_connection(resolve_spec(database_url))
+        ActiveRecord::Base.establish_connection(resolve_spec(database_spec))
         ActiveRecord::Base.connection
         ActiveRecord::Base
       end
@@ -30,14 +30,16 @@ module Sinatra
       require 'pathname'
 
       return if app_file.nil?
-      path = File.join(app_file, path) if Pathname.new(path).relative?
+      path = File.join(File.dirname(app_file), path) if Pathname.new(path).relative?
 
       if File.exists?(path)
         require 'yaml'
         require 'erb'
 
         database_hash = YAML.load(ERB.new(File.read(path)).result) || {}
-        database_hash = database_hash[environment] if database_hash[environment]
+        if %w[development test production].any? { |env| database_hash[env] }
+          database_hash = database_hash[environment.to_s]
+        end
         set :database, database_hash
       end
     end
@@ -46,9 +48,9 @@ module Sinatra
 
     def self.registered(app)
       app.set :activerecord_logger, Logger.new(STDOUT)
-      app.set :database_url, ENV['DATABASE_URL']
+      app.set :database_spec, ENV['DATABASE_URL']
       app.set :database_file, "config/database.yml"
-      app.database if app.database_url
+      app.database if app.database_spec
       app.helpers ActiveRecordHelper
 
       # re-connect if database connection dropped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4164762021753065434
+      hash: -6445329919965563
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23