wagn 1.12.9 → 1.12.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +15 -0
  2. data/Gemfile +10 -22
  3. data/VERSION +1 -1
  4. data/app/assets/javascripts/wagn.js.coffee +3 -3
  5. data/app/controllers/account_controller.rb +23 -29
  6. data/app/controllers/admin_controller.rb +14 -20
  7. data/app/controllers/card_controller.rb +1 -39
  8. data/app/controllers/wagn_controller.rb +46 -3
  9. data/app/mailers/mailer.rb +11 -10
  10. data/config/environments/development.rb +3 -0
  11. data/{app/models → lib}/card.rb +0 -0
  12. data/lib/card/content.rb +2 -2
  13. data/lib/card/format.rb +26 -5
  14. data/{app/models → lib}/card/reference.rb +0 -0
  15. data/{app/models → lib}/card/revision.rb +0 -0
  16. data/lib/generators/wagn/templates/Gemfile +2 -0
  17. data/lib/tasks/wagn.rake +6 -7
  18. data/lib/wagn/all.rb +11 -2
  19. data/lib/wagn/application.rb +1 -0
  20. data/mods/core/formats/html_format.rb +74 -29
  21. data/mods/core/sets/all/content.rb +5 -1
  22. data/mods/core/sets/all/permissions.rb +11 -4
  23. data/mods/core/sets/all/trash.rb +6 -1
  24. data/mods/standard/chunks/include.rb +3 -5
  25. data/mods/standard/lib/stylesheets/functional.scss +2 -0
  26. data/mods/standard/lib/stylesheets/standard.scss +1 -1
  27. data/mods/standard/sets/all/account.rb +66 -53
  28. data/mods/standard/sets/all/admin.rb +16 -16
  29. data/mods/standard/sets/all/all_css.rb +2 -2
  30. data/mods/standard/sets/all/base.rb +8 -3
  31. data/mods/standard/sets/all/follow.rb +2 -2
  32. data/mods/standard/sets/all/history.rb +1 -1
  33. data/mods/standard/sets/all/json.rb +3 -2
  34. data/mods/standard/sets/all/kml.rb +3 -2
  35. data/mods/standard/sets/all/rich_html.rb +220 -169
  36. data/mods/standard/sets/all/rss.rb +2 -2
  37. data/mods/standard/sets/right/structure.rb +5 -4
  38. data/mods/standard/sets/self/head.rb +2 -2
  39. data/mods/standard/sets/type/account_request.rb +20 -27
  40. data/mods/standard/sets/type/cardtype.rb +15 -2
  41. data/mods/standard/sets/type/layout_type.rb +6 -4
  42. data/mods/standard/sets/type/search_type.rb +1 -1
  43. data/mods/standard/sets/type/set.rb +6 -3
  44. data/mods/standard/sets/type/user.rb +13 -10
  45. data/public/assets/{application-7f1664ac8e65db8af0bfa6539e23c7df.js → application-af2bc486eb3db1c02c4dcd0e23ca25fc.js} +1 -1
  46. data/public/assets/{application-7f1664ac8e65db8af0bfa6539e23c7df.js.gz → application-af2bc486eb3db1c02c4dcd0e23ca25fc.js.gz} +0 -0
  47. data/public/assets/application.js +1 -1
  48. data/public/assets/application.js.gz +0 -0
  49. data/public/assets/html5shiv-printshiv-ad36fc7219f4aeaa275f9a7fe2383413.js.gz +0 -0
  50. data/public/assets/html5shiv-printshiv.js.gz +0 -0
  51. data/public/assets/manifest.yml +2 -2
  52. data/public/assets/tinymce-22b5a139d9ff7df7643afae9ce205508.js.gz +0 -0
  53. data/public/assets/tinymce.js.gz +0 -0
  54. data/spec/lib/card/codename_spec.rb +1 -0
  55. data/spec/mods/core/sets/all/permissions_spec.rb +25 -0
  56. data/spec/mods/core/sets/all/trash_spec.rb +16 -0
  57. data/spec/mods/standard/chunks/include_spec.rb +5 -0
  58. data/spec/mods/standard/sets/all/json_spec.rb +6 -6
  59. data/spec/mods/standard/sets/all/rich_html_spec.rb +36 -0
  60. data/spec/mods/standard/sets/right/structure_spec.rb +8 -2
  61. data/wagn.gemspec +2 -2
  62. metadata +14 -38
