droom 0.4.3 → 0.5.3

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 (396) hide show
  1. checksums.yaml +7 -0
  2. data/app/assets/images/droom/admin_menu.png +0 -0
  3. data/app/assets/images/droom/applications_menu.png +0 -0
  4. data/app/assets/images/droom/arrows_small.png +0 -0
  5. data/app/assets/images/droom/config_menu.png +0 -0
  6. data/app/assets/images/droom/dropdown.png +0 -0
  7. data/app/assets/images/droom/menu/asterisk.png +0 -0
  8. data/app/assets/images/droom/{smalladd.png → menu/smalladd.png} +0 -0
  9. data/app/assets/images/droom/{small_asterisk.png → menu/smallasterisk.png} +0 -0
  10. data/app/assets/images/droom/{smalldelete.png → menu/smalldelete.png} +0 -0
  11. data/app/assets/images/droom/{smalldownload.png → menu/smalldownload.png} +0 -0
  12. data/app/assets/images/droom/{smalledit.png → menu/smalledit.png} +0 -0
  13. data/app/assets/images/droom/message.png +0 -0
  14. data/app/assets/images/droom/missing/scrap.jpg +0 -0
  15. data/app/assets/images/droom/missing/scrap.png +0 -0
  16. data/app/assets/images/droom/missing/thumb.png +0 -0
  17. data/app/assets/images/droom/missing/user.png +0 -0
  18. data/app/assets/images/droom/object_icons.png +0 -0
  19. data/app/assets/images/droom/panel/add.png +0 -0
  20. data/app/assets/images/droom/panel/edit.png +0 -0
  21. data/app/assets/images/droom/panel/manage.png +0 -0
  22. data/app/assets/images/droom/pointer_upwards.png +0 -0
  23. data/app/assets/images/droom/search_menu.png +0 -0
  24. data/app/assets/images/droom/setter.png +0 -0
  25. data/app/assets/images/droom/small_icons.png +0 -0
  26. data/app/assets/images/droom/stream/closer.png +0 -0
  27. data/app/assets/images/droom/stream/next.png +0 -0
  28. data/app/assets/images/droom/stream/prev.png +0 -0
  29. data/app/assets/images/droom/stream/previous.png +0 -0
  30. data/app/assets/images/droom/subscribe.png +0 -0
  31. data/app/assets/javascripts/droom.js.coffee +23 -13
  32. data/app/assets/javascripts/droom/actions.js.coffee +104 -10
  33. data/app/assets/javascripts/droom/ajax.js.coffee +36 -24
  34. data/app/assets/javascripts/droom/extensions.js.coffee +13 -0
  35. data/app/assets/javascripts/droom/lib/jquery.datepicker.js +1026 -0
  36. data/app/assets/javascripts/droom/lib/jquery.deserialize.js +142 -0
  37. data/app/assets/javascripts/droom/lib/jquery_ujs.js +416 -0
  38. data/app/assets/javascripts/droom/lib/swipe.js +568 -0
  39. data/app/assets/javascripts/droom/lib/underscore.js +1276 -0
  40. data/app/assets/javascripts/droom/popups.js.coffee +98 -37
  41. data/app/assets/javascripts/droom/stream.js.coffee +119 -77
  42. data/app/assets/javascripts/droom/utilities.js.coffee +25 -3
  43. data/app/assets/javascripts/droom/widgets.js.coffee +318 -253
  44. data/app/assets/stylesheets/droom.css.sass +482 -955
  45. data/app/assets/stylesheets/droom/_mixins.css.sass +12 -42
  46. data/app/assets/stylesheets/droom/_popups.css.sass +28 -11
  47. data/app/assets/stylesheets/droom/_stream.css.sass +375 -0
  48. data/app/assets/stylesheets/droom/_toolbar.css.sass +0 -6
  49. data/app/assets/stylesheets/droom/_variables.css.sass +4 -2
  50. data/app/controllers/droom/agenda_categories_controller.rb +6 -14
  51. data/app/controllers/droom/api/api_controller.rb +56 -0
  52. data/app/controllers/droom/api/events_controller.rb +74 -0
  53. data/app/controllers/droom/api/users_controller.rb +92 -0
  54. data/app/controllers/droom/api/venues_controller.rb +71 -0
  55. data/app/controllers/droom/calendars_controller.rb +4 -10
  56. data/app/controllers/droom/{user_confirmations_controller.rb → confirmations_controller.rb} +8 -7
  57. data/app/controllers/droom/dashboard_controller.rb +2 -19
  58. data/app/controllers/droom/documents_controller.rb +12 -60
  59. data/app/controllers/droom/dropbox_tokens_controller.rb +3 -4
  60. data/app/controllers/droom/engine_controller.rb +39 -11
  61. data/app/controllers/droom/events_controller.rb +62 -84
  62. data/app/controllers/droom/folders_controller.rb +30 -40
  63. data/app/controllers/droom/group_invitations_controller.rb +6 -23
  64. data/app/controllers/droom/group_permissions_controller.rb +26 -0
  65. data/app/controllers/droom/groups_controller.rb +10 -14
  66. data/app/controllers/droom/invitations_controller.rb +7 -25
  67. data/app/controllers/droom/memberships_controller.rb +13 -18
  68. data/app/controllers/droom/organisations_controller.rb +6 -25
  69. data/app/controllers/droom/permissions_controller.rb +50 -0
  70. data/app/controllers/droom/preferences_controller.rb +9 -10
  71. data/app/controllers/droom/scraps_controller.rb +23 -26
  72. data/app/controllers/droom/services_controller.rb +50 -0
  73. data/app/controllers/droom/suggestions_controller.rb +6 -4
  74. data/app/controllers/droom/users/confirmations_controller.rb +24 -0
  75. data/app/controllers/droom/users/passwords_controller.rb +39 -0
  76. data/app/controllers/droom/users/sessions_controller.rb +7 -0
  77. data/app/controllers/droom/users_controller.rb +60 -38
  78. data/app/controllers/droom/venues_controller.rb +8 -15
  79. data/app/controllers/droom/youtube_controller.rb +1 -1
  80. data/app/helpers/droom/droom_helper.rb +22 -17
  81. data/app/models/droom/ability.rb +81 -0
  82. data/app/models/droom/agenda_category.rb +0 -1
  83. data/app/models/droom/calendar.rb +12 -7
  84. data/app/models/droom/category.rb +4 -10
  85. data/app/models/droom/concerns/slugged.rb +21 -0
  86. data/app/models/droom/document.rb +15 -17
  87. data/app/models/droom/dropbox_document.rb +3 -6
  88. data/app/models/droom/dropbox_token.rb +2 -3
  89. data/app/models/droom/event.rb +117 -163
  90. data/app/models/droom/event_type.rb +25 -0
  91. data/app/models/droom/folder.rb +36 -48
  92. data/app/models/droom/group.rb +35 -27
  93. data/app/models/droom/group_invitation.rb +7 -10
  94. data/app/models/droom/group_permission.rb +29 -0
  95. data/app/models/droom/invitation.rb +14 -23
  96. data/app/models/droom/mailing_list_membership.rb +0 -1
  97. data/app/models/droom/membership.rb +32 -31
  98. data/app/models/droom/organisation.rb +6 -3
  99. data/app/models/droom/permission.rb +19 -0
  100. data/app/models/droom/personal_folder.rb +9 -21
  101. data/app/models/droom/preference.rb +1 -2
  102. data/app/models/droom/scrap.rb +31 -26
  103. data/app/models/droom/service.rb +31 -0
  104. data/app/models/droom/tag.rb +10 -9
  105. data/app/models/droom/tagging.rb +1 -1
  106. data/app/models/droom/user.rb +453 -130
  107. data/app/models/droom/user_permission.rb +8 -0
  108. data/app/models/droom/venue.rb +21 -32
  109. data/app/serializers/droom/user_serializer.rb +45 -0
  110. data/app/serializers/droom/venue_serializer.rb +5 -0
  111. data/app/views/droom/dashboard/_documents.html.haml +1 -1
  112. data/app/views/droom/dashboard/_folders.html.haml +1 -1
  113. data/app/views/droom/dashboard/_future_events.html.haml +10 -8
  114. data/app/views/droom/dashboard/_groups.html.haml +1 -1
  115. data/app/views/droom/dashboard/_past_events.haml +19 -12
  116. data/app/views/droom/dashboard/_stream.html.haml +2 -2
  117. data/app/views/droom/{users/_extra_columns.html.haml → dashboard/_welcome.html.haml} +0 -0
  118. data/app/views/droom/dashboard/index.html.haml +3 -0
  119. data/app/views/droom/documents/_document.html.haml +0 -2
  120. data/app/views/droom/documents/_documents.html.haml +1 -1
  121. data/app/views/droom/documents/_documents_list.html.haml +1 -1
  122. data/app/views/droom/documents/_documents_table.html.haml +1 -1
  123. data/app/views/droom/documents/_form.html.haml +8 -5
  124. data/app/views/droom/documents/_listing.html.haml +4 -2
  125. data/app/views/droom/documents/index.html.haml +13 -7
  126. data/app/views/droom/documents/new.html.haml +1 -4
  127. data/app/views/droom/events/_action_menu.html.haml +2 -2
  128. data/app/views/droom/events/_attachments.html.haml +8 -0
  129. data/app/views/droom/events/_calendar.html.haml +4 -8
  130. data/app/views/droom/events/_event.html.haml +44 -63
  131. data/app/views/droom/events/_event_line.html.haml +1 -1
  132. data/app/views/droom/events/_events.html.haml +18 -2
  133. data/app/views/droom/events/_form.html.haml +26 -19
  134. data/app/views/droom/events/_invitations.html.haml +7 -3
  135. data/app/views/droom/events/_scrap_events.html.haml +8 -0
  136. data/app/views/droom/events/_suggested.html.haml +4 -1
  137. data/app/views/droom/events/calendar.html.haml +8 -0
  138. data/app/views/droom/events/index.html.haml +24 -26
  139. data/app/views/droom/events/show.html.haml +6 -6
  140. data/app/views/droom/folders/_contents.html.haml +34 -4
  141. data/app/views/droom/folders/_folder.html.haml +7 -2
  142. data/app/views/droom/folders/_form.html.haml +11 -8
  143. data/app/views/droom/folders/index.html.haml +19 -22
  144. data/app/views/droom/group_invitations/_attending_groups.html.haml +1 -1
  145. data/app/views/droom/group_permissions/_toggle.html.haml +18 -0
  146. data/app/views/droom/groups/_action_menu.haml +0 -2
  147. data/app/views/droom/groups/_created.html.haml +0 -1
  148. data/app/views/droom/groups/_form.html.haml +3 -0
  149. data/app/views/droom/groups/_group.html.haml +10 -8
  150. data/app/views/droom/groups/_groups.html.haml +1 -1
  151. data/app/views/droom/groups/_search_result.html.haml +1 -1
  152. data/app/views/droom/groups/_suggested.html.haml +1 -1
  153. data/app/views/droom/groups/index.html.haml +15 -16
  154. data/app/views/droom/invitations/_form.html.haml +1 -1
  155. data/app/views/droom/invitations/_invitation.html.haml +1 -1
  156. data/app/views/droom/invitations/_invitations.html.haml +4 -4
  157. data/app/views/droom/memberships/_button.html.haml +5 -5
  158. data/app/views/droom/memberships/_form.html.haml +26 -7
  159. data/app/views/droom/memberships/_member.html.haml +1 -1
  160. data/app/views/droom/memberships/{_membership_toggle.html.haml → _toggle.html.haml} +4 -4
  161. data/app/views/droom/memberships/index.html.haml +9 -0
  162. data/app/views/droom/organisations/_action_menu.html.haml +1 -1
  163. data/app/views/droom/organisations/_organisation.html.haml +2 -2
  164. data/app/views/droom/organisations/_suggested.html.haml +1 -1
  165. data/app/views/droom/organisations/index.html.haml +11 -11
  166. data/app/views/droom/panels/_admin.html.haml +2 -2
  167. data/app/views/droom/panels/_configuration.html.haml +28 -0
  168. data/app/views/droom/panels/_devices.html.haml +2 -4
  169. data/app/views/droom/panels/_search.html.haml +9 -0
  170. data/app/views/droom/permissions/_action_menu.html.haml +10 -0
  171. data/app/views/droom/permissions/_created.html.haml +3 -0
  172. data/app/views/droom/permissions/_form.html.haml +17 -0
  173. data/app/views/droom/permissions/edit.html.haml +7 -0
  174. data/app/views/droom/permissions/new.html.haml +8 -0
  175. data/app/views/droom/permissions/show.html.haml +4 -0
  176. data/app/views/droom/preferences/_checkbox.html.haml +4 -2
  177. data/app/views/droom/scraps/_caption.html.haml +0 -2
  178. data/app/views/droom/scraps/_credit.html.haml +1 -1
  179. data/app/views/droom/scraps/_form.html.haml +68 -69
  180. data/app/views/droom/scraps/_preload.html.haml +4 -0
  181. data/app/views/droom/scraps/_stream.html.haml +11 -3
  182. data/app/views/droom/scraps/_thumb.html.haml +33 -1
  183. data/app/views/droom/scraps/edit.html.haml +6 -1
  184. data/app/views/droom/scraps/full/_document.html.haml +4 -3
  185. data/app/views/droom/scraps/full/_event.html.haml +17 -16
  186. data/app/views/droom/scraps/full/_image.html.haml +1 -2
  187. data/app/views/droom/scraps/full/_link.html.haml +4 -3
  188. data/app/views/droom/scraps/full/_quote.html.haml +4 -7
  189. data/app/views/droom/scraps/full/_text.html.haml +3 -2
  190. data/app/views/droom/scraps/full/_video.html.haml +2 -2
  191. data/app/views/droom/scraps/new.html.haml +6 -1
  192. data/app/views/droom/scraps/show.html.haml +4 -3
  193. data/app/views/droom/services/_action_menu.html.haml +12 -0
  194. data/app/views/droom/services/_created.html.haml +3 -0
  195. data/app/views/droom/services/_form.html.haml +18 -0
  196. data/app/views/droom/services/_services.html.haml +44 -0
  197. data/app/views/droom/services/edit.html.haml +7 -0
  198. data/app/views/droom/services/index.html.haml +5 -0
  199. data/app/views/droom/{people → services}/new.html.haml +4 -3
  200. data/app/views/droom/services/show.html.haml +4 -0
  201. data/app/views/droom/shared/_controls.html.haml +2 -2
  202. data/app/views/droom/shared/_navigation.html.haml +2 -2
  203. data/app/views/droom/shared/_toolbar.html.haml +1 -1
  204. data/app/views/droom/suggestions/index.html.haml +1 -0
  205. data/app/views/droom/users/_action_menu.html.haml +21 -0
  206. data/app/views/droom/users/_suggested.html.haml +14 -0
  207. data/app/views/droom/users/_user.html.haml +2 -2
  208. data/app/views/droom/users/_users.html.haml +7 -0
  209. data/app/views/droom/users/_users_table.html.haml +21 -22
  210. data/app/views/droom/users/admin.html.haml +10 -0
  211. data/app/views/droom/users/confirmations/_after_confirmation.html.haml +2 -0
  212. data/app/views/droom/users/confirmations/_password_required.html.haml +30 -0
  213. data/app/views/droom/users/confirmations/failure.en.html.haml +22 -0
  214. data/app/views/droom/users/confirmations/show.html.haml +13 -0
  215. data/app/views/droom/users/edit.html.haml +2 -10
  216. data/app/views/droom/users/edit/_details.html.haml +13 -0
  217. data/app/views/droom/users/edit/_memberships.html.haml +13 -0
  218. data/app/views/droom/users/edit/_password_fields.html.haml +16 -0
  219. data/app/views/droom/users/edit/_preferences.html.haml +37 -0
  220. data/app/views/droom/users/edit/_profile.html.haml +26 -0
  221. data/app/views/droom/users/edit/_user_fields.html.haml +66 -0
  222. data/app/views/droom/users/index.html.haml +6 -32
  223. data/app/views/droom/users/new.html.haml +3 -0
  224. data/app/views/droom/users/passwords/completed.html.haml +13 -0
  225. data/app/views/{devise → droom/users}/passwords/edit.html.haml +10 -4
  226. data/app/views/{devise → droom/users}/passwords/new.html.haml +4 -3
  227. data/app/views/droom/users/passwords/show.html.haml +6 -0
  228. data/app/views/droom/users/show.html.haml +2 -0
  229. data/app/views/droom/users/show/_listed.html.haml +46 -0
  230. data/app/views/droom/users/show/_profile.html.haml +33 -0
  231. data/app/views/droom/users/show/_tabled.html.haml +28 -0
  232. data/config/initializers/chronic.rb +2 -0
  233. data/config/initializers/devise.rb +35 -2
  234. data/config/initializers/paperclip.rb +11 -6
  235. data/config/locales/devise.en.yml +1 -1
  236. data/config/locales/en.yml +198 -103
  237. data/config/routes.rb +37 -45
  238. data/db/migrate/20130207123614_stream.rb +5 -1
  239. data/db/migrate/20130225095328_create_droom_calendars.rb +0 -1
  240. data/db/migrate/20130627065459_permissions.rb +34 -0
  241. data/db/migrate/20130627071938_users_take_over.rb +38 -0
  242. data/db/migrate/20130627073759_user_properties.rb +34 -0
  243. data/db/migrate/20130627080021_no_more_people.rb +11 -0
  244. data/db/migrate/20130701122935_directory_groups.rb +8 -0
  245. data/db/migrate/20130701123152_remove_old_access_control.rb +16 -0
  246. data/db/migrate/20130729102857_more_scrap_data.rb +12 -0
  247. data/db/migrate/20130904080340_international_names.rb +17 -0
  248. data/db/migrate/20130904080341_honours.rb +5 -0
  249. data/db/migrate/20131124082222_simple_addresses.rb +25 -0
  250. data/db/migrate/20131201093351_event_time_zone.rb +5 -0
  251. data/db/migrate/20131217060311_session_revocable.rb +5 -0
  252. data/db/migrate/20131219180311_event_types.rb +15 -0
  253. data/lib/devise/strategies/cookie_authenticatable.rb +46 -0
  254. data/lib/droom.rb +48 -33
  255. data/lib/droom/auth_cookie.rb +82 -0
  256. data/lib/droom/cropper.rb +24 -0
  257. data/lib/droom/engine.rb +20 -2
  258. data/lib/droom/folders.rb +6 -6
  259. data/lib/droom/lazy_hash.rb +11 -1
  260. data/lib/droom/monkeys.rb +6 -6
  261. data/lib/droom/taggability.rb +1 -1
  262. data/lib/droom/validators.rb +1 -1
  263. data/lib/droom/version.rb +1 -1
  264. data/lib/generators/droom/install/templates/droom_initializer.rb +10 -2
  265. data/lib/paperclip/geometry_transformation.rb +80 -0
  266. data/lib/paperclip/validators/attachment_height_validator.rb +89 -0
  267. data/lib/paperclip/validators/attachment_width_validator.rb +89 -0
  268. data/lib/paperclip_processors/offset_thumbnail.rb +85 -0
  269. data/spec/dummy/config/application.rb +0 -7
  270. data/spec/dummy/config/environments/development.rb +1 -10
  271. data/spec/dummy/config/environments/production.rb +1 -0
  272. data/spec/dummy/config/environments/test.rb +2 -7
  273. data/spec/dummy/db/migrate/20130130120631_folder_ancestry_to_parents.droom.rb +1 -1
  274. data/spec/dummy/db/migrate/20130724124758_dropbox_tokens.droom.rb +10 -0
  275. data/spec/dummy/db/migrate/20130724124759_preference_uuids.droom.rb +6 -0
  276. data/spec/dummy/db/migrate/20130724124760_stream.droom.rb +14 -0
  277. data/spec/dummy/db/migrate/20130724124761_access_token_secret.droom.rb +6 -0
  278. data/spec/dummy/db/migrate/20130724124762_person_image.droom.rb +10 -0
  279. data/spec/dummy/db/migrate/20130724124763_devise_confirmable.droom.rb +14 -0
  280. data/spec/dummy/db/migrate/20130724124764_create_droom_calendars.droom.rb +20 -0
  281. data/spec/dummy/db/migrate/20130724124765_give_scraps_document.droom.rb +6 -0
  282. data/spec/dummy/db/migrate/20130724124766_privateness.droom.rb +10 -0
  283. data/spec/dummy/db/migrate/20130724124767_store_metadata.droom.rb +6 -0
  284. data/spec/dummy/db/migrate/20130724124768_folders_nicely.droom.rb +7 -0
  285. data/spec/dummy/db/migrate/20130724124769_niceties.droom.rb +8 -0
  286. data/spec/dummy/db/migrate/20130724124770_create_droom_dropbox_documents.droom.rb +12 -0
  287. data/spec/dummy/db/migrate/20130724124771_dropbox_documents_changed.droom.rb +6 -0
  288. data/spec/dummy/db/migrate/20130724124772_user_titles.droom.rb +6 -0
  289. data/spec/dummy/db/migrate/20130724124773_permissions.droom.rb +35 -0
  290. data/spec/dummy/db/migrate/20130724124774_users_take_over.droom.rb +39 -0
  291. data/spec/dummy/db/migrate/20130724124775_user_properties.droom.rb +35 -0
  292. data/spec/dummy/db/migrate/20130724124776_no_more_people.droom.rb +12 -0
  293. data/spec/dummy/db/migrate/20130724124777_directory_groups.droom.rb +9 -0
  294. data/spec/dummy/db/migrate/20130724124778_remove_old_access_control.droom.rb +17 -0
  295. data/spec/dummy/db/schema.rb +217 -140
  296. data/spec/factories/documents.rb +0 -5
  297. data/spec/factories/events.rb +0 -9
  298. data/spec/factories/user.rb +4 -2
  299. data/spec/lib/droom/folders_spec.rb +8 -8
  300. data/spec/models/droom/document_spec.rb +6 -43
  301. data/spec/models/droom/event_spec.rb +0 -34
  302. data/spec/models/droom/mailing_list_membership_spec.rb +4 -4
  303. data/spec/models/droom/membership_spec.rb +2 -2
  304. data/spec/spec_helper.rb +1 -10
  305. metadata +322 -282
  306. data/app/assets/images/droom/Untitled-1.png +0 -0
  307. data/app/assets/images/droom/asterisk.png +0 -0
  308. data/app/assets/images/droom/smallmanage.png +0 -0
  309. data/app/assets/javascripts/droom/lib/kalendae.js +0 -1692
  310. data/app/assets/stylesheets/lib/_kalendae.css.sass +0 -139
  311. data/app/controllers/droom/pages_controller.rb +0 -61
  312. data/app/controllers/droom/people_controller.rb +0 -111
  313. data/app/models/droom/document_attachment.rb +0 -37
  314. data/app/models/droom/page.rb +0 -26
  315. data/app/models/droom/person.rb +0 -309
  316. data/app/models/droom/recurrence_rule.rb +0 -82
  317. data/app/models/droom/user_action_observer.rb +0 -12
  318. data/app/views/devise/confirmations/failure.en.html.haml +0 -20
  319. data/app/views/devise/confirmations/show.html.haml +0 -19
  320. data/app/views/droom/confirmations/show.html.haml +0 -40
  321. data/app/views/droom/documents/_document_line.html.haml +0 -2
  322. data/app/views/droom/events/_created.html.haml +0 -2
  323. data/app/views/droom/folders/_attachments.html.haml +0 -3
  324. data/app/views/droom/pages/_contents.html.haml +0 -10
  325. data/app/views/droom/pages/_form.html.haml +0 -36
  326. data/app/views/droom/pages/_full_page.html.haml +0 -17
  327. data/app/views/droom/pages/_page.html.haml +0 -5
  328. data/app/views/droom/pages/_pages.html.haml +0 -2
  329. data/app/views/droom/pages/admin.html.haml +0 -24
  330. data/app/views/droom/pages/edit.html.haml +0 -1
  331. data/app/views/droom/pages/index.html.haml +0 -10
  332. data/app/views/droom/pages/new.html.haml +0 -4
  333. data/app/views/droom/pages/show.html.haml +0 -5
  334. data/app/views/droom/panels/_account.html.haml +0 -16
  335. data/app/views/droom/panels/_readers.html.haml +0 -18
  336. data/app/views/droom/panels/_suggestions.html.haml +0 -15
  337. data/app/views/droom/people/_action_menu.html.haml +0 -22
  338. data/app/views/droom/people/_created.html.haml +0 -6
  339. data/app/views/droom/people/_form.html.haml +0 -66
  340. data/app/views/droom/people/_listing.html.haml +0 -19
  341. data/app/views/droom/people/_memberships.html.haml +0 -24
  342. data/app/views/droom/people/_people.html.haml +0 -5
  343. data/app/views/droom/people/_person.html.haml +0 -32
  344. data/app/views/droom/people/_search_result.html.haml +0 -14
  345. data/app/views/droom/people/_suggested.html.haml +0 -14
  346. data/app/views/droom/people/edit.html.haml +0 -9
  347. data/app/views/droom/people/index.html.haml +0 -8
  348. data/app/views/droom/people/show.html.haml +0 -31
  349. data/app/views/droom/scraps/_heading.html.haml +0 -16
  350. data/app/views/droom/scraps/thumbs/_document.html.haml +0 -9
  351. data/app/views/droom/scraps/thumbs/_event.html.haml +0 -17
  352. data/app/views/droom/scraps/thumbs/_image.html.haml +0 -6
  353. data/app/views/droom/scraps/thumbs/_link.html.haml +0 -10
  354. data/app/views/droom/scraps/thumbs/_quote.html.haml +0 -8
  355. data/app/views/droom/scraps/thumbs/_text.html.haml +0 -8
  356. data/app/views/droom/scraps/thumbs/_video.html.haml +0 -6
  357. data/app/views/droom/users/_extra_columns_header.html.haml +0 -0
  358. data/app/views/droom/users/_extra_columns_note.html.haml +0 -0
  359. data/app/views/droom/users/_form.html.haml +0 -14
  360. data/app/views/droom/users/_password_fields.html.haml +0 -15
  361. data/app/views/droom/users/_user_or_person.html.haml +0 -72
  362. data/app/views/kaminari/_paginator.html.haml +0 -16
  363. data/lib/droom/dav_resource.rb +0 -36
  364. data/lib/droom/model_helpers.rb +0 -25
  365. data/lib/droom/routing.rb +0 -13
  366. data/spec/datasets/calendar_events_dataset.rb +0 -44
  367. data/spec/datasets/calendar_pages_dataset.rb +0 -8
  368. data/spec/datasets/calendar_sites_dataset.rb +0 -6
  369. data/spec/datasets/calendars_dataset.rb +0 -34
  370. data/spec/datasets/documents_dataset.rb +0 -28
  371. data/spec/datasets/recurrence_dataset.rb +0 -7
  372. data/spec/dummy/config/sunspot.yml +0 -17
  373. data/spec/dummy/log/dav.log +0 -1
  374. data/spec/dummy/log/development.log +0 -2
  375. data/spec/dummy/log/test.log +0 -1
  376. data/spec/dummy/solr/conf/admin-extra.html +0 -31
  377. data/spec/dummy/solr/conf/elevate.xml +0 -36
  378. data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
  379. data/spec/dummy/solr/conf/protwords.txt +0 -21
  380. data/spec/dummy/solr/conf/schema.xml +0 -238
  381. data/spec/dummy/solr/conf/scripts.conf +0 -24
  382. data/spec/dummy/solr/conf/solrconfig.xml +0 -934
  383. data/spec/dummy/solr/conf/spellings.txt +0 -2
  384. data/spec/dummy/solr/conf/stopwords.txt +0 -58
  385. data/spec/dummy/solr/conf/synonyms.txt +0 -31
  386. data/spec/dummy/solr/data/development/index/segments.gen +0 -0
  387. data/spec/dummy/solr/data/development/index/segments_1 +0 -0
  388. data/spec/dummy/solr/data/development/spellchecker/segments.gen +0 -0
  389. data/spec/dummy/solr/data/development/spellchecker/segments_1 +0 -0
  390. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  391. data/spec/dummy/solr/data/test/index/segments_3nu +0 -0
  392. data/spec/dummy/solr/data/test/spellchecker/segments.gen +0 -0
  393. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  394. data/spec/factories/recurrence_rules.rb +0 -25
  395. data/spec/models/droom/person_spec.rb +0 -72
  396. data/spec/models/droom/recurrence_rule_spec.rb +0 -81
