wagn 1.14.1 → 1.14.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/.tm_properties +2 -1
  3. data/VERSION +1 -1
  4. data/app/controllers/card_controller.rb +4 -3
  5. data/db/bootstrap/card_acts.yml +1 -1
  6. data/db/bootstrap/cards.yml +1028 -1028
  7. data/db/migrate_core_cards/20140629222005_add_email_cards.rb +2 -25
  8. data/db/migrate_core_cards/20141204061304_watchers_to_following.rb +38 -0
  9. data/db/version_core_cards.txt +1 -1
  10. data/features/history.feature +21 -0
  11. data/features/step_definitions/history_steps.rb +3 -0
  12. data/features/step_definitions/wagn_steps.rb +10 -1
  13. data/lib/card/act.rb +2 -2
  14. data/lib/card/action.rb +9 -9
  15. data/lib/card/diff.rb +370 -211
  16. data/lib/card/exceptions.rb +2 -0
  17. data/lib/card/format.rb +5 -3
  18. data/lib/card/query.rb +4 -4
  19. data/lib/card/query/card_spec.rb +69 -51
  20. data/lib/card/set.rb +3 -2
  21. data/lib/wagn.rb +15 -3
  22. data/lib/wagn/all.rb +1 -3
  23. data/lib/wagn/application.rb +10 -1
  24. data/lib/wagn/generators/wagn/templates/Gemfile +6 -1
  25. data/lib/wagn/log.rb +69 -0
  26. data/lib/wagn/tasks/wagn.rake +1 -1
  27. data/mod/01_core/set/all/collection.rb +8 -5
  28. data/mod/01_core/set/all/content.rb +1 -1
  29. data/mod/01_core/set/all/fetch.rb +34 -32
  30. data/mod/01_core/set/all/notify.rb +2 -2
  31. data/mod/01_core/set/all/phases.rb +5 -0
  32. data/mod/01_core/set/all/trash.rb +1 -1
  33. data/mod/02_basic_types/set/type/pointer.rb +4 -0
  34. data/mod/03_machines/set/type/coffee_script.rb +10 -0
  35. data/mod/03_machines/set/type/css.rb +9 -0
  36. data/mod/03_machines/set/type/java_script.rb +5 -0
  37. data/mod/03_machines/set/type/scss.rb +8 -2
  38. data/mod/05_standard/set/all/history.rb +10 -1
  39. data/mod/05_standard/set/type/html.rb +4 -0
  40. data/mod/05_standard/spec/set/all/base_spec.rb +2 -0
  41. data/mod/05_standard/spec/set/all/history_spec.rb +12 -0
  42. data/mod/06_email/set/all/email_html.rb +0 -4
  43. data/mod/06_email/set/type/email_template.rb +6 -2
  44. data/spec/lib/card/diff_spec.rb +207 -107
  45. data/spec/lib/card/query_spec.rb +14 -13
  46. data/test/fixtures/card_actions.yml +21 -0
  47. data/test/fixtures/card_acts.yml +103 -85
  48. data/test/fixtures/card_changes.yml +53 -23
  49. data/test/fixtures/cards.yml +1349 -1331
  50. data/test/seed.rb +5 -1
  51. metadata +8 -3
  52. data/lib/wagn/config/initializers/airbrake.rb +0 -9
@@ -38,11 +38,11 @@ class SharedData
38
38
 
39
39
  Card.create! :type_id=>Card::SignupID, :name=>"Sample Signup" #, :email=>"invitation@request.com"
40
40
  #above still necessary? try commenting out above and 'Sign up' below
41
+ Card::Auth.current_id = Card::WagnBotID # need to reset after creating sign up, which changes current_id for extend phase
41
42
 
42
43
  Card::Auth.createable_types.each do |type|
43
44
  next if ['User', 'Sign up', 'Set', 'Number'].include? type
44
45
  Card.create! :type=>type, :name=>"Sample #{type}"
45
- Card::Auth.current_id = Card::WagnBotID # need to reset after creating sign up, which changes current_id for extend phase
46
46
  end
47
47
 
48
48
 