data/wagn.gemspec CHANGED
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
9
9
  s.email = ['info@wagn.org']
10
10
 
11
11
  # s.date = '2013-12-20'
12
- s.summary = "Wagn: team-driven websites"
13
- s.description = "Create dynamic web systems out of wiki-inspired building blocks."
12
+ s.summary = "structured wiki web platform"
13
+ s.description = "a wiki approach to stuctured data, dynamic interaction, and web design"
14
14
  s.homepage = 'http://wagn.org'
15
15
  s.license = 'GPL'
16
16
 
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wagn
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.12.9
5
- prerelease:
4
+ version: 1.12.10
6
5
  platform: ruby
7
6
  authors:
8
7
  - Ethan McCutchen
@@ -11,12 +10,11 @@ authors:
11
10
  autorequire:
12
11
  bindir: bin
13
12
  cert_chain: []
14
- date: 2014-02-03 00:00:00.000000000 Z
13
+ date: 2014-02-10 00:00:00.000000000 Z
15
14
  dependencies:
16
15
  - !ruby/object:Gem::Dependency
17
16
  name: rails
18
17
  requirement: !ruby/object:Gem::Requirement
19
- none: false
20
18
  requirements:
21
19
  - - ~>
22
20
  - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
24
22
  type: :runtime
25
23
  prerelease: false
26
24
  version_requirements: !ruby/object:Gem::Requirement
27
- none: false
28
25
  requirements:
29
26
  - - ~>
30
27
  - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
32
29
  - !ruby/object:Gem::Dependency
33
30
  name: smartname
34
31
  requirement: !ruby/object:Gem::Requirement
35
- none: false
36
32
  requirements:
37
33
  - - '='
38
34
  - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
40
36
  type: :runtime
41
37
  prerelease: false
42
38
  version_requirements: !ruby/object:Gem::Requirement
43
- none: false
44
39
  requirements:
45
40
  - - '='
46
41
  - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
48
43
  - !ruby/object:Gem::Dependency
49
44
  name: htmlentities
50
45
  requirement: !ruby/object:Gem::Requirement
51
- none: false
52
46
  requirements:
53
47
  - - ~>
54
48
  - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
56
50
  type: :runtime
57
51
  prerelease: false
58
52
  version_requirements: !ruby/object:Gem::Requirement
59
- none: false
60
53
  requirements:
61
54
  - - ~>
62
55
  - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
64
57
  - !ruby/object:Gem::Dependency
65
58
  name: uuid
66
59
  requirement: !ruby/object:Gem::Requirement
67
- none: false
68
60
  requirements:
69
61
  - - ~>
70
62
  - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
72
64
  type: :runtime
73
65
  prerelease: false
74
66
  version_requirements: !ruby/object:Gem::Requirement
75
- none: false
76
67
  requirements:
77
68
  - - ~>
78
69
  - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
80
71
  - !ruby/object:Gem::Dependency
81
72
  name: paperclip
82
73
  requirement: !ruby/object:Gem::Requirement
83
- none: false
84
74
  requirements:
85
75
  - - ~>
86
76
  - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
88
78
  type: :runtime
89
79
  prerelease: false
90
80
  version_requirements: !ruby/object:Gem::Requirement
91
- none: false
92
81
  requirements:
93
82
  - - ~>
94
83
  - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
96
85
  - !ruby/object:Gem::Dependency
97
86
  name: rmagick
98
87
  requirement: !ruby/object:Gem::Requirement
99
- none: false
100
88
  requirements:
101
89
  - - ~>
102
90
  - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
104
92
  type: :runtime
105
93
  prerelease: false
106
94
  version_requirements: !ruby/object:Gem::Requirement
107
- none: false
108
95
  requirements:
109
96
  - - ~>
110
97
  - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