@@ -0,0 +1,12 @@
1
+ # This migration comes from droom (originally 20130627080021)
2
+ class NoMorePeople < ActiveRecord::Migration
3
+ def change
4
+ remove_column :droom_invitations, :person_id
5
+ remove_column :droom_memberships, :person_id
6
+ remove_column :droom_personal_folders, :person_id
7
+ remove_column :droom_dropbox_documents, :person_id
8
+
9
+ drop_table :droom_people
10
+ drop_table :droom_personal_documents
11
+ end
12
+ end
@@ -0,0 +1,9 @@
1
+ # This migration comes from droom (originally 20130701122935)
2
+ class DirectoryGroups < ActiveRecord::Migration
3
+ def change
4
+ add_column :droom_groups, :directory, :boolean
5
+ add_column :droom_events, :confidential, :boolean
6
+ add_index :droom_groups, :directory
7
+ add_index :droom_events, :confidential
8
+ end
9
+ end
@@ -0,0 +1,17 @@
1
+ # This migration comes from droom (originally 20130701123152)
2
+ class RemoveOldAccessControl < ActiveRecord::Migration
3
+ def change
4
+ remove_column :droom_groups, :private
5
+ remove_column :droom_groups, :public
6
+ remove_column :droom_groups, :privileged
7
+
8
+ remove_column :droom_events, :private
9
+ remove_column :droom_events, :public
10
+
11
+ remove_column :droom_users, :private
12
+ remove_column :droom_users, :public
13
+
14
+ remove_column :droom_documents, :private
15
+ remove_column :droom_documents, :public
16
+ end
17
+ end
@@ -9,28 +9,62 @@
9
9
  # from scratch. The latter is a flawed and unsustainable approach (the more migrations
10
10
  # you'll amass, the slower it'll run and the greater likelihood for issues).
11
11
  #
12
- # It's strongly recommended to check this file into your version control system.
12
+ # It's strongly recommended that you check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20130201103738) do
14
+ ActiveRecord::Schema.define(version: 20130724124778) do
15
15
 
16
- create_table "droom_agenda_categories", :force => true do |t|
16
+ create_table "droom_agenda_categories", force: true do |t|
17
17
  t.integer "event_id"
18
18
  t.integer "category_id"
19
19
  t.integer "created_by_id"
20
- t.datetime "created_at", :null => false
21
- t.datetime "updated_at", :null => false
20
+ t.datetime "created_at", null: false
21
+ t.datetime "updated_at", null: false
22
22
  end
23
23
 
24
- create_table "droom_categories", :force => true do |t|
24
+ create_table "droom_calendars", force: true do |t|
25
+ t.string "name"
26
+ t.string "slug"
27
+ t.boolean "events_private", default: false
28
+ t.boolean "documents_private", default: false
29
+ t.integer "created_by_id"
30
+ t.datetime "created_at"
31
+ t.datetime "updated_at"
32
+ end
33
+
34
+ add_index "droom_calendars", ["slug"], name: "index_droom_calendars_on_slug", using: :btree
35
+
36
+ create_table "droom_categories", force: true do |t|
25
37
  t.string "name"
26
38
  t.text "description"
27
39
  t.integer "created_by_id"
28
- t.datetime "created_at", :null => false
29
- t.datetime "updated_at", :null => false
40
+ t.datetime "created_at", null: false
41
+ t.datetime "updated_at", null: false
30
42
  t.string "slug"
31
43
  end
32
44
 
33
- create_table "droom_documents", :force => true do |t|
45
+ create_table "droom_document_attachments", force: true do |t|
46
+ t.integer "document_id"
47
+ t.string "attachee_type"
48
+ t.integer "attachee_id"
49
+ t.integer "created_by_id"
50
+ t.datetime "created_at", null: false
51
+ t.datetime "updated_at", null: false
52
+ t.integer "category_id"
53
+ end
54
+
55
+ add_index "droom_document_attachments", ["attachee_type", "attachee_id"], name: "attachee", using: :btree
56
+
57
+ create_table "droom_document_links", force: true do |t|
58
+ t.integer "person_id"
59
+ t.integer "document_attachment_id"
60
+ t.datetime "created_at", null: false
61
+ t.datetime "updated_at", null: false
62
+ end
63
+
64
+ add_index "droom_document_links", ["document_attachment_id"], name: "index_droom_document_links_on_document_attachment_id", using: :btree
65
+ add_index "droom_document_links", ["person_id"], name: "index_droom_document_links_on_person_id", using: :btree
66
+
67
+ create_table "droom_documents", force: true do |t|
34
68
  t.string "name"
