sinatra-activerecord 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7edc0684bddd8d0f9cc24239a89dc19361301dea
-  data.tar.gz: c51d1ade72ed09fda8477a1dc375aa33136eaa8c
+  metadata.gz: ebc762631ec940416f6da6a0556185e825435d19
+  data.tar.gz: 803dbda8bdd9f0d0337a1b5a76e498325b759d07
 SHA512:
-  metadata.gz: 8d5eef19d30808bb280a1eb32743e63224f678f2a8c646a5c88629d39e2e071821e4c72b3163263ba80c18fc6475a0f6816786d7822869459b4cc9cb3a18fbcf
-  data.tar.gz: 006139024a60db57dbb2967045aee49ef8819981b39599b4c281f7457982284268e740d0463034465795fe263b0d13f3e7d7a885c14f62fd845fbcb16e2fede8
+  metadata.gz: c549c27517bf69e71989ca6c0e538e69bf81f83876a3236ad5dcc65b48f3c5a276365ae2c46046b00fcbab7d5cdc9fdcf767a8b35f3b2ebb416ca668a8fbc1bd
+  data.tar.gz: e26325d3743f08312be6d94feeb67edd44864d1cbf4f1a22f25ae5c343ba8ce6632b9fe1b8a95bfb046303f5dfc8560a7a83f7a6b8a095d2564d513f37c34622

data/README.md

@@ -47,11 +47,15 @@ In the Terminal test that it works:
 
 ```sh
 $ rake -T
-rake db:create_migration  # create an ActiveRecord migration
-rake db:migrate           # migrate the database (use version with VERSION=n)
-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: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: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
 ```
 
 And that's it, you're all set :)

data/lib/sinatra/activerecord/rake.rb

@@ -78,14 +78,40 @@ module Sinatra
       end
     end
 
+    def purge
+      if config
+        ActiveRecord::Tasks::DatabaseTasks.purge(config)
+      else
+        raise ActiveRecord::ConnectionNotEstablished
+      end
+    end
+
     def load_schema(file_name = 'db/schema.rb')
       load(file_name)
     end
 
+    def with_config_environment(environment, &block)
+      previous_environment = config_environment
+      begin
+        config_environment(environment)
+        yield
+      ensure
+        config_environment(previous_environment)
+      end
+    end
+
     private
 
+    def config_environment(env = nil)
+      if env
+        @config_environment = env
+      else
+        @config_environment ||= Sinatra::Application.environment.to_s
+      end
+    end
+
     def config
-      ActiveRecord::Base.configurations[Sinatra::Application.environment.to_s]
+      ActiveRecord::Base.configurations[config_environment]
     end
 
     def migrations_dir

data/lib/sinatra/activerecord/tasks.rake

@@ -49,4 +49,24 @@ namespace :db do
       Sinatra::ActiveRecordTasks.load_schema()
     end
   end
+
+  namespace :test do
+    task :purge do
+      Sinatra::ActiveRecordTasks.with_config_environment 'test' do
+        Sinatra::ActiveRecordTasks.purge()
+      end
+    end
+
+    task :load => :purge do
+      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+      Sinatra::ActiveRecordTasks.with_config_environment 'test' do
+        Sinatra::ActiveRecordTasks.load_schema()
+      end
+    end
+
+    desc 'Prepare test database from development schema'
+    task :prepare do
+      Rake::Task["db:test:load"].invoke
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra