wagn 1.14.0.pre3 → 1.14.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.
Files changed (73) hide show
  1. checksums.yaml +8 -8
  2. data/VERSION +1 -1
  3. data/app/controllers/card_controller.rb +3 -0
  4. data/config/version_cards.txt +1 -1
  5. data/db/bootstrap/card_actions.yml +1072 -1016
  6. data/db/bootstrap/card_acts.yml +2 -2
  7. data/db/bootstrap/card_changes.yml +1740 -1643
  8. data/db/bootstrap/card_references.yml +498 -477
  9. data/db/bootstrap/cards.yml +1179 -1047
  10. data/db/{migrate_cards → migrate_core_cards}/20130411191151_renaming_for_menu.rb +1 -1
  11. data/db/{migrate_cards → migrate_core_cards}/20130411211600_delete_old_related_tab_cards.rb +1 -1
  12. data/db/{migrate_cards → migrate_core_cards}/20130419215612_import_help_text.rb +3 -3
  13. data/db/{migrate_cards → migrate_core_cards}/20130823192433_add_style_cards.rb +1 -1
  14. data/db/{migrate_cards → migrate_core_cards}/20130910183318_move_styles_to_content.rb +2 -2
  15. data/db/{migrate_cards → migrate_core_cards}/20130920214038_jsonize_tinymce.rb +1 -1
  16. data/db/{migrate_cards → migrate_core_cards}/20130920291703_update_stylesheets.rb +2 -2
  17. data/db/{migrate_cards → migrate_core_cards}/20130927191728_account_events.rb +1 -1
  18. data/db/{migrate_cards → migrate_core_cards}/20131016172445_common_css_patch.rb +2 -2
  19. data/db/{migrate_cards → migrate_core_cards}/20140110193325_reset_account_request_type.rb +1 -1
  20. data/db/{migrate_cards → migrate_core_cards}/20140307231621_user_data_to_cards.rb +1 -1
  21. data/db/{migrate_cards → migrate_core_cards}/20140317035504_account_requests_to_signups.rb +1 -1
  22. data/db/{migrate_cards → migrate_core_cards}/20140512155840_add_script_cards.rb +1 -1
  23. data/db/{migrate_cards → migrate_core_cards}/20140629222005_add_email_cards.rb +5 -5
  24. data/db/migrate_core_cards/20140725180118_config_card_updates.rb +9 -0
  25. data/db/migrate_core_cards/20141111083921_delete_machine_output.rb +9 -0
  26. data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb +14 -0
  27. data/db/{migrate_cards → migrate_core_cards}/data/1.11_help_text.json +0 -0
  28. data/db/{migrate_cards → migrate_core_cards}/data/1.12_stylesheets/classic_cards.scss +0 -0
  29. data/db/{migrate_cards → migrate_core_cards}/data/1.12_stylesheets/common.scss +0 -0
  30. data/db/{migrate_cards → migrate_core_cards}/data/1.12_stylesheets/right_sidebar.scss +0 -0
  31. data/db/{migrate_cards → migrate_core_cards}/data/1.12_stylesheets/traditional.scss +0 -0
  32. data/db/{migrate_cards → migrate_core_cards}/data/1.13_config_text.json +1 -1
  33. data/db/migrate_core_cards/data/1.14_config_descriptions_etc.json +77 -0
  34. data/db/{migrate_cards → migrate_core_cards}/data/mailer/follower_notification_email.html +1 -1
  35. data/db/{migrate_cards → migrate_core_cards}/data/mailer/follower_notification_email.txt +0 -0
  36. data/db/{migrate_cards → migrate_core_cards}/data/mailer/mail_config.json +0 -0
  37. data/db/{migrate_cards → migrate_core_cards}/data/mailer/password_reset_email.html +0 -0
  38. data/db/{migrate_cards → migrate_core_cards}/data/mailer/password_reset_email.txt +0 -0
  39. data/db/{migrate_cards → migrate_core_cards}/data/mailer/signup_alert_email.html +0 -0
  40. data/db/{migrate_cards → migrate_core_cards}/data/mailer/signup_alert_email.txt +0 -0
  41. data/db/{migrate_cards → migrate_core_cards}/data/mailer/verification_email.html +0 -0
  42. data/db/{migrate_cards → migrate_core_cards}/data/mailer/verification_email.txt +0 -0
  43. data/db/schema.rb +6 -0
  44. data/features/conflict.feature +3 -3
  45. data/features/watch.feature +1 -1
  46. data/lib/card/act.rb +1 -1
  47. data/lib/card/generators/card_migration/card_migration_generator.rb +1 -0
  48. data/lib/card/generators/card_migration/templates/card_migration.erb +5 -4
  49. data/lib/wagn/application.rb +1 -1
  50. data/lib/wagn/commands.rb +1 -1
  51. data/lib/wagn/core_migration.rb +19 -0
  52. data/lib/wagn/migration.rb +33 -11
  53. data/lib/wagn/tasks/wagn.rake +24 -16
  54. data/lib/wagn/version.rb +4 -3
  55. data/mod/01_core/set/all/content.rb +17 -0
  56. data/mod/02_basic_types/set/type/pointer.rb +8 -6
  57. data/mod/05_standard/set/all/base.rb +3 -1
  58. data/mod/05_standard/set/all/rich_html.rb +28 -12
  59. data/mod/05_standard/set/type/signup.rb +1 -1
  60. data/mod/05_standard/spec/set/type/email_template_spec.rb +3 -1
  61. data/mod/06_email/set/right/bcc.rb +9 -1
  62. data/mod/06_email/set/right/cc.rb +2 -1
  63. data/mod/06_email/set/right/from.rb +2 -1
  64. data/mod/06_email/set/right/to.rb +1 -0
  65. data/test/1.10.0-data-dump.sql +32 -0
  66. data/test/fixtures/card_actions.yml +1565 -1509
  67. data/test/fixtures/card_acts.yml +283 -283
  68. data/test/fixtures/card_changes.yml +3808 -3718
  69. data/test/fixtures/card_references.yml +763 -735
  70. data/test/fixtures/cards.yml +1931 -1806
  71. data/wagn.gemspec +1 -1
  72. metadata +40 -36
  73. data/db/migrate_cards/20140725180118_config_card_updates.rb +0 -9
