sinatra-activerecord 1.1.1 → 1.1.2

data/README.md

@@ -29,10 +29,13 @@ Now specify the database in your `app.rb`
 require 'sinatra'
 require 'sinatra/activerecord'
 
-set :database, 'sqlite:///foo.db'
+set :database, 'sqlite3:///foo.db'
 ```
 
-Note that in **modular** Sinatra applications (ones in which you explicitly
+Note that the database URL here has **3** slashes. This is the difference from
+<= 1.0.0 versions, where it was typed with 2 slashes.
+
+Also note that in **modular** Sinatra applications (ones in which you explicitly
 subclass `Sinatra::Base`), you will need to manually add the line:
 
 ```ruby
@@ -48,7 +51,7 @@ require './app'
 
 In the Terminal test that it works:
 
-```
+```sh
 $ rake -T
 rake db:create_migration  # create an ActiveRecord migration in ./db/migrate
 rake db:migrate           # migrate your database
@@ -56,7 +59,7 @@ rake db:migrate           # migrate your database
 
 Now you can create a migration:
 
-```
+```sh
 $ rake db:create_migration NAME=create_users
 ```
 
@@ -78,7 +81,7 @@ end
 
 After you've written the migration, migrate the database:
 
-```
+```sh
 $ rake db:migrate
 ```
 
@@ -130,6 +133,10 @@ You can see the changelog
 
 This gem was made in 2009 by Blake Mizerany, one of the authors of Sinatra.
 
+## Social
+
+You can follow me on Twitter, I'm [@m_janko](http://twitter.com/m_janko).
+
 ## License
 
 [MIT](https://github.com/janko-m/sinatra-activerecord/blob/master/LICENSE)

data/lib/sinatra/activerecord.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'active_record'
 require 'logger'
+require 'active_support/core_ext/string/strip'
 
 module Sinatra
   module ActiveRecordHelper
@@ -19,7 +20,7 @@ module Sinatra
     def database
       @database ||= begin
         ActiveRecord::Base.logger = activerecord_logger
-        spec = database_url.is_a?(String) ? database_url.sub(/^sqlite:/, "sqlite3:") : database_url
+        spec = resolve_spec(database_url)
         ActiveRecord::Base.establish_connection(spec)
         ActiveRecord::Base
       end
@@ -37,6 +38,22 @@ module Sinatra
       app.before { ActiveRecord::Base.verify_active_connections! }
       app.after  { ActiveRecord::Base.clear_active_connections! }
     end
+
+  private
+
+    def resolve_spec(database_url)
+      if database_url.is_a?(String)
+        if database_url =~ %r{^sqlite3?://[A-Za-z_-]+\.(db|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:")
+      else
+        database_url
+      end
+    end
   end
 
   register ActiveRecordExtension

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -44,48 +44,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,10 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 description: Extends Sinatra with ActiveRecord helpers.
 email: janko.marohnic@gmail.com
 executables: []
@@ -127,6 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2180039102864061955
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23