112
99
  - !ruby/object:Gem::Dependency
113
100
  name: recaptcha
114
101
  requirement: !ruby/object:Gem::Requirement
115
- none: false
116
102
  requirements:
117
103
  - - ~>
118
104
  - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
120
106
  type: :runtime
121
107
  prerelease: false
122
108
  version_requirements: !ruby/object:Gem::Requirement
123
- none: false
124
109
  requirements:
125
110
  - - ~>
126
111
  - !ruby/object:Gem::Version
@@ -128,7 +113,6 @@ dependencies:
128
113
  - !ruby/object:Gem::Dependency
129
114
  name: xmlscan
130
115
  requirement: !ruby/object:Gem::Requirement
131
- none: false
132
116
  requirements:
133
117
  - - ~>
134
118
  - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
136
120
  type: :runtime
137
121
  prerelease: false
138
122
  version_requirements: !ruby/object:Gem::Requirement
139
- none: false
140
123
  requirements:
141
124
  - - ~>
142
125
  - !ruby/object:Gem::Version
@@ -144,7 +127,6 @@ dependencies:
144
127
  - !ruby/object:Gem::Dependency
145
128
  name: rubyzip
146
129
  requirement: !ruby/object:Gem::Requirement
147
- none: false
148
130
  requirements:
149
131
  - - ~>
150
132
  - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
152
134
  type: :runtime
153
135
  prerelease: false
154
136
  version_requirements: !ruby/object:Gem::Requirement
155
- none: false
156
137
  requirements:
157
138
  - - ~>
158
139
  - !ruby/object:Gem::Version
@@ -160,7 +141,6 @@ dependencies:
160
141
  - !ruby/object:Gem::Dependency
161
142
  name: airbrake
162
143
  requirement: !ruby/object:Gem::Requirement
163
- none: false
164
144
  requirements:
165
145
  - - ~>
166
146
  - !ruby/object:Gem::Version
@@ -168,7 +148,6 @@ dependencies:
168
148
  type: :runtime
169
149
  prerelease: false
170
150
  version_requirements: !ruby/object:Gem::Requirement
171
- none: false
172
151
  requirements:
173
152
  - - ~>
174
153
  - !ruby/object:Gem::Version
@@ -176,7 +155,6 @@ dependencies:
176
155
  - !ruby/object:Gem::Dependency
177
156
  name: coderay
178
157
  requirement: !ruby/object:Gem::Requirement
179
- none: false
180
158
  requirements:
181
159
  - - ~>
182
160
  - !ruby/object:Gem::Version
@@ -184,7 +162,6 @@ dependencies:
184
162
  type: :runtime
185
163
  prerelease: false
186
164
  version_requirements: !ruby/object:Gem::Requirement
187
- none: false
188
165
  requirements:
189
166
  - - ~>
190
167
  - !ruby/object:Gem::Version
@@ -192,7 +169,6 @@ dependencies:
192
169
  - !ruby/object:Gem::Dependency
193
170
  name: sass
194
171
  requirement: !ruby/object:Gem::Requirement
195
- none: false
196
172
  requirements:
197
173
  - - ~>
198
174
  - !ruby/object:Gem::Version
@@ -200,12 +176,11 @@ dependencies:
200
176
  type: :runtime
201
177
  prerelease: false
202
178
  version_requirements: !ruby/object:Gem::Requirement
203
- none: false
204
179
  requirements:
205
180
  - - ~>
206
181
  - !ruby/object:Gem::Version
207
182
  version: '3.2'
208
- description: Create dynamic web systems out of wiki-inspired building blocks.
183
+ description: a wiki approach to stuctured data, dynamic interaction, and web design
209
184
  email:
210
185
  - info@wagn.org
211
186
  executables:
@@ -256,9 +231,6 @@ files:
256
231
  - app/mailers/mailer.rb
257
232
  - app/models/.gitkeep
258
233
  - app/models/account.rb
259
- - app/models/card.rb
260
- - app/models/card/reference.rb
261
- - app/models/card/revision.rb
262
234
  - app/models/user.rb
263
235
  - app/views/mailer/account_info.text.erb
