sinatra-activerecord 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2fbc07c0f9935460a455c4d0185a42f4ad58f2
-  data.tar.gz: 3ecba535d8d83ac4bf2abcd4a2c2c30dff1c32a2
+  metadata.gz: c737e07b8e8d9daddeff819892c5ad278036564b
+  data.tar.gz: 797f41088003b92ec1d44edfbcb57b2a9df18132
 SHA512:
-  metadata.gz: a92aaadbcedd03058ae6d7362bf20601ccb3082f73350375fa014aa693bdd762d3207124cc43d35cddba31c423f9e7507036a29e4c6afd8a61d518434f871bee
-  data.tar.gz: 05d38c9ead41262cd6a851688d9b3c0223fdf7c1c73c6d9a5fe481d2c0c6dca0c6afc81902415c9c221fc1da5390c8d065e1dca56c02428a4169f9771b643581
+  metadata.gz: a6a58243dc89f9e5faa22a5272950bc5cf007d29a5abbbacc70fc0ec5b93aa88ecf381cbb148984067802a9141fbe78ae5f06b4d1df7a3ce33b8ee5eef351e99
+  data.tar.gz: deca75897d21f51defb9f1ca72b610b201f2239972c6fd69b1f84792ee75229cf873ae6b617421828bf9db9fae33651806998285c54fe6cea36c2229383e9634

data/README.md

@@ -4,12 +4,6 @@ Extends [Sinatra](http://www.sinatrarb.com/) with extension methods and Rake
 tasks for dealing with an SQL database using the
 [ActiveRecord ORM](https://github.com/rails/rails/tree/master/activerecord).
 
-## ActiveRecord 4.1
-
-For ActiveRecord 4.1 use sinatra-activerecord `2.0.0.rc2`. I recommend upgrading
-even if you don't use ActiveRecord 4.1, because it includes *all* the Rake tasks
-that ActiveRecord has.
-
 ## Setup
 
 Put it in your `Gemfile`, along with the adapter of your database. For
@@ -28,11 +22,13 @@ connection:
 # app.rb
 require "sinatra/activerecord"
 
-set :database, "sqlite3:///foo.sqlite3"
+set :database, {adapter: "sqlite3", database: "foo.sqlite3"}
+# or set :database_file, "path/to/database.yml"
 ```
 
-Alternatively, you can set the database with a hash or a YAML file. Take a look at
-[this wiki](https://github.com/janko-m/sinatra-activerecord/wiki/Alternative-database-setup).
+If you have a `config/database.yml`, it will automatically be loaded, no need
+to specify it. Also, in production, the `$DATABASE_URL` environment variable
+will automatically be read as the database (if you haven't specified otherwise).
 
 Note that in **modular** Sinatra applications you will need to first register
 the extension:
@@ -55,17 +51,19 @@ In the Terminal test that it works:
 
 ```sh
 $ rake -T
-rake db:create                     # create the database from config/database.yml from the current Sinatra env
-rake db:create_migration           # create an ActiveRecord migration
-rake db:drop                       # drops the data from config/database.yml from the current Sinatra env
-rake db:migrate                    # migrate the database (use version with VERSION=n)
-rake db:migrate:reset              # drops and creates the database and then runs the migrations
-rake db:reset                      # drops and creates the database
-rake db:rollback                   # roll back the migration (use steps with STEP=n)
-rake db:schema:dump                # dump schema into file
-rake db:schema:load                # load schema into database
-rake db:seed                       # load the seed data from db/seeds.rb
-rake db:setup                      # create the database and load the schema
+rake db:create            # Create the database from DATABASE_URL or config/database.yml for the current Rails.env (use db:create:all to create all dbs in the config)
+rake db:create_migration  # Create a migration (parameters: NAME, VERSION)
+rake db:drop              # Drops the database using DATABASE_URL or the current Rails.env (use db:drop:all to drop all databases)
+rake db:fixtures:load     # Load fixtures into the current environment's database
+rake db:migrate           # Migrate the database (options: VERSION=x, VERBOSE=false)
+rake db:migrate:status    # Display status of migrations
+rake db:rollback          # Rolls the schema back to the previous version (specify steps w/ STEP=n)
+rake db:schema:dump       # Create a db/schema.rb file that can be portably used against any DB supported by AR
+rake db:schema:load       # Load a schema.rb file into the database
+rake db:seed              # Load the seed data from db/seeds.rb
+rake db:setup             # Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)
+rake db:structure:dump    # Dump the database structure to db/structure.sql
+rake db:version           # Retrieves the current schema version number
 ```
 
 And that's it, you're all set :)

data/lib/sinatra/activerecord.rb

@@ -18,7 +18,7 @@ module Sinatra
     def self.registered(app)
       app.set :database, ENV['DATABASE_URL'] if ENV['DATABASE_URL']
       app.set :database_file, "#{Dir.pwd}/config/database.yml" if File.exists?("#{Dir.pwd}/config/database.yml")
-      ActiveRecord::Base.logger = Logger.new(STDOUT)
+      ActiveRecord::Base.logger = Logger.new(STDOUT) unless defined?(Rake)
 
       app.helpers ActiveRecordHelper
 

data/lib/sinatra/activerecord/rake/activerecord_4.rb

@@ -15,5 +15,6 @@ ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   config.database_configuration = ActiveRecord::Base.configurations
 end
 
+Rake::Task["db:load_config"].clear
 Rake::Task.define_task("db:environment")
 Rake::Task["db:test:deprecated"].clear if Rake::Task.task_defined?("db:test:deprecated")

metadata

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