35
69
  t.text "description"
36
70
  t.integer "version"
@@ -40,31 +74,42 @@ ActiveRecord::Schema.define(:version => 20130201103738) do
40
74
  t.datetime "file_updated_at"
41
75
  t.string "file_fingerprint"
42
76
  t.integer "created_by_id"
43
- t.boolean "public", :default => false
44
- t.boolean "secret", :default => false
45
- t.datetime "created_at", :null => false
46
- t.datetime "updated_at", :null => false
77
+ t.datetime "created_at", null: false
78
+ t.datetime "updated_at", null: false
47
79
  t.integer "folder_id"
48
80
  t.text "extracted_text"
81
+ t.text "extracted_metadata"
82
+ end
83
+
84
+ add_index "droom_documents", ["folder_id"], name: "index_droom_documents_on_folder_id", using: :btree
85
+
86
+ create_table "droom_dropbox_documents", force: true do |t|
87
+ t.string "path"
88
+ t.integer "document_id"
89
+ t.boolean "modified"
90
+ t.datetime "created_at"
91
+ t.datetime "updated_at"
92
+ t.integer "user_id"
49
93
  end
50
94
 
51
- add_index "droom_documents", ["folder_id"], :name => "index_droom_documents_on_folder_id"
95
+ add_index "droom_dropbox_documents", ["user_id"], name: "index_droom_dropbox_documents_on_user_id", using: :btree
52
96
 
