yaddl 0.0.5 → 0.0.6

Sign up to get free protection for your applications and to get access to all the features.
data/README.md CHANGED
@@ -6,6 +6,7 @@ This project rocks and uses MIT-LICENSE.
6
6
 
7
7
  ```
8
8
  rake yaddl:models
9
+ rake yaddl:migrations
9
10
  ```
10
11
 
11
12
  ### Example Input
@@ -20,7 +21,7 @@ TestModel(name:string)
20
21
  ### Output
21
22
 
22
23
  /app/models/test_model.rb
23
- ```
24
+ ```ruby
24
25
  class TestModel < ActiveRecord::Base
25
26
  has_many :related_models, dependent: :destroy
26
27
 
@@ -37,7 +38,7 @@ end
37
38
  ```
38
39
 
39
40
  /app/models/related_model.rb
40
- ```
41
+ ```ruby
41
42
  class RelatedModel < ActiveRecord::Base
42
43
  belongs_to :test_model
43
44
 
@@ -11,7 +11,12 @@ namespace :yaddl do
11
11
  y = Yaddl::Generator::load("#{Rails.root}/db/*.yaddl")
12
12
  y.generate("--force --no-assets --skip-migration --helpers=false")
13
13
  end
14
- desc "Regenerate models, skips migrations"
14
+ desc "Regenerate migrations only, skips models"
15
+ task :migrations do
16
+ y = Yaddl::Generator::load("#{Rails.root}/db/*.yaddl")
17
+ y.generate("--migrations-only")
18
+ end
19
+ desc "Regenerate models only, skips migrations"
15
20
  task :models do
16
21
  y = Yaddl::Generator::load("#{Rails.root}/db/*.yaddl")
17
22
  y.generate("--no-scaffolds")
@@ -1,5 +1,8 @@
1
1
  module Yaddl
2
2
  require "yaddl/railtie" if defined?(Rails)
3
+
4
+ require "rails"
5
+ require "rails/generators/migration"
3
6
  class Generator
4
7
 
5
8
  attr_accessor :markup
@@ -92,8 +95,32 @@ class Generator
92
95
  sc = "rails g scaffold #{name} " + model['attributes'].reject{ | k, v| v['hidden'] }.map{ |k,v| k + ':' + v['type'].sub(/yaml|hash|object|cache/i,"text") }.join(' ') + " " + model['belongs_to'].reject{ | k, v| v['hidden'] }.map{ |k,v| k + ':references' + (v['polymorphic'] ? "{polymorphic}" : "") }.join(' ')
93
96
  puts("form: #{sc}") unless @quiet
94
97
  `#{sc} #{options.gsub("--force","")} --skip --no-migrations`
95
- end if !options.include?("--no-scaffold")
98
+ end if !options.include?("--no-scaffold") && !options.include?("--migrations-only")
96
99
 
100
+ models.reject{ |k,v| k[0] == "@"}.each do |name,model|
101
+ model['has_one'] ||= {}
102
+ model['has_many'] ||= {}
103
+ model['belongs_to'] ||= {}
104
+ model['attributes'] ||= {}
105
+ model['methods'] ||= {}
106
+ model['code'] ||= {}
107
+ model['code']['top'] ||= []
108
+ model['code']['before'] ||= []
109
+ model['code']['after'] ||= []
110
+ model['code']['controller'] ||= []
111
+ sc = "rails g model #{name} " + model['attributes'].map{ |k,v| k + ':' + v['type'].sub(/yaml|hash|object|cache/i,"text") }.join(' ') + " " + model['belongs_to'].map{ |k,v| k + ':references' + (v['polymorphic'] ? "{polymorphic}" : "") }.join(' ')
112
+ puts("migration: cd #{Rails::root} && #{sc} --skip")# unless @quiet
113
+ `cd #{Rails::root} && #{sc} --skip --no-test-framework`
114
+ end if options.include?("--migrations-only")
115
+
116
+ if options.include?("--migrations-only")
117
+ cleanup(ddl: true, mixins: false)
118
+ File.open("#{Rails.root}/db/schema.yaml", "w") do |f|
119
+ f.write models.to_yaml
120
+ end
121
+ puts("","--- DATA #{models.to_yaml}","") unless @quiet
122
+ return
123
+ end
97
124
 
98
125
  models.reject{ |k,v| k[0] == "@"}.each do |name,model|
99
126
  model['has_one'] ||= {}
