sinatra-activerecord 1.5.0 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 55dde46fae3e419004fc3d736d20cc9f3a264dfb
4
- data.tar.gz: cedff4d701cc24e94c1709cf9260a63b4173a72d
3
+ metadata.gz: cb9a14338fcc3e5dc4fd47cd79a86be5ea9fc4ce
4
+ data.tar.gz: 8fd2e7ca784a52bf2590bc9abc1c3b6e79a53b16
5
5
  SHA512:
6
- metadata.gz: d13de960d2b4110c257c2997227930e009f302523f0a69743d12b9fbb5ae53247b0cbdc8165f945263e1abdcbee474e4248d21f772b516061247521bc5152547
7
- data.tar.gz: 30137e9fe91ea7207c05db286bb94d691177dbbac6cd5d3255482627e912523ce7a6a1065f87fecd9d5f7ffac381cab265cd57f09f2878e84449e517e1e8e6ea
6
+ metadata.gz: ab447defb1e04039a6dedd71b1e5ff0cd34cb560efe95ca09585816a818084e43b0991350bb39d34927640cfd15900227b085ffd1cfabc1e1f71f0d3acab2c2c
7
+ data.tar.gz: 9c379ef5dea4ccd65f102ef6b11745b4e5d24f3dd1218470a062a4ff82b82db615b9050a17c70bca834b5a3ee229dc0a0cf8b81c0f8953abcb93187c6dc61cb1
@@ -20,15 +20,15 @@ module Sinatra
20
20
 
21
21
  def seed
22
22
  silence_activerecord do
23
- load("db/seeds.rb")
23
+ load("#{db_dir}/seeds.rb")
24
24
  end
25
25
  end
26
26
 
27
27
  def setup
28
28
  silence_activerecord do
29
- create()
30
- load_schema()
31
- seed()
29
+ create
30
+ load_schema
31
+ seed
32
32
  end
33
33
  end
34
34
 
@@ -64,7 +64,7 @@ module Sinatra
64
64
  end
65
65
  end
66
66
 
67
- def dump_schema(file_name = 'db/schema.rb')
67
+ def dump_schema(file_name = "#{db_dir}/schema.rb")
68
68
  silence_activerecord do
69
69
  ActiveRecord::Migration.suppress_messages do
70
70
  # Create file
@@ -78,7 +78,7 @@ module Sinatra
78
78
  end
79
79
  end
80
80
 
81
- def dump_structure(file_name = 'db/structure.sql')
81
+ def dump_structure(file_name = "#{db_dir}/structure.sql")
82
82
  ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, file_name)
83
83
  end
84
84
 
@@ -90,11 +90,11 @@ module Sinatra
90
90
  end
91
91
  end
92
92
 
93
- def load_schema(file_name = 'db/schema.rb')
93
+ def load_schema(file_name = "#{db_dir}/schema.rb")
94
94
  load(file_name)
95
95
  end
96
96
 
97
- def load_structure(file_name = 'db/structure.sql')
97
+ def load_structure(file_name = "#{db_dir}/structure.sql")
98
98
  ActiveRecord::Tasks::DatabaseTasks.structure_load(config, file_name)
99
99
  end
100
100
 
@@ -108,6 +108,14 @@ module Sinatra
108
108
  end
109
109
  end
110
110
 
111
+ def db_dir
112
+ ActiveRecord::Tasks::DatabaseTasks.db_dir ||= 'db'
113
+ end
114
+
115
+ def db_dir=(dir)
116
+ ActiveRecord::Tasks::DatabaseTasks.db_dir = dir
117
+ end
118
+
111
119
  private
112
120
 
113
121
  def config_environment(env = nil)
@@ -3,22 +3,22 @@ require 'rake'
3
3
  namespace :db do
4
4
  desc "create the database from config/database.yml from the current Sinatra env"
5
5
  task :create do
6
- Sinatra::ActiveRecordTasks.create()
6
+ Sinatra::ActiveRecordTasks.create
7
7
  end
8
8
 
9
9
  desc "drops the data from config/database.yml from the current Sinatra env"
10
10
  task :drop do
11
- Sinatra::ActiveRecordTasks.drop()
11
+ Sinatra::ActiveRecordTasks.drop
12
12
  end
13
13
 
14
14
  desc "load the seed data from db/seeds.rb"
15
15
  task :seed do
16
- Sinatra::ActiveRecordTasks.seed()
16
+ Sinatra::ActiveRecordTasks.seed
17
17
  end
18
18
 
19
19
  desc "create the database and load the schema"
20
20
  task :setup do
21
- Sinatra::ActiveRecordTasks.setup()
21
+ Sinatra::ActiveRecordTasks.setup
22
22
  end
23
23
 
24
24
  desc "create an ActiveRecord migration"
@@ -49,38 +49,38 @@ namespace :db do
49
49
  namespace :schema do
50
50
  desc "dump schema into file"
51
51
  task :dump do
52
- Sinatra::ActiveRecordTasks.dump_schema()
52
+ Sinatra::ActiveRecordTasks.dump_schema
53
53
  end
54
54
 
55
55
  desc "load schema into database"
56
56
  task :load do
57
- Sinatra::ActiveRecordTasks.load_schema()
57
+ Sinatra::ActiveRecordTasks.load_schema
58
58
  end
59
59
  end
60
60
 
61
61
  namespace :structure do
62
62
  desc "dump schema into a file as SQL"
63
63
  task :dump do
64
- Sinatra::ActiveRecordTasks.dump_structure()
64
+ Sinatra::ActiveRecordTasks.dump_structure
65
65
  end
66
66
 
67
67
  desc "load schema into database"
68
68
  task :load do
69
- Sinatra::ActiveRecordTasks.load_structure()
69
+ Sinatra::ActiveRecordTasks.load_structure
70
70
  end
71
71
  end
72
72
 
73
73
  namespace :test do
74
74
  task :purge do
75
75
  Sinatra::ActiveRecordTasks.with_config_environment 'test' do
76
- Sinatra::ActiveRecordTasks.purge()
76
+ Sinatra::ActiveRecordTasks.purge
77
77
  end
78
78
  end
79
79
 
80
80
  task :load => :purge do
81
81
  ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
82
82
  Sinatra::ActiveRecordTasks.with_config_environment 'test' do
83
- Sinatra::ActiveRecordTasks.load_schema()
83
+ Sinatra::ActiveRecordTasks.load_schema
84
84
  end
85
85
  end
86
86
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra-activerecord
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-03-20 00:00:00.000000000 Z
12
+ date: 2014-03-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sinatra