53
- create_table "droom_dropbox_tokens", :force => true do |t|
97
+ create_table "droom_dropbox_tokens", force: true do |t|
54
98
  t.integer "created_by_id"
55
99
  t.string "access_token"
56
- t.datetime "created_at", :null => false
57
- t.datetime "updated_at", :null => false
100
+ t.datetime "created_at"
101
+ t.datetime "updated_at"
102
+ t.string "access_token_secret"
58
103
  end
59
104
 
60
- create_table "droom_event_sets", :force => true do |t|
105
+ create_table "droom_event_sets", force: true do |t|
61
106
  t.string "name"
62
107
  t.integer "created_by_id"
63
- t.datetime "created_at", :null => false
64
- t.datetime "updated_at", :null => false
108
+ t.datetime "created_at", null: false
109
+ t.datetime "updated_at", null: false
65
110
  end
66
111
 
67
- create_table "droom_events", :force => true do |t|
112
+ create_table "droom_events", force: true do |t|
68
113
  t.datetime "start"
69
114
  t.datetime "finish"
70
115
  t.string "name"
@@ -77,57 +122,72 @@ ActiveRecord::Schema.define(:version => 20130201103738) do
77
122
  t.string "uuid"
78
123
  t.boolean "all_day"
79
124
  t.integer "master_id"
80
- t.boolean "private"
81
- t.boolean "public"
82
- t.datetime "created_at", :null => false
83
- t.datetime "updated_at", :null => false
125
+ t.datetime "created_at", null: false
126
+ t.datetime "updated_at", null: false
127
+ t.integer "calendar_id"
128
+ t.boolean "confidential"
84
129
  end
85
130
 
86
- add_index "droom_events", ["event_set_id"], :name => "index_droom_events_on_event_set_id"
87
- add_index "droom_events", ["master_id"], :name => "index_droom_events_on_master_id"
88
- add_index "droom_events", ["public"], :name => "index_droom_events_on_public"
131
+ add_index "droom_events", ["calendar_id"], name: "index_droom_events_on_calendar_id", using: :btree
132
+ add_index "droom_events", ["confidential"], name: "index_droom_events_on_confidential", using: :btree
133
+ add_index "droom_events", ["event_set_id"], name: "index_droom_events_on_event_set_id", using: :btree
134
+ add_index "droom_events", ["master_id"], name: "index_droom_events_on_master_id", using: :btree
89
135
 
90
- create_table "droom_folders", :force => true do |t|
136
+ create_table "droom_folders", force: true do |t|
91
137
  t.string "slug"
92
138
  t.string "holder_type"
93
139
  t.string "holder_id"
94
140
  t.integer "parent_id"
95
- t.boolean "public", :default => false
96
141
  t.integer "created_by_id"
97
- t.datetime "created_at", :null => false
98
- t.datetime "updated_at", :null => false
142
+ t.datetime "created_at", null: false
143
+ t.datetime "updated_at", null: false
144
+ t.boolean "private"
145
+ t.string "name"
99
146
  end
100
147
 
101
- create_table "droom_group_invitations", :force => true do |t|
148
+ add_index "droom_folders", ["parent_id"], name: "index_droom_folders_on_parent_id", using: :btree
149
+
150
+ create_table "droom_group_invitations", force: true do |t|
102
151
  t.integer "group_id"
103
152
  t.integer "event_id"
104
153
  t.integer "created_by_id"
105
154
  end
106
155
 
107
- create_table "droom_groups", :force => true do |t|
156
+ create_table "droom_group_permissions", force: true do |t|
157
+ t.integer "group_id"
158
+ t.integer "permission_id"
159
+ t.datetime "created_at"
160
+ t.datetime "updated_at"
161
+ end
162
+
163
+ create_table "droom_groups", force: true do |t|
108
164
  t.string "name"
109
165
  t.string "slug"
110
166
  t.integer "leader_id"
111
167
  t.integer "created_by_id"
112
- t.datetime "created_at", :null => false
113
- t.datetime "updated_at", :null => false
168
+ t.datetime "created_at", null: false
169
+ t.datetime "updated_at", null: false
114
170
  t.text "description"
115
171
  t.string "mailing_list_name"
172
+ t.boolean "directory"
116
173
  end
117
174
 
118
- create_table "droom_invitations", :force => true do |t|
119
- t.integer "person_id"
175
+ add_index "droom_groups", ["directory"], name: "index_droom_groups_on_directory", using: :btree
176
+
177
+ create_table "droom_invitations", force: true do |t|
120
178
  t.integer "event_id"
121
179
  t.integer "created_by_id"
122
- t.datetime "created_at", :null => false
123
- t.datetime "updated_at", :null => false
180
+ t.datetime "created_at", null: false
181
+ t.datetime "updated_at", null: false
124
182
  t.integer "group_invitation_id"
183
+ t.integer "response", default: 1
184
+ t.integer "user_id"
125
185
  end
126
186
 
127
- add_index "droom_invitations", ["event_id"], :name => "index_droom_invitations_on_event_id"
128
- add_index "droom_invitations", ["person_id"], :name => "index_droom_invitations_on_person_id"
187
+ add_index "droom_invitations", ["event_id"], name: "index_droom_invitations_on_event_id", using: :btree
188
+ add_index "droom_invitations", ["user_id"], name: "index_droom_invitations_on_user_id", using: :btree
129
189
 