@@ -1,3 +1,3 @@
1
1
  module Yaddl
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.6"
3
3
  end
File without changes
@@ -106,5 +106,315 @@ YaddlTest: test_create_test_model
106
106
   (0.1ms) begin transaction
107
107
  -----------------------
108
108
  YaddlTest: test_defined
109
+ -----------------------
110
+  (0.1ms) rollback transaction
111
+  (0.3ms) begin transaction
112
+ ---------------------------------
113
+ YaddlTest: test_create_test_model
114
+ ---------------------------------
115
+  (0.1ms) rollback transaction
116
+  (0.1ms) begin transaction
117
+ -----------------------
118
+ YaddlTest: test_defined
119
+ -----------------------
120
+  (0.1ms) rollback transaction
121
+  (0.3ms) begin transaction
122
+ ---------------------------------
123
+ YaddlTest: test_create_test_model
124
+ ---------------------------------
125
+  (0.1ms) rollback transaction
126
+  (0.1ms) begin transaction
127
+ -----------------------
128
+ YaddlTest: test_defined
129
+ -----------------------
130
+  (0.1ms) rollback transaction
131
+  (0.3ms) begin transaction
132
+ ---------------------------------
133
+ YaddlTest: test_create_test_model
134
+ ---------------------------------
135
+  (0.2ms) rollback transaction
136
+  (0.1ms) begin transaction
137
+ -----------------------
138
+ YaddlTest: test_defined
139
+ -----------------------
140
+  (0.1ms) rollback transaction
141
+  (0.3ms) begin transaction
142
+ ---------------------------------
143
+ YaddlTest: test_create_test_model
144
+ ---------------------------------
145
+  (0.2ms) rollback transaction
146
+  (0.1ms) begin transaction
147
+ -----------------------
148
+ YaddlTest: test_defined
149
+ -----------------------
150
+  (0.0ms) rollback transaction
151
+  (0.3ms) begin transaction
152
+ ---------------------------------
153
+ YaddlTest: test_create_test_model
154
+ ---------------------------------
155
+  (0.2ms) rollback transaction
156
+  (0.1ms) begin transaction
157
+ -----------------------
158
+ YaddlTest: test_defined
159
+ -----------------------
160
+  (0.1ms) rollback transaction
161
+  (0.3ms) begin transaction
162
+ ---------------------------------
163
+ YaddlTest: test_create_test_model
164
+ ---------------------------------
165
+  (0.2ms) rollback transaction
166
+  (0.1ms) begin transaction
167
+ -----------------------
168
+ YaddlTest: test_defined
169
+ -----------------------
170
+  (0.1ms) rollback transaction
171
+  (0.3ms) begin transaction
172
+ ---------------------------------
173
+ YaddlTest: test_create_test_model
174
+ ---------------------------------
175
+  (0.2ms) rollback transaction
176
+  (0.1ms) begin transaction
177
+ -----------------------
178
+ YaddlTest: test_defined
179
+ -----------------------
180
+  (0.1ms) rollback transaction
181
+  (0.4ms) begin transaction
182
+ ---------------------------------
183
+ YaddlTest: test_create_test_model
184
+ ---------------------------------
185
+  (0.1ms) rollback transaction
186
+  (0.1ms) begin transaction
187
+ -----------------------
188
+ YaddlTest: test_defined
189
+ -----------------------
190
+  (0.1ms) rollback transaction
191
+  (0.3ms) begin transaction
192
+ ---------------------------------
193
+ YaddlTest: test_create_test_model
194
+ ---------------------------------
195
+  (0.1ms) rollback transaction
196
+  (0.1ms) begin transaction
197
+ -----------------------
198
+ YaddlTest: test_defined
199
+ -----------------------
200
+  (0.1ms) rollback transaction
201
+  (0.3ms) begin transaction
202
+ ---------------------------------
203
+ YaddlTest: test_create_test_model
204
+ ---------------------------------
205
+  (0.2ms) rollback transaction
206
+  (0.1ms) begin transaction
207
+ -----------------------
208
+ YaddlTest: test_defined
209
+ -----------------------
210
+  (0.1ms) rollback transaction
211
+  (0.3ms) begin transaction
212
+ ---------------------------------
213
+ YaddlTest: test_create_test_model
214
+ ---------------------------------
215
+  (0.1ms) rollback transaction
216
+  (0.1ms) begin transaction
217
+ -----------------------
218
+ YaddlTest: test_defined
219
+ -----------------------
220
+  (0.1ms) rollback transaction
221
+  (0.3ms) begin transaction
222
+ ---------------------------------
223
+ YaddlTest: test_create_test_model
224
+ ---------------------------------
225
+  (0.1ms) rollback transaction
226
+  (0.1ms) begin transaction
227
+ -----------------------
228
+ YaddlTest: test_defined
229
+ -----------------------
230
+  (0.1ms) rollback transaction
231
+  (0.3ms) begin transaction
232
+ ---------------------------------
233
+ YaddlTest: test_create_test_model
234
+ ---------------------------------
235
+  (0.1ms) rollback transaction
236
+  (0.1ms) begin transaction
237
+ -----------------------
238
+ YaddlTest: test_defined
239
+ -----------------------
240
+  (0.1ms) rollback transaction
241
+  (0.3ms) begin transaction
242
+ ---------------------------------
243
+ YaddlTest: test_create_test_model
244
+ ---------------------------------
245
+  (0.1ms) rollback transaction
246
+  (0.1ms) begin transaction
247
+ -----------------------
248
+ YaddlTest: test_defined
249
+ -----------------------
250
+  (0.1ms) rollback transaction
251
+  (0.3ms) begin transaction
252
+ ---------------------------------
253
+ YaddlTest: test_create_test_model
254
+ ---------------------------------
255
+  (0.2ms) rollback transaction
256
+  (0.1ms) begin transaction
257
+ -----------------------
258
+ YaddlTest: test_defined
259
+ -----------------------
260
+  (0.1ms) rollback transaction
261
+  (0.3ms) begin transaction
262
+ ---------------------------------
263
+ YaddlTest: test_create_test_model
264
+ ---------------------------------
265
+  (0.2ms) rollback transaction
266
+  (0.1ms) begin transaction
267
+ -----------------------
268
+ YaddlTest: test_defined
269
+ -----------------------
270
+  (0.1ms) rollback transaction
271
+  (0.3ms) begin transaction
272
+ ---------------------------------
273
+ YaddlTest: test_create_test_model
274
+ ---------------------------------
275
+  (0.1ms) rollback transaction
276
+  (0.1ms) begin transaction
277
+ -----------------------
278
+ YaddlTest: test_defined
279
+ -----------------------
280
+  (0.0ms) rollback transaction
281
+  (0.3ms) begin transaction
282
+ ---------------------------------
283
+ YaddlTest: test_create_test_model
284
+ ---------------------------------
285
+  (0.2ms) rollback transaction
286
+  (0.1ms) begin transaction
287
+ -----------------------
288
+ YaddlTest: test_defined
289
+ -----------------------
290
+  (0.1ms) rollback transaction
291
+  (0.3ms) begin transaction
292
+ ---------------------------------
293
+ YaddlTest: test_create_test_model
294
+ ---------------------------------
295
+  (0.2ms) rollback transaction
296
+  (0.3ms) begin transaction
297
+ ---------------------------------
298
+ YaddlTest: test_create_test_model
299
+ ---------------------------------
300
+  (0.2ms) rollback transaction
301
+  (0.3ms) begin transaction
302
+ ---------------------------------
303
+ YaddlTest: test_create_test_model
304
+ ---------------------------------
305
+  (0.2ms) rollback transaction
306
+  (0.1ms) begin transaction
307
+ -----------------------
308
+ YaddlTest: test_defined
309
+ -----------------------
310
+  (0.1ms) rollback transaction
311
+  (0.3ms) begin transaction
312
+ ---------------------------------
313
+ YaddlTest: test_create_test_model
314
+ ---------------------------------
315
+  (0.1ms) rollback transaction
316
+  (0.1ms) begin transaction
317
+ -----------------------
318
+ YaddlTest: test_defined
319
+ -----------------------
320
+  (0.1ms) rollback transaction
321
+  (0.3ms) begin transaction
322
+ ---------------------------------
323
+ YaddlTest: test_create_test_model
324
+ ---------------------------------
325
+  (0.2ms) rollback transaction
326
+  (0.1ms) begin transaction
327
+ -----------------------
328
+ YaddlTest: test_defined
329
+ -----------------------
330
+  (0.1ms) rollback transaction
331
+  (0.3ms) begin transaction
332
+ ---------------------------------
333
+ YaddlTest: test_create_test_model
334
+ ---------------------------------
335
+  (0.2ms) rollback transaction
336
+  (0.1ms) begin transaction
337
+ -----------------------
338
+ YaddlTest: test_defined
339
+ -----------------------
340
+  (0.1ms) rollback transaction
341
+  (0.3ms) begin transaction
342
+ ---------------------------------
343
+ YaddlTest: test_create_test_model
344
+ ---------------------------------
345
+  (0.2ms) rollback transaction
346
+  (0.1ms) begin transaction
347
+ -----------------------
348
+ YaddlTest: test_defined
349
+ -----------------------
350
+  (0.1ms) rollback transaction
351
+  (0.3ms) begin transaction
352
+ ---------------------------------
353
+ YaddlTest: test_create_test_model
354
+ ---------------------------------
355
+  (0.1ms) rollback transaction
356
+  (0.1ms) begin transaction
357
+ -----------------------
358
+ YaddlTest: test_defined
359
+ -----------------------
360
+  (0.1ms) rollback transaction
361
+  (0.3ms) begin transaction
362
+ ---------------------------------
363
+ YaddlTest: test_create_test_model
364
+ ---------------------------------
365
+  (0.1ms) rollback transaction
366
+  (0.1ms) begin transaction
367
+ -----------------------
368
+ YaddlTest: test_defined
369
+ -----------------------
370
+  (0.1ms) rollback transaction
371
+  (0.3ms) begin transaction
372
+ ---------------------------------
373
+ YaddlTest: test_create_test_model
374
+ ---------------------------------
375
+  (0.1ms) rollback transaction
376
+  (0.1ms) begin transaction
377
+ -----------------------
378
+ YaddlTest: test_defined
379
+ -----------------------
380
+  (0.0ms) rollback transaction
381
+  (0.3ms) begin transaction
382
+ ---------------------------------
383
+ YaddlTest: test_create_test_model
384
+ ---------------------------------
385
+  (0.2ms) rollback transaction
386
+  (0.1ms) begin transaction
387
+ -----------------------
388
+ YaddlTest: test_defined
389
+ -----------------------
390
+  (0.1ms) rollback transaction
391
+  (0.3ms) begin transaction
392
+ ---------------------------------
393
+ YaddlTest: test_create_test_model
394
+ ---------------------------------
395
+  (0.1ms) rollback transaction
396
+  (0.1ms) begin transaction
397
+ -----------------------
398
+ YaddlTest: test_defined
399
+ -----------------------
400
+  (0.0ms) rollback transaction
401
+  (0.3ms) begin transaction
402
+ ---------------------------------
403
+ YaddlTest: test_create_test_model
404
+ ---------------------------------
405
+  (0.2ms) rollback transaction
406
+  (0.1ms) begin transaction
407
+ -----------------------
408
+ YaddlTest: test_defined
409
+ -----------------------
410
+  (0.1ms) rollback transaction
411
+  (0.3ms) begin transaction
412
+ ---------------------------------
413
+ YaddlTest: test_create_test_model
414
+ ---------------------------------
415
+  (0.2ms) rollback transaction
416
+  (0.1ms) begin transaction
417
+ -----------------------
418
+ YaddlTest: test_defined
109
419
  -----------------------
110
420
   (0.1ms) rollback transaction
@@ -11,6 +11,7 @@ class YaddlTest < ActiveSupport::TestCase
11
11
  =to_s{name}
12
12
  *RelatedModel"
13
13
  y.generate("--no-scaffolds --quiet")
14
+ y.generate("--migrations-only --quiet")
14
15
  assert_file "app/models/test_model.rb", "class TestModel < ActiveRecord::Base
15
16
  has_many :related_models, dependent: :destroy
16
17
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: yaddl
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -87,6 +87,7 @@ files:
87
87
  - test/dummy/config.ru
88
88
  - test/dummy/db/schema.yaml
89
89
  - test/dummy/db/test.sqlite3
90
+ - test/dummy/log/development.log
90
91
  - test/dummy/log/test.log
91
92
  - test/dummy/public/404.html
92
93
  - test/dummy/public/422.html
@@ -150,6 +151,7 @@ test_files:
150
151
  - test/dummy/config.ru
151
152
  - test/dummy/db/schema.yaml
152
153
  - test/dummy/db/test.sqlite3
154
+ - test/dummy/log/development.log
153
155
  - test/dummy/log/test.log
154
156
  - test/dummy/public/404.html
155
157
  - test/dummy/public/422.html