sinatra-activerecord 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55dde46fae3e419004fc3d736d20cc9f3a264dfb
-  data.tar.gz: cedff4d701cc24e94c1709cf9260a63b4173a72d
+  metadata.gz: cb9a14338fcc3e5dc4fd47cd79a86be5ea9fc4ce
+  data.tar.gz: 8fd2e7ca784a52bf2590bc9abc1c3b6e79a53b16
 SHA512:
-  metadata.gz: d13de960d2b4110c257c2997227930e009f302523f0a69743d12b9fbb5ae53247b0cbdc8165f945263e1abdcbee474e4248d21f772b516061247521bc5152547
-  data.tar.gz: 30137e9fe91ea7207c05db286bb94d691177dbbac6cd5d3255482627e912523ce7a6a1065f87fecd9d5f7ffac381cab265cd57f09f2878e84449e517e1e8e6ea
+  metadata.gz: ab447defb1e04039a6dedd71b1e5ff0cd34cb560efe95ca09585816a818084e43b0991350bb39d34927640cfd15900227b085ffd1cfabc1e1f71f0d3acab2c2c
+  data.tar.gz: 9c379ef5dea4ccd65f102ef6b11745b4e5d24f3dd1218470a062a4ff82b82db615b9050a17c70bca834b5a3ee229dc0a0cf8b81c0f8953abcb93187c6dc61cb1

data/lib/sinatra/activerecord/rake.rb

@@ -20,15 +20,15 @@ module Sinatra
 
     def seed
       silence_activerecord do
-        load("db/seeds.rb")
+        load("#{db_dir}/seeds.rb")
       end
     end
 
     def setup
       silence_activerecord do
-        create()
-        load_schema()
-        seed()
+        create
+        load_schema
+        seed
       end
     end
 
@@ -64,7 +64,7 @@ module Sinatra
       end
     end
 
-    def dump_schema(file_name = 'db/schema.rb')
+    def dump_schema(file_name = "#{db_dir}/schema.rb")
       silence_activerecord do
         ActiveRecord::Migration.suppress_messages do
           # Create file
@@ -78,7 +78,7 @@ module Sinatra
       end
     end
 
-    def dump_structure(file_name = 'db/structure.sql')
+    def dump_structure(file_name = "#{db_dir}/structure.sql")
       ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, file_name)
     end
 
@@ -90,11 +90,11 @@ module Sinatra
       end
     end
 
-    def load_schema(file_name = 'db/schema.rb')
+    def load_schema(file_name = "#{db_dir}/schema.rb")
       load(file_name)
     end
 
-    def load_structure(file_name = 'db/structure.sql')
+    def load_structure(file_name = "#{db_dir}/structure.sql")
       ActiveRecord::Tasks::DatabaseTasks.structure_load(config, file_name)
     end
 
@@ -108,6 +108,14 @@ module Sinatra
       end
     end
 
+    def db_dir
+      ActiveRecord::Tasks::DatabaseTasks.db_dir ||= 'db'
+    end
+
+    def db_dir=(dir)
+      ActiveRecord::Tasks::DatabaseTasks.db_dir = dir
+    end
+
     private
 
     def config_environment(env = nil)

data/lib/sinatra/activerecord/tasks.rake

@@ -3,22 +3,22 @@ require 'rake'
 namespace :db do
   desc "create the database from config/database.yml from the current Sinatra env"
   task :create do
-    Sinatra::ActiveRecordTasks.create()
+    Sinatra::ActiveRecordTasks.create
   end
 
   desc "drops the data from config/database.yml from the current Sinatra env"
   task :drop do
-    Sinatra::ActiveRecordTasks.drop()
+    Sinatra::ActiveRecordTasks.drop
   end
 
   desc "load the seed data from db/seeds.rb"
   task :seed do
-    Sinatra::ActiveRecordTasks.seed()
+    Sinatra::ActiveRecordTasks.seed
   end
 
   desc "create the database and load the schema"
   task :setup do
-    Sinatra::ActiveRecordTasks.setup()
+    Sinatra::ActiveRecordTasks.setup
   end
 
   desc "create an ActiveRecord migration"
@@ -49,38 +49,38 @@ namespace :db do
   namespace :schema do
     desc "dump schema into file"
     task :dump do
-      Sinatra::ActiveRecordTasks.dump_schema()
+      Sinatra::ActiveRecordTasks.dump_schema
     end
 
     desc "load schema into database"
     task :load do
-      Sinatra::ActiveRecordTasks.load_schema()
+      Sinatra::ActiveRecordTasks.load_schema
     end
   end
 
   namespace :structure do
     desc "dump schema into a file as SQL"
     task :dump do
-      Sinatra::ActiveRecordTasks.dump_structure()
+      Sinatra::ActiveRecordTasks.dump_structure
     end
 
     desc "load schema into database"
     task :load do
-      Sinatra::ActiveRecordTasks.load_structure()
+      Sinatra::ActiveRecordTasks.load_structure
     end
   end
 
   namespace :test do
     task :purge do
       Sinatra::ActiveRecordTasks.with_config_environment 'test' do
-        Sinatra::ActiveRecordTasks.purge()
+        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()
+        Sinatra::ActiveRecordTasks.load_schema
       end
     end
 

metadata

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