130
- create_table "droom_mailing_list_memberships", :force => true do |t|
190
+ create_table "droom_mailing_list_memberships", force: true do |t|
131
191
  t.integer "membership_id"
132
192
  t.string "address"
133
193
  t.string "listname"
@@ -152,160 +212,177 @@ ActiveRecord::Schema.define(:version => 20130201103738) do
152
212
  t.date "bi_date"
153
213
  end
154
214
 
155
- add_index "droom_mailing_list_memberships", ["address", "listname"], :name => "index_droom_mailing_list_memberships_on_address_and_listname"
156
- add_index "droom_mailing_list_memberships", ["membership_id"], :name => "index_droom_mailing_list_memberships_on_membership_id"
215
+ add_index "droom_mailing_list_memberships", ["address", "listname"], name: "index_droom_mailing_list_memberships_on_address_and_listname", using: :btree
216
+ add_index "droom_mailing_list_memberships", ["membership_id"], name: "index_droom_mailing_list_memberships_on_membership_id", using: :btree
157
217
 
158
- create_table "droom_memberships", :force => true do |t|
159
- t.integer "person_id"
218
+ create_table "droom_memberships", force: true do |t|
160
219
  t.integer "group_id"
161
220
  t.integer "created_by_id"
162
- t.datetime "created_at", :null => false
163
- t.datetime "updated_at", :null => false
221
+ t.datetime "created_at", null: false
222
+ t.datetime "updated_at", null: false
164
223
  t.datetime "expires"
224
+ t.integer "user_id"
165
225
  end
166
226
 
167
- add_index "droom_memberships", ["group_id"], :name => "index_droom_memberships_on_group_id"
168
- add_index "droom_memberships", ["person_id"], :name => "index_droom_memberships_on_person_id"
227
+ add_index "droom_memberships", ["group_id"], name: "index_droom_memberships_on_group_id", using: :btree
228
+ add_index "droom_memberships", ["user_id"], name: "index_droom_memberships_on_user_id", using: :btree
169
229
 
170
- create_table "droom_pages", :force => true do |t|
230
+ create_table "droom_pages", force: true do |t|
171
231
  t.string "title"
172
232
  t.string "slug"
173
233
  t.text "summary"
174
234
  t.text "body"
175
235
  t.text "rendered_body"
176
236
  t.string "video_id"
177
- t.datetime "created_at", :null => false
178
- t.datetime "updated_at", :null => false
237
+ t.datetime "created_at", null: false
238
+ t.datetime "updated_at", null: false
179
239
  end
180
240
 
181
- create_table "droom_people", :force => true do |t|
241
+ create_table "droom_permissions", force: true do |t|
242
+ t.integer "service_id"
182
243
  t.string "name"
183
- t.string "title"
184
- t.string "email"
185
- t.string "phone"
244
+ t.string "slug"
186
245
  t.text "description"
187
- t.string "image_file_name"
188
- t.string "image_content_type"
189
- t.integer "image_file_size"
190
- t.datetime "image_updated_at"
191
- t.integer "user_id"
192
- t.integer "created_by_id"
193
- t.datetime "created_at", :null => false
194
- t.datetime "updated_at", :null => false
195
- t.string "post_line1"
196
- t.string "post_line2"
197
- t.string "post_city"
198
- t.string "post_region"
199
- t.string "post_country"
200
- t.string "post_code"
201
- t.string "forename"
202
- t.integer "position", :default => 1
203
- t.boolean "public", :default => false
204
- t.boolean "shy", :default => false
205
- t.string "mobile"
206
- t.datetime "dob"
207
- t.boolean "female"
246
+ t.integer "position"
247
+ t.datetime "created_at"
248
+ t.datetime "updated_at"
208
249
  end
209
250
 
210
- add_index "droom_people", ["email"], :name => "index_droom_people_on_email"
211
- add_index "droom_people", ["public"], :name => "index_droom_people_on_public"
212
- add_index "droom_people", ["user_id"], :name => "index_droom_people_on_user_id"
213
-
214
- create_table "droom_personal_documents", :force => true do |t|
215
- t.integer "document_attachment_id"
216
- t.integer "person_id"
217
- t.integer "version"
218
- t.string "file_file_name"
219
- t.string "file_content_type"
220
- t.integer "file_file_size"
221
- t.datetime "file_updated_at"
222
- t.string "file_fingerprint"
223
- t.datetime "created_at", :null => false
224
- t.datetime "updated_at", :null => false
225
- t.integer "document_link_id"
226
- t.integer "personal_folder_id"
227
- end
228
-
229
- add_index "droom_personal_documents", ["document_attachment_id"], :name => "index_droom_personal_documents_on_document_attachment_id"
230
- add_index "droom_personal_documents", ["document_link_id"], :name => "index_droom_personal_documents_on_document_link_id"
231
- add_index "droom_personal_documents", ["person_id"], :name => "index_droom_personal_documents_on_person_id"
232
- add_index "droom_personal_documents", ["personal_folder_id"], :name => "index_droom_personal_documents_on_personal_folder_id"
233
-
234
- create_table "droom_personal_folders", :force => true do |t|
251
+ create_table "droom_personal_folders", force: true do |t|
235
252
  t.integer "folder_id"
236
- t.integer "person_id"
237
- t.datetime "created_at", :null => false
238
- t.datetime "updated_at", :null => false
253
+ t.datetime "created_at", null: false
254
+ t.datetime "updated_at", null: false
255
+ t.integer "user_id"
239
256
  end
240
257
 
241
- create_table "droom_preferences", :force => true do |t|
258
+ add_index "droom_personal_folders", ["user_id"], name: "index_droom_personal_folders_on_user_id", using: :btree
259
+
260
+ create_table "droom_preferences", force: true do |t|
242
261
  t.integer "created_by_id"
243
262
  t.string "key"
244
263
  t.string "value"
245
- t.datetime "created_at", :null => false
246
- t.datetime "updated_at", :null => false
264
+ t.datetime "created_at"
265
+ t.datetime "updated_at"
266
+ t.string "uuid"
247
267
  end
248
268
 
249
- create_table "droom_recurrence_rules", :force => true do |t|
269
+ create_table "droom_recurrence_rules", force: true do |t|
250
270
  t.integer "event_id"
251
- t.boolean "active", :default => false
271
+ t.boolean "active", default: false
252
272
  t.string "period"
253
273
  t.string "basis"
254
- t.integer "interval", :default => 1
274
+ t.integer "interval", default: 1
255
275
  t.datetime "limiting_date"
256
276
  t.integer "limiting_count"