data/wagn.gemspec CHANGED
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
43
43
  [ 'diffy', '~> 3.0' ],
44
44
  [ 'diff-lcs', '~> 1.2' ],
45
45
  # should not depend!
46
- [ 'airbrake', '~> 3.1' ]
46
+ [ 'airbrake', '~> 4.1' ]
47
47
 
48
48
 
49
49
  ].each do |dep|
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wagn
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.0.pre3
4
+ version: 1.14.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-11-11 00:00:00.000000000 Z
13
+ date: 2014-11-17 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -228,14 +228,14 @@ dependencies:
228
228
  requirements:
229
229
  - - ~>
230
230
  - !ruby/object:Gem::Version
231
- version: '3.1'
231
+ version: '4.1'
232
232
  type: :runtime
233
233
  prerelease: false
234
234
  version_requirements: !ruby/object:Gem::Requirement
235
235
  requirements:
236
236
  - - ~>
237
237
  - !ruby/object:Gem::Version
238
- version: '3.1'
238
+ version: '4.1'
239
239
  description: a wiki approach to stuctured data, dynamic interaction, and web design
240
240
  email:
241
241
  - info@wagn.org
@@ -298,36 +298,39 @@ files:
298
298
  - db/migrate/20130411210957_update_codenames.rb
299
299
  - db/migrate/20140822073704_create_new_revision_tables.rb
300
300
  - db/migrate/20141001105348_move_revisions_to_actions.rb
