sinatra-activerecord 1.2.1 → 1.2.2

data/lib/sinatra/activerecord.rb

@@ -29,17 +29,15 @@ module Sinatra
     def database_file=(path)
       require 'pathname'
 
-      return if app_file.nil?
-      path = File.join(File.dirname(app_file), path) if Pathname.new(path).relative?
+      return if root.nil?
+      path = File.join(root, path) if Pathname.new(path).relative?
 
       if File.exists?(path)
         require 'yaml'
         require 'erb'
 
         database_hash = YAML.load(ERB.new(File.read(path)).result) || {}
-        if %w[development test production].any? { |env| database_hash[env] }
-          database_hash = database_hash[environment.to_s]
-        end
+        database_hash = database_hash[environment.to_s] if database_hash[environment.to_s]
         set :database, database_hash
       end
     end
@@ -60,17 +58,17 @@ module Sinatra
 
     private
 
-    def resolve_spec(database_url)
-      if database_url.is_a?(String)
-        if database_url =~ %r{^sqlite3?://[^/]+$}
+    def resolve_spec(database_spec)
+      if database_spec.is_a?(String)
+        if database_spec =~ %r{^sqlite3?://[^/]+$}
           warn <<-MESSAGE.strip_heredoc
             It seems your database URL looks something like this: "sqlite3://<database_name>".
             This doesn't work anymore, you need to use 3 slashes, like this: "sqlite3:///<database_name>".
           MESSAGE
         end
-        database_url.sub(/^sqlite:/, "sqlite3:")
+        database_spec.sub(/^sqlite:/, "sqlite3:")
       else
-        database_url
+        database_spec
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-12 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: -6445329919965563
+      hash: -897588111
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23