257
277
  t.integer "created_by_id"
258
- t.datetime "created_at", :null => false
259
- t.datetime "updated_at", :null => false
278
+ t.datetime "created_at", null: false
279
+ t.datetime "updated_at", null: false
260
280
  end
261
281
 
262
- add_index "droom_recurrence_rules", ["event_id"], :name => "index_droom_recurrence_rules_on_event_id"
282
+ add_index "droom_recurrence_rules", ["event_id"], name: "index_droom_recurrence_rules_on_event_id", using: :btree
263
283
 
264
- create_table "droom_taggings", :force => true do |t|
284
+ create_table "droom_scraps", force: true do |t|
285
+ t.string "name"
286
+ t.text "body"
287
+ t.string "image_file_name"
288
+ t.string "image_content_type"
289
+ t.integer "image_file_size"
290
+ t.datetime "image_updated_at"
291
+ t.integer "created_by_id"
292
+ t.string "scraptype"
293
+ t.string "note"
294
+ t.datetime "created_at"
295
+ t.datetime "updated_at"
296
+ t.integer "event_id"
297
+ t.integer "document_id"
298
+ end
299
+
300
+ add_index "droom_scraps", ["event_id"], name: "index_droom_scraps_on_event_id", using: :btree
301
+
302
+ create_table "droom_services", force: true do |t|
303
+ t.string "name"
304
+ t.string "slug"
305
+ t.string "url"
306
+ t.text "description"
307
+ end
308
+
309
+ create_table "droom_taggings", force: true do |t|
265
310
  t.integer "tag_id"
266
311
  t.integer "taggee_id"
267
312
  t.string "taggee_type"
268
313
  t.integer "created_by_id"
269
- t.datetime "created_at", :null => false
270
- t.datetime "updated_at", :null => false
314
+ t.datetime "created_at", null: false
315
+ t.datetime "updated_at", null: false
271
316
  end
272
317
 
273
- create_table "droom_tags", :force => true do |t|
318
+ create_table "droom_tags", force: true do |t|
274
319
  t.string "name"
275
320
  t.integer "parent_id"
276
321
  t.integer "created_by_id"
277
- t.datetime "created_at", :null => false
278
- t.datetime "updated_at", :null => false
322
+ t.datetime "created_at", null: false
323
+ t.datetime "updated_at", null: false
324
+ end
325
+
326
+ create_table "droom_user_permissions", force: true do |t|
327
+ t.integer "user_id"
328
+ t.integer "group_permission_id"
329
+ t.integer "permission_id"
330
+ t.datetime "created_at"
331
+ t.datetime "updated_at"
279
332
  end
280
333
 
281
- create_table "droom_users", :force => true do |t|
334
+ create_table "droom_users", force: true do |t|
282
335
  t.string "name"
283
336
  t.string "forename"
284
- t.boolean "admin", :default => false
285
- t.datetime "activated_at"
286
- t.datetime "invited_at"
287
- t.datetime "invited_by_id"
337
+ t.boolean "admin", default: false
288
338
  t.datetime "reminded_at"
289
- t.string "email", :default => "", :null => false
290
- t.string "encrypted_password", :default => "", :null => false
339
+ t.string "email", default: "", null: false
340
+ t.string "encrypted_password", default: "", null: false
291
341
  t.string "reset_password_token"
292
342
  t.datetime "reset_password_sent_at"
293
343
  t.datetime "remember_created_at"
294
- t.integer "sign_in_count", :default => 0
344
+ t.integer "sign_in_count", default: 0
295
345
  t.datetime "current_sign_in_at"
296
346
  t.datetime "last_sign_in_at"
297
347
  t.string "current_sign_in_ip"
298
348
  t.string "last_sign_in_ip"
299
349
  t.string "authentication_token"
300
350
  t.string "password_salt"
301
- t.datetime "created_at", :null => false
302
- t.datetime "updated_at", :null => false
351
+ t.datetime "created_at"
352
+ t.datetime "updated_at"
353
+ t.string "confirmation_token"
354
+ t.datetime "confirmed_at"
355
+ t.datetime "confirmation_sent_at"
356
+ t.string "unconfirmed_email"
357
+ t.string "title"
358
+ t.string "uid"
359
+ t.integer "organisation_id"
360
+ t.string "phone"
361
+ t.text "description"
362
+ t.string "post_line1"
363
+ t.string "post_line2"
364
+ t.string "post_city"
365
+ t.string "post_region"
366
+ t.string "post_country"
367
+ t.string "post_code"
368
+ t.string "mobile"
369
+ t.datetime "dob"
370
+ t.boolean "female"
371
+ t.string "image_file_name"
372
+ t.string "image_content_type"
373
+ t.integer "image_file_size"
374
+ t.datetime "image_updated_at"
375
+ t.integer "image_offset_top"
376
+ t.integer "image_offset_left"
377
+ t.integer "image_scale_width"
378
+ t.integer "image_scale_height"
303
379
  end
304
380
 
305
- add_index "droom_users", ["email"], :name => "index_droom_users_on_email", :unique => true
306
- add_index "droom_users", ["reset_password_token"], :name => "index_droom_users_on_reset_password_token", :unique => true
381
+ add_index "droom_users", ["confirmation_token"], name: "index_droom_users_on_confirmation_token", unique: true, using: :btree
382
+ add_index "droom_users", ["email"], name: "index_droom_users_on_email", unique: true, using: :btree
383
+ add_index "droom_users", ["reset_password_token"], name: "index_droom_users_on_reset_password_token", unique: true, using: :btree
307
384
 
308
- create_table "droom_venues", :force => true do |t|
385
+ create_table "droom_venues", force: true do |t|
309
386
  t.string "name"
310
387
  t.text "description"
311
388
  t.string "post_line1"
@@ -315,13 +392,13 @@ ActiveRecord::Schema.define(:version => 20130201103738) do
315
392
  t.string "post_country"
316
393
  t.string "post_code"
317
394
  t.string "url"
318
- t.decimal "lat", :precision => 15, :scale => 10
319
- t.decimal "lng", :precision => 15, :scale => 10
395
+ t.decimal "lat", precision: 15, scale: 10
396
+ t.decimal "lng", precision: 15, scale: 10
320
397
  t.boolean "prepend_article"
321
- t.datetime "created_at", :null => false
322
- t.datetime "updated_at", :null => false
398
+ t.datetime "created_at", null: false
399
+ t.datetime "updated_at", null: false
323
400
  end
324
401
 
325
- add_index "droom_venues", ["lat", "lng"], :name => "index_droom_venues_on_lat_and_lng"
402
+ add_index "droom_venues", ["lat", "lng"], name: "index_droom_venues_on_lat_and_lng", using: :btree
326
403
 
327
404
  end