301
- - db/migrate_cards/20130411191151_renaming_for_menu.rb
302
- - db/migrate_cards/20130411211600_delete_old_related_tab_cards.rb
303
- - db/migrate_cards/20130419215612_import_help_text.rb
304
- - db/migrate_cards/20130823192433_add_style_cards.rb
305
- - db/migrate_cards/20130910183318_move_styles_to_content.rb
306
- - db/migrate_cards/20130920214038_jsonize_tinymce.rb
307
- - db/migrate_cards/20130920291703_update_stylesheets.rb
308
- - db/migrate_cards/20130927191728_account_events.rb
309
- - db/migrate_cards/20131016172445_common_css_patch.rb
310
- - db/migrate_cards/20140110193325_reset_account_request_type.rb
311
- - db/migrate_cards/20140307231621_user_data_to_cards.rb
312
- - db/migrate_cards/20140317035504_account_requests_to_signups.rb
313
- - db/migrate_cards/20140512155840_add_script_cards.rb
314
- - db/migrate_cards/20140629222005_add_email_cards.rb
315
- - db/migrate_cards/20140725180118_config_card_updates.rb
316
- - db/migrate_cards/data/1.11_help_text.json
317
- - db/migrate_cards/data/1.12_stylesheets/classic_cards.scss
318
- - db/migrate_cards/data/1.12_stylesheets/common.scss
319
- - db/migrate_cards/data/1.12_stylesheets/right_sidebar.scss
320
- - db/migrate_cards/data/1.12_stylesheets/traditional.scss
321
- - db/migrate_cards/data/1.13_config_text.json
322
- - db/migrate_cards/data/mailer/follower_notification_email.html
323
- - db/migrate_cards/data/mailer/follower_notification_email.txt
324
- - db/migrate_cards/data/mailer/mail_config.json
325
- - db/migrate_cards/data/mailer/password_reset_email.html
326
- - db/migrate_cards/data/mailer/password_reset_email.txt
327
- - db/migrate_cards/data/mailer/signup_alert_email.html
328
- - db/migrate_cards/data/mailer/signup_alert_email.txt
329
- - db/migrate_cards/data/mailer/verification_email.html
330
- - db/migrate_cards/data/mailer/verification_email.txt
301
+ - db/migrate_core_cards/20130411191151_renaming_for_menu.rb
302
+ - db/migrate_core_cards/20130411211600_delete_old_related_tab_cards.rb
303
+ - db/migrate_core_cards/20130419215612_import_help_text.rb
304
+ - db/migrate_core_cards/20130823192433_add_style_cards.rb
305
+ - db/migrate_core_cards/20130910183318_move_styles_to_content.rb
306
+ - db/migrate_core_cards/20130920214038_jsonize_tinymce.rb
307
+ - db/migrate_core_cards/20130920291703_update_stylesheets.rb
308
+ - db/migrate_core_cards/20130927191728_account_events.rb
309
+ - db/migrate_core_cards/20131016172445_common_css_patch.rb
310
+ - db/migrate_core_cards/20140110193325_reset_account_request_type.rb
311
+ - db/migrate_core_cards/20140307231621_user_data_to_cards.rb
312
+ - db/migrate_core_cards/20140317035504_account_requests_to_signups.rb
313
+ - db/migrate_core_cards/20140512155840_add_script_cards.rb
314
+ - db/migrate_core_cards/20140629222005_add_email_cards.rb
315
+ - db/migrate_core_cards/20140725180118_config_card_updates.rb
316
+ - db/migrate_core_cards/20141111083921_delete_machine_output.rb
317
+ - db/migrate_core_cards/20141115034214_config_descriptions_etc.rb
318
+ - db/migrate_core_cards/data/1.11_help_text.json
319
+ - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
320
+ - db/migrate_core_cards/data/1.12_stylesheets/common.scss
321
+ - db/migrate_core_cards/data/1.12_stylesheets/right_sidebar.scss
322
+ - db/migrate_core_cards/data/1.12_stylesheets/traditional.scss
323
+ - db/migrate_core_cards/data/1.13_config_text.json
324
+ - db/migrate_core_cards/data/1.14_config_descriptions_etc.json
325
+ - db/migrate_core_cards/data/mailer/follower_notification_email.html
326
+ - db/migrate_core_cards/data/mailer/follower_notification_email.txt
327
+ - db/migrate_core_cards/data/mailer/mail_config.json
328
+ - db/migrate_core_cards/data/mailer/password_reset_email.html
329
+ - db/migrate_core_cards/data/mailer/password_reset_email.txt
330
+ - db/migrate_core_cards/data/mailer/signup_alert_email.html
331
+ - db/migrate_core_cards/data/mailer/signup_alert_email.txt
332
+ - db/migrate_core_cards/data/mailer/verification_email.html
333
+ - db/migrate_core_cards/data/mailer/verification_email.txt
331
334
  - db/schema.rb
332
335
  - db/seeds.rb
333
336
  - features/autonaming.feature
@@ -412,6 +415,7 @@ files:
412
415
  - lib/wagn/config/initializers/secret_token.rb
413
416
  - lib/wagn/config/initializers/session_store.rb
414
417
  - lib/wagn/config/initializers/uuid_state_file.rb
418
+ - lib/wagn/core_migration.rb
415
419
  - lib/wagn/exceptions.rb
416
420
  - lib/wagn/generators/wagn/USAGE
417
421
  - lib/wagn/generators/wagn/templates/Gemfile
@@ -1355,9 +1359,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
1355
1359
  version: 1.8.7
1356
1360
  required_rubygems_version: !ruby/object:Gem::Requirement
1357
1361
  requirements:
1358
- - - ! '>'
1362
+ - - ! '>='
1359
1363
  - !ruby/object:Gem::Version
1360
- version: 1.3.1
1364
+ version: '0'
1361
1365
  requirements: []
1362
1366
  rubyforge_project:
1363
1367
  rubygems_version: 2.2.1
data/db/migrate_cards/20140725180118_config_card_updates.rb DELETED
@@ -1,9 +0,0 @@
1
- # -*- encoding : utf-8 -*-
2
-
3
- class ConfigCardUpdates < Wagn::Migration
4
- def up
5
- raw_json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.13_config_text.json' )
6
- json = JSON.parse raw_json
7
- Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json", :pristine=>true
8
- end
9
- end