264
236
  - app/views/mailer/change_notice.html.erb
@@ -349,6 +321,7 @@ files:
349
321
  - features/watch.feature
350
322
  - lib/active_record/foreign_keys.rb
351
323
  - lib/active_record/quoting_and_matching.rb
324
+ - lib/card.rb
352
325
  - lib/card/chunk.rb
353
326
  - lib/card/codename.rb
354
327
  - lib/card/constant.rb
@@ -363,6 +336,8 @@ files:
363
336
  - lib/card/query/ref_spec.rb
364
337
  - lib/card/query/spec.rb
365
338
  - lib/card/query/value_spec.rb
339
+ - lib/card/reference.rb
340
+ - lib/card/revision.rb
366
341
  - lib/card/set.rb
367
342
  - lib/card/set_pattern.rb
368
343
  - lib/generators/card_migration/USAGE
@@ -554,8 +529,8 @@ files:
554
529
  - mods/standard/sets/type/user.rb
555
530
  - public/404.html
556
531
  - public/500.html
557
- - public/assets/application-7f1664ac8e65db8af0bfa6539e23c7df.js
558
- - public/assets/application-7f1664ac8e65db8af0bfa6539e23c7df.js.gz
532
+ - public/assets/application-af2bc486eb3db1c02c4dcd0e23ca25fc.js
533
+ - public/assets/application-af2bc486eb3db1c02c4dcd0e23ca25fc.js.gz
559
534
  - public/assets/application.js
560
535
  - public/assets/application.js.gz
561
536
  - public/assets/body-bg-660b752b44b87594071f3d0851ac5360.png
@@ -1010,6 +985,7 @@ files:
1010
985
  - spec/mods/core/sets/all/states_spec.rb
1011
986
  - spec/mods/core/sets/all/templating_spec.rb
1012
987
  - spec/mods/core/sets/all/tracked_attributes_spec.rb
988
+ - spec/mods/core/sets/all/trash_spec.rb
1013
989
  - spec/mods/core/sets/all/type_spec.rb
1014
990
  - spec/mods/core/sets/all/utils_spec.rb
1015
991
  - spec/mods/standard/chunks/include_spec.rb
@@ -1106,28 +1082,27 @@ files:
1106
1082
  homepage: http://wagn.org
1107
1083
  licenses:
1108
1084
  - GPL
1085
+ metadata: {}
1109
1086
  post_install_message:
1110
1087
  rdoc_options: []
1111
1088
  require_paths:
1112
1089
  - lib
1113
1090
  required_ruby_version: !ruby/object:Gem::Requirement
1114
- none: false
1115
1091
  requirements:
1116
1092
  - - ! '>='
1117
1093
  - !ruby/object:Gem::Version
1118
1094
  version: '0'
1119
1095
  required_rubygems_version: !ruby/object:Gem::Requirement
1120
- none: false
1121
1096
  requirements:
1122
1097
  - - ! '>='
1123
1098
  - !ruby/object:Gem::Version
1124
1099
  version: '0'
1125
1100
  requirements: []
1126
1101
  rubyforge_project:
1127
- rubygems_version: 1.8.25
1102
+ rubygems_version: 2.2.1
1128
1103
  signing_key:
1129
- specification_version: 3
1130
- summary: ! 'Wagn: team-driven websites'
1104
+ specification_version: 4
1105
+ summary: structured wiki web platform
1131
1106
  test_files:
1132
1107
  - features/account_requests.feature
1133
1108
  - features/autonaming.feature
@@ -1213,6 +1188,7 @@ test_files:
1213
1188
  - spec/mods/core/sets/all/states_spec.rb
1214
1189
  - spec/mods/core/sets/all/templating_spec.rb
1215
1190
  - spec/mods/core/sets/all/tracked_attributes_spec.rb
1191
+ - spec/mods/core/sets/all/trash_spec.rb
1216
1192
  - spec/mods/core/sets/all/type_spec.rb
1217
1193
  - spec/mods/core/sets/all/utils_spec.rb
1218
1194
  - spec/mods/standard/chunks/include_spec.rb