sinatra-activerecord 1.1.0 → 1.1.1

data/README.md

@@ -21,14 +21,32 @@ them manually):
 - `mysql` (MySQL)
 - `pg` (PostgreSQL)
 
-Then require the rake tasks and your app in your `Rakefile`:
+Now specify the database in your `app.rb`
+(let's assume you chose the `sqlite3` adapter):
+
+```ruby
+# app.rb
+require 'sinatra'
+require 'sinatra/activerecord'
+
+set :database, 'sqlite:///foo.db'
+```
+
+Note that in **modular** Sinatra applications (ones in which you explicitly
+subclass `Sinatra::Base`), you will need to manually add the line:
+
+```ruby
+register Sinatra::ActiveRecordExtension
+```
+
+Now require the rake tasks and your app in your `Rakefile`:
 
 ```ruby
 require 'sinatra/activerecord/rake'
 require './app'
 ```
 
-In the terminal, test that it works:
+In the Terminal test that it works:
 
 ```
 $ rake -T
@@ -73,24 +91,10 @@ end
 ```
 
 You can put the models anywhere. It's probably best to put them in an
-external file, and require them in your `app.rb` aftewards. Usually
+external file, and require them in your `app.rb`. Usually
 models in Sinatra aren't that complex, so you can put them all in one
 file, for example `./db/models.rb`.
 
-Now just establish the database connection in your `app.rb`
-(let's assume you chose the `sqlite3` adapter), and
-require the models if necessary:
-
-```ruby
-# app.rb
-require 'sinatra'
-require 'sinatra/activerecord'
-
-require './db/models'
-
-set :database, 'sqlite:///foo.db'
-```
-
 Now everything just works:
 
 ```ruby

data/lib/sinatra/activerecord.rb

@@ -12,14 +12,15 @@ module Sinatra
   module ActiveRecordExtension
     def database=(url)
       set :database_url, url
+      @database = nil
       database
     end
 
     def database
       @database ||= begin
         ActiveRecord::Base.logger = activerecord_logger
-        url = database_url.sub(/^sqlite/, "sqlite3") rescue nil
-        ActiveRecord::Base.establish_connection(url)
+        spec = database_url.is_a?(String) ? database_url.sub(/^sqlite:/, "sqlite3:") : database_url
+        ActiveRecord::Base.establish_connection(spec)
         ActiveRecord::Base
       end
     end

data/lib/sinatra/activerecord/rake.rb

@@ -1 +1,59 @@
-load 'sinatra/activerecord/rake_tasks.rake'
+require 'active_record'
+require 'active_support/core_ext/string/strip'
+require 'fileutils'
+
+module Sinatra
+  module ActiveRecordTasks
+    extend self
+
+    def create_migration(migration_name, version = nil)
+      raise "No NAME specified. Example usage: `rake db:create_migration NAME=create_users`" if migration_name.nil?
+
+      migration_number = version || Time.now.utc.strftime("%Y%m%d%H%M%S")
+      migration_file = File.join(migrations_dir, "#{migration_number}_#{migration_name}.rb")
+      migration_class = migration_name.split("_").map(&:capitalize).join
+
+      FileUtils.mkdir_p(migrations_dir)
+      File.open(migration_file, 'w') do |file|
+        file.write <<-MIGRATION.strip_heredoc
+          class #{migration_class} < ActiveRecord::Migration
+            def up
+            end
+
+            def down
+            end
+          end
+        MIGRATION
+      end
+    end
+
+    def migrate(version = nil)
+      silence_activerecord do
+        migration_version = version ? version.to_i : version
+        ActiveRecord::Migrator.migrate(migrations_dir, migration_version)
+      end
+    end
+
+    def rollback(step = nil)
+      silence_activerecord do
+        migration_step = step ? step.to_i : 1
+        ActiveRecord::Migrator.rollback(migrations_dir, migration_step)
+      end
+    end
+
+    private
+
+    def migrations_dir
+      "db/migrate"
+    end
+
+    def silence_activerecord(&block)
+      old_logger = ActiveRecord::Base.logger
+      ActiveRecord::Base.logger = nil
+      yield if block_given?
+      ActiveRecord::Base.logger = old_logger
+    end
+  end
+end
+
+load 'sinatra/activerecord/tasks.rake'

data/lib/sinatra/activerecord/tasks.rake

@@ -0,0 +1,18 @@
+require 'rake'
+
+namespace :db do
+  desc "create an ActiveRecord migration in ./db/migrate"
+  task :create_migration do
+    Sinatra::ActiveRecordTasks.create_migration(ENV["NAME"], ENV["VERSION"])
+  end
+
+  desc "migrate the database (use version with VERSION=n)"
+  task :migrate do
+    Sinatra::ActiveRecordTasks.migrate(ENV["VERSION"])
+  end
+
+  desc "roll back the migration (use steps with STEP=n)"
+  task :rollback do
+    Sinatra::ActiveRecordTasks.rollback(ENV["STEP"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70208111245800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208111245800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70208111244360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208111244360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70208111243500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70208111243500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70208111242040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70208111242040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70208111240560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +88,15 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70208111240560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Extends Sinatra with ActiveRecord helpers.
 email: janko.marohnic@gmail.com
 executables: []
@@ -76,7 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sinatra/activerecord/rake.rb
-- lib/sinatra/activerecord/rake_tasks.rake
+- lib/sinatra/activerecord/tasks.rake
 - lib/sinatra/activerecord.rb
 - README.md
 - LICENSE
@@ -99,12 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2210364565815214899
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extends Sinatra with ActiveRecord helpers.

data/lib/sinatra/activerecord/rake_tasks.rake

@@ -1,44 +0,0 @@
-require 'active_record'
-require 'active_support/core_ext/string/strip'
-require 'fileutils'
-
-namespace :db do
-  desc "create an ActiveRecord migration in ./db/migrate"
-  task :create_migration do
-    name = ENV['NAME']
-    if name.nil?
-      raise "No NAME specified. Example usage: `rake db:create_migration NAME=create_users`"
-    end
-
-    migrations_dir = File.join("db", "migrate")
-    version = ENV["VERSION"] || Time.now.utc.strftime("%Y%m%d%H%M%S")
-    filename = "#{version}_#{name}.rb"
-    migration_class = name.split("_").map(&:capitalize).join
-
-    FileUtils.mkdir_p(migrations_dir)
-
-    File.open(File.join(migrations_dir, filename), 'w') do |file|
-      file.write <<-MIGRATION.strip_heredoc
-        class #{migration_class} < ActiveRecord::Migration
-          def up
-          end
-
-          def down
-          end
-        end
-      MIGRATION
-    end
-  end
-
-  desc "migrate the database (use version with VERSION=n)"
-  task :migrate do
-    version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-    ActiveRecord::Migrator.migrate('db/migrate', version)
-  end
-
-  desc "rolls back the migration (use steps with STEP=n)"
-  task :rollback do
-    step = ENV["STEP"] ? ENV["STEP"].to_i : 1
-    ActiveRecord::Migrator.rollback('db/migrate', step)
-  end
-end