@@ -161,6 +161,10 @@ class SharedData
161
161
  Card.create! :name=>'TwwoHeading', :content => "<h1>One Heading</h1>\r\n<p>and some text</p>\r\n<h2>And a Subheading</h2>\r\n<p>and more text</p>"
162
162
  Card.create! :name=>'ThreeHeading', :content =>"<h1>A Heading</h1>\r\n<p>and text</p>\r\n<h2>And Subhead</h2>\r\n<p>text</p>\r\n<h1>And another top Heading</h1>"
163
163
 
164
+ # -------- For history testing: -----------
165
+ first = Card.create! :name=>"First", :content => 'egg'
166
+ first.update_attributes! :content=> 'chicken'
167
+ first.update_attributes! :content=> 'chick'
164
168
 
165
169
  end
166
170
  end
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.1
4
+ version: 1.14.2
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-24 00:00:00.000000000 Z
13
+ date: 2014-12-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -313,6 +313,7 @@ files:
313
313
  - db/migrate_core_cards/20141115034214_config_descriptions_etc.rb
314
314
  - db/migrate_core_cards/20141119001955_make_symlinks_relative.rb
315
315
  - db/migrate_core_cards/20141120120605_fix_notification_html_message.rb
316
+ - db/migrate_core_cards/20141204061304_watchers_to_following.rb
316
317
  - db/migrate_core_cards/data/1.11_help_text.json
317
318
  - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
318
319
  - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -337,6 +338,7 @@ files:
337
338
  - features/conflict.feature
338
339
  - features/flexmail.feature
339
340
  - features/follow.feature
341
+ - features/history.feature
340
342
  - features/layouts.feature
341
343
  - features/navbox.feature
342
344
  - features/notifications.feature
@@ -347,6 +349,7 @@ files:
347
349
  - features/setup.feature
348
350
  - features/signup.feature
349
351
  - features/step_definitions/email_steps.rb
352
+ - features/step_definitions/history_steps.rb
350
353
  - features/step_definitions/wagn_steps.rb
351
354
  - features/step_definitions/web_steps.rb
352
355
  - features/step_definitions/window_steps.rb
@@ -406,7 +409,6 @@ files:
406
409
  - lib/wagn/config/environments/profile.rb
407
410
  - lib/wagn/config/environments/test.rb
408
411
  - lib/wagn/config/initializers/01_init_ruby_extensions.rb
409
- - lib/wagn/config/initializers/airbrake.rb
410
412
  - lib/wagn/config/initializers/inflections.rb
411
413
  - lib/wagn/config/initializers/mime_types.rb
412
414
  - lib/wagn/config/initializers/notification.rb
@@ -445,6 +447,7 @@ files:
445
447
  - lib/wagn/generators/wagn/templates/spec/spec_helper.rb
446
448
  - lib/wagn/generators/wagn/wagn_generator.rb
447
449
  - lib/wagn/location.rb
450
+ - lib/wagn/log.rb
448
451
  - lib/wagn/migration.rb
449
452
  - lib/wagn/mods_spec_helper.rb
450
453
  - lib/wagn/script_wagn_loader.rb
@@ -1374,6 +1377,7 @@ test_files:
1374
1377
  - features/conflict.feature
1375
1378
  - features/flexmail.feature
1376
1379
  - features/follow.feature
1380
+ - features/history.feature
1377
1381
  - features/layouts.feature
1378
1382
  - features/navbox.feature
1379
1383
  - features/notifications.feature
@@ -1384,6 +1388,7 @@ test_files:
1384
1388
  - features/setup.feature
1385
1389
  - features/signup.feature
1386
1390
  - features/step_definitions/email_steps.rb
1391
+ - features/step_definitions/history_steps.rb
1387
1392
  - features/step_definitions/wagn_steps.rb
1388
1393
  - features/step_definitions/web_steps.rb
1389
1394
  - features/step_definitions/window_steps.rb
@@ -1,9 +0,0 @@
1
- # -*- encoding : utf-8 -*-
2
- filename = File.join Wagn.root, 'config/airbrake.key'
3
- if File.exists? filename
4
- key = File.read( filename ).strip
5
- Airbrake.configure do |config|
6
- Rails.logger.info "setting up airbrake with #{key}"
7
- config.api_key = key
8
- end
9
- end