hydra-head 3.3.0 → 4.0.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (313) hide show
  1. data/Gemfile +2 -0
  2. data/Gemfile.lock +155 -181
  3. data/HISTORY.textile +5 -0
  4. data/INSTALL_PREREQ.textile +6 -3
  5. data/README.textile +8 -4
  6. data/{assets → app/assets}/images/hydra/powered_by_hydra.png +0 -0
  7. data/{assets → app/assets}/images/hydra/search-button.png +0 -0
  8. data/{assets → app/assets}/javascripts/date-picker/booking/index.html +0 -0
  9. data/{assets → app/assets}/javascripts/date-picker/calendarHTML.txt +0 -0
  10. data/{assets → app/assets}/javascripts/date-picker/css/datepicker.css +0 -0
  11. data/{assets → app/assets}/javascripts/date-picker/css/demo.css +0 -0
  12. data/{assets → app/assets}/javascripts/date-picker/index.html +0 -0
  13. data/{assets → app/assets}/javascripts/date-picker/js/datepicker.js +0 -0
  14. data/{assets → app/assets}/javascripts/date-picker/js/datepicker.packed.js +0 -0
  15. data/{assets → app/assets}/javascripts/date-picker/js/lang/ar.js +0 -0
  16. data/{assets → app/assets}/javascripts/date-picker/js/lang/cs.js +0 -0
  17. data/{assets → app/assets}/javascripts/date-picker/js/lang/da.js +0 -0
  18. data/{assets → app/assets}/javascripts/date-picker/js/lang/de.js +0 -0
  19. data/{assets → app/assets}/javascripts/date-picker/js/lang/en.js +0 -0
  20. data/{assets → app/assets}/javascripts/date-picker/js/lang/eo.js +0 -0
  21. data/{assets → app/assets}/javascripts/date-picker/js/lang/es.js +0 -0
  22. data/{assets → app/assets}/javascripts/date-picker/js/lang/et.js +0 -0
  23. data/{assets → app/assets}/javascripts/date-picker/js/lang/fi.js +0 -0
  24. data/{assets → app/assets}/javascripts/date-picker/js/lang/fr.js +0 -0
  25. data/{assets → app/assets}/javascripts/date-picker/js/lang/he.js +0 -0
  26. data/{assets → app/assets}/javascripts/date-picker/js/lang/hu.js +0 -0
  27. data/{assets → app/assets}/javascripts/date-picker/js/lang/id.js +0 -0
  28. data/{assets → app/assets}/javascripts/date-picker/js/lang/it.js +0 -0
  29. data/{assets → app/assets}/javascripts/date-picker/js/lang/kr.js +0 -0
  30. data/{assets → app/assets}/javascripts/date-picker/js/lang/lt.js +0 -0
  31. data/{assets → app/assets}/javascripts/date-picker/js/lang/lv.js +0 -0
  32. data/{assets → app/assets}/javascripts/date-picker/js/lang/nl.js +0 -0
  33. data/{assets → app/assets}/javascripts/date-picker/js/lang/no.js +0 -0
  34. data/{assets → app/assets}/javascripts/date-picker/js/lang/pl.js +0 -0
  35. data/{assets → app/assets}/javascripts/date-picker/js/lang/pt-br.js +0 -0
  36. data/{assets → app/assets}/javascripts/date-picker/js/lang/pt.js +0 -0
  37. data/{assets → app/assets}/javascripts/date-picker/js/lang/ru.js +0 -0
  38. data/{assets → app/assets}/javascripts/date-picker/js/lang/se.js +0 -0
  39. data/{assets → app/assets}/javascripts/date-picker/js/lang/si.js +0 -0
  40. data/{assets → app/assets}/javascripts/date-picker/js/lang/tr.js +0 -0
  41. data/{assets → app/assets}/javascripts/date-picker/language/index.html +0 -0
  42. data/{assets → app/assets}/javascripts/date-picker/media/Thumbs.db +0 -0
  43. data/{assets → app/assets}/javascripts/date-picker/media/backstripes.gif +0 -0
  44. data/{assets → app/assets}/javascripts/date-picker/media/bg_header.jpg +0 -0
  45. data/{assets → app/assets}/javascripts/date-picker/media/bullet1.gif +0 -0
  46. data/{assets → app/assets}/javascripts/date-picker/media/bullet2.gif +0 -0
  47. data/{assets → app/assets}/javascripts/date-picker/media/cal-grey.gif +0 -0
  48. data/{assets → app/assets}/javascripts/date-picker/media/cal.gif +0 -0
  49. data/{assets → app/assets}/javascripts/date-picker/media/gradient-e5e5e5-ffffff.gif +0 -0
  50. data/{assets → app/assets}/javascripts/hydra/hydra-head.js +0 -0
  51. data/{assets → app/assets}/javascripts/hydra/mediashelf.datepicker.js +0 -0
  52. data/{assets → app/assets}/javascripts/hydra/mediashelf.placeholder.js +0 -0
  53. data/{assets → app/assets}/javascripts/jquery.form.js +0 -0
  54. data/{assets → app/assets}/javascripts/jquery.ui.datepicker.js +0 -0
  55. data/{assets → app/assets}/javascripts/spin.min.js +0 -0
  56. data/{assets → app/assets}/stylesheets/hydra/html_refactor.css +2 -2
  57. data/{assets → app/assets}/stylesheets/hydra/hydrangea-split-button.css +0 -0
  58. data/{assets → app/assets}/stylesheets/hydra/hydrangea.css +0 -0
  59. data/{assets → app/assets}/stylesheets/hydra/ie-styles.css +0 -0
  60. data/{assets → app/assets}/stylesheets/hydra/styles.css +0 -0
  61. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
  62. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_flat_55_fbec88_40x100.png +0 -0
  63. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png +0 -0
  64. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_glass_85_dfeffc_1x400.png +0 -0
  65. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_glass_95_fef1ec_1x400.png +0 -0
  66. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png +0 -0
  67. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png +0 -0
  68. data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png +0 -0
  69. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_217bc0_256x240.png +0 -0
  70. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_2e83ff_256x240.png +0 -0
  71. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_469bdd_256x240.png +0 -0
  72. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_6da8d5_256x240.png +0 -0
  73. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_cd0a0a_256x240.png +0 -0
  74. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_d8e7f3_256x240.png +0 -0
  75. data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_f9bd01_256x240.png +0 -0
  76. data/{assets → app/assets}/stylesheets/redmond/jquery-ui-1.8.5.custom.css +0 -0
  77. data/app/controllers/downloads_controller.rb +0 -16
  78. data/app/controllers/hydra/assets_controller.rb +3 -0
  79. data/app/controllers/{contributors_controller.rb → hydra/contributors_controller.rb} +11 -16
  80. data/app/controllers/hydra/file_assets_controller.rb +3 -0
  81. data/app/controllers/hydra/permissions_controller.rb +104 -0
  82. data/app/helpers/hydra/blacklight_helper_behavior.rb +13 -51
  83. data/app/helpers/hydra/downloads_helper_behavior.rb +1 -1
  84. data/app/helpers/hydra/hydra_assets_helper_behavior.rb +5 -6
  85. data/app/helpers/hydra/hydra_fedora_metadata_helper_behavior.rb +0 -1
  86. data/app/helpers/hydra/hydra_helper_behavior.rb +1 -1
  87. data/app/helpers/hydra/hydra_uploader_helper_behavior.rb +1 -1
  88. data/app/models/mods_asset.rb +4 -0
  89. data/app/models/role_mapper.rb +2 -2
  90. data/app/views/catalog/_document_list.html.erb +2 -2
  91. data/app/views/catalog/_edit_partials/_default.html.erb +1 -1
  92. data/app/views/catalog/_edit_partials/_default_details.html.erb +1 -1
  93. data/app/views/catalog/_index_partials/_default.html.erb +1 -1
  94. data/app/views/catalog/_show_partials/_default.html.erb +1 -1
  95. data/app/views/contributors/_add_contributor_split_button.html.erb +4 -4
  96. data/app/views/contributors/_edit_conference.html.erb +1 -1
  97. data/app/views/contributors/_edit_organization.html.erb +1 -1
  98. data/app/views/contributors/_edit_person.html.erb +1 -1
  99. data/app/views/contributors/_index.html.erb +2 -2
  100. data/app/views/contributors/_show_organization.html.erb +2 -2
  101. data/app/views/contributors/new.html.erb +4 -4
  102. data/app/views/generic_content_objects/_description_form.html.erb +2 -2
  103. data/app/views/generic_contents/_index.html.erb +1 -1
  104. data/app/views/generic_images/_edit.html.erb +2 -2
  105. data/app/views/generic_images/_index.html.erb +1 -1
  106. data/app/views/{file_assets → hydra/file_assets}/_asset_saved_flash.html.erb +0 -0
  107. data/app/views/{file_assets → hydra/file_assets}/_deletable_result.html.erb +0 -0
  108. data/app/views/{file_assets → hydra/file_assets}/_file_assets_form.html.erb +3 -3
  109. data/app/views/{file_assets → hydra/file_assets}/_index.html.erb +3 -3
  110. data/app/views/{file_assets → hydra/file_assets}/_new.html.erb +0 -0
  111. data/app/views/{file_assets → hydra/file_assets}/_result.html.erb +1 -1
  112. data/app/views/{file_assets → hydra/file_assets}/index.html.erb +1 -1
  113. data/app/views/{permissions → hydra/permissions}/_edit_person_permissions.html.erb +0 -0
  114. data/app/views/{permissions → hydra/permissions}/_index.html.erb +1 -1
  115. data/app/views/{permissions → hydra/permissions}/_new.html.erb +0 -0
  116. data/app/views/{permissions → hydra/permissions}/_permissions_form.html.erb +5 -6
  117. data/app/views/{permissions → hydra/permissions}/index.html.erb +0 -0
  118. data/app/views/{permissions → hydra/permissions}/new.html.erb +0 -0
  119. data/app/views/layouts/application.html.erb +1 -1
  120. data/app/views/layouts/hydra-head.html.erb +1 -1
  121. data/app/views/mods_assets/_additional_info_form.html.erb +2 -2
  122. data/app/views/mods_assets/_contributor_form.html.erb +1 -1
  123. data/app/views/mods_assets/_edit_description.html.erb +1 -1
  124. data/app/views/mods_assets/_progress_box.html.erb +2 -2
  125. data/app/views/mods_assets/_publication_form.html.erb +1 -1
  126. data/app/views/mods_assets/_show.html.erb +2 -2
  127. data/app/views/mods_assets/_show_description.html.erb +1 -0
  128. data/app/views/mods_assets/_show_file_assets.html.erb +3 -3
  129. data/app/views/shared/_delete_asset_confirmation.html.erb +1 -1
  130. data/config/fedora.yml +9 -3
  131. data/hydra-head.gemspec +12 -42
  132. data/lib/application_controller.rb +6 -7
  133. data/lib/generators/hydra/head_generator.rb +18 -18
  134. data/lib/generators/hydra/templates/catalog_controller.rb +162 -0
  135. data/lib/generators/hydra/templates/config/fedora.yml +9 -3
  136. data/lib/generators/hydra/templates/config/initializers/hydra_config.rb +4 -4
  137. data/lib/hydra-head.rb +0 -1
  138. data/lib/hydra-head/controller.rb +10 -11
  139. data/lib/hydra-head/routes.rb +20 -22
  140. data/lib/hydra-head/version.rb +1 -1
  141. data/lib/hydra.rb +2 -4
  142. data/lib/hydra/assets.rb +16 -26
  143. data/lib/hydra/controller.rb +5 -14
  144. data/lib/hydra/file_assets.rb +36 -33
  145. data/lib/hydra/generic_content.rb +3 -3
  146. data/lib/hydra/image.rb +2 -2
  147. data/lib/hydra/repository_controller.rb +22 -6
  148. data/lib/hydra/rights_metadata.rb +1 -1
  149. data/lib/hydra/submission_workflow.rb +4 -3
  150. data/lib/railties/hydra-fixtures.rake +2 -97
  151. data/tasks/hydra-head-fixtures.rake +0 -34
  152. data/tasks/hydra-head.rake +4 -3
  153. data/test_support/etc/Gemfile +15 -10
  154. data/test_support/etc/rvmrc +1 -1
  155. data/test_support/features/mods_asset_edit.feature +1 -1
  156. data/test_support/features/step_definitions/create_asset_steps.rb +0 -4
  157. data/test_support/features/support/env.rb +1 -1
  158. data/test_support/features/support/paths.rb +13 -13
  159. data/test_support/spec/controllers/contributors_controller_spec.rb +2 -2
  160. data/test_support/spec/controllers/file_assets_controller_spec.rb +22 -24
  161. data/test_support/spec/controllers/{assets_controller_spec.rb → hydra-assets_controller_spec.rb} +26 -11
  162. data/test_support/spec/controllers/hydra_controller_spec.rb +2 -3
  163. data/test_support/spec/controllers/permissions_controller_spec.rb +9 -53
  164. data/test_support/spec/controllers/user_sessions_controller_spec.rb +3 -3
  165. data/test_support/spec/factories.rb +11 -0
  166. data/test_support/spec/helpers/blacklight_helper_spec.rb +6 -13
  167. data/test_support/spec/helpers/hydra-repository_controller_spec.rb +37 -1
  168. data/test_support/spec/helpers/hydra_assets_helper_spec.rb +58 -70
  169. data/test_support/spec/helpers/hydra_helper_spec.rb +2 -2
  170. data/test_support/spec/helpers/hydra_model_methods_spec.rb +4 -4
  171. data/test_support/spec/helpers/hydra_uploader_helper_spec.rb +3 -3
  172. data/test_support/spec/integration/file_asset_spec.rb +5 -4
  173. data/test_support/spec/models/hydra_rights_metadata_spec.rb +7 -1
  174. data/test_support/spec/spec_helper.rb +5 -4
  175. data/vendor/cache/RedCloth-4.2.9.gem +0 -0
  176. data/vendor/cache/actionmailer-3.2.2.gem +0 -0
  177. data/vendor/cache/actionpack-3.2.2.gem +0 -0
  178. data/vendor/cache/{active-fedora-3.3.0.gem → active-fedora-4.0.0.rc13.gem} +0 -0
  179. data/vendor/cache/activemodel-3.2.2.gem +0 -0
  180. data/vendor/cache/activerecord-3.2.2.gem +0 -0
  181. data/vendor/cache/activeresource-3.2.2.gem +0 -0
  182. data/vendor/cache/activesupport-3.2.2.gem +0 -0
  183. data/vendor/cache/{addressable-2.2.6.gem → addressable-2.2.7.gem} +0 -0
  184. data/vendor/cache/arel-3.0.2.gem +0 -0
  185. data/vendor/cache/builder-3.0.0.gem +0 -0
  186. data/vendor/cache/childprocess-0.3.1.gem +0 -0
  187. data/vendor/cache/chunky_png-1.2.5.gem +0 -0
  188. data/vendor/cache/compass-0.12.rc.1.gem +0 -0
  189. data/vendor/cache/cucumber-1.1.9.gem +0 -0
  190. data/vendor/cache/{cucumber-rails-1.2.1.gem → cucumber-rails-1.3.0.gem} +0 -0
  191. data/vendor/cache/daemons-1.1.8.gem +0 -0
  192. data/vendor/cache/devise-2.0.4.gem +0 -0
  193. data/vendor/cache/erubis-2.7.0.gem +0 -0
  194. data/vendor/cache/factory_girl-2.6.1.gem +0 -0
  195. data/vendor/cache/fssm-0.2.8.1.gem +0 -0
  196. data/vendor/cache/gherkin-2.9.0.gem +0 -0
  197. data/vendor/cache/hike-1.2.1.gem +0 -0
  198. data/vendor/cache/httpi-0.9.6.gem +0 -0
  199. data/vendor/cache/i18n-0.6.0.gem +0 -0
  200. data/vendor/cache/journey-1.0.3.gem +0 -0
  201. data/vendor/cache/mail-2.4.3.gem +0 -0
  202. data/vendor/cache/marc-0.4.4.gem +0 -0
  203. data/vendor/cache/mediashelf-loggable-0.4.9.gem +0 -0
  204. data/vendor/cache/mocha-0.10.5.gem +0 -0
  205. data/vendor/cache/multi_json-1.1.0.gem +0 -0
  206. data/vendor/cache/nori-1.1.0.gem +0 -0
  207. data/vendor/cache/om-1.5.3.gem +0 -0
  208. data/vendor/cache/rack-1.4.1.gem +0 -0
  209. data/vendor/cache/rack-cache-1.1.gem +0 -0
  210. data/vendor/cache/rack-ssl-1.3.2.gem +0 -0
  211. data/vendor/cache/rack-test-0.6.1.gem +0 -0
  212. data/vendor/cache/{rails-3.0.11.gem → rails-3.2.2.gem} +0 -0
  213. data/vendor/cache/railties-3.2.2.gem +0 -0
  214. data/vendor/cache/rdf-0.3.5.1.gem +0 -0
  215. data/vendor/cache/rsolr-1.0.6.gem +0 -0
  216. data/vendor/cache/rspec-2.6.0.gem +0 -0
  217. data/vendor/cache/rspec-core-2.6.4.gem +0 -0
  218. data/vendor/cache/rspec-expectations-2.6.0.gem +0 -0
  219. data/vendor/cache/rspec-mocks-2.6.0.gem +0 -0
  220. data/vendor/cache/rspec-rails-2.6.1.gem +0 -0
  221. data/vendor/cache/rubydora-0.5.7.gem +0 -0
  222. data/vendor/cache/rubyzip-0.9.6.1.gem +0 -0
  223. data/vendor/cache/sass-3.1.15.gem +0 -0
  224. data/vendor/cache/sass-rails-3.2.4.gem +0 -0
  225. data/vendor/cache/savon-0.9.9.gem +0 -0
  226. data/vendor/cache/selenium-webdriver-2.20.0.gem +0 -0
  227. data/vendor/cache/solrizer-fedora-1.2.5.gem +0 -0
  228. data/vendor/cache/sprockets-2.1.2.gem +0 -0
  229. data/vendor/cache/sqlite3-1.3.5.gem +0 -0
  230. data/vendor/cache/sqlite3-ruby-1.3.3.gem +0 -0
  231. data/vendor/cache/stomp-1.2.1.gem +0 -0
  232. data/vendor/cache/tilt-1.3.3.gem +0 -0
  233. data/vendor/cache/tzinfo-0.3.32.gem +0 -0
  234. data/vendor/cache/unicode-0.4.2.gem +0 -0
  235. data/vendor/cache/warden-1.1.1.gem +0 -0
  236. data/vendor/cache/wasabi-2.1.0.gem +0 -0
  237. data/vendor/cache/yard-0.7.5.gem +0 -0
  238. metadata +298 -843
  239. data/app/controllers/assets_controller.rb +0 -3
  240. data/app/controllers/file_assets_controller.rb +0 -3
  241. data/app/controllers/permissions_controller.rb +0 -152
  242. data/app/views/generic_contents/_edit.html.erb_ +0 -39
  243. data/app/views/mods_assets/_edit.html.erb_ +0 -63
  244. data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb +0 -253
  245. data/lib/hydra-head/railtie.rb +0 -11
  246. data/lib/mediashelf/active_fedora_helper.rb +0 -68
  247. data/test_support/spec/lib/active_fedora_helper_spec.rb +0 -56
  248. data/vendor/cache/RedCloth-4.2.3.gem +0 -0
  249. data/vendor/cache/abstract-1.0.0.gem +0 -0
  250. data/vendor/cache/actionmailer-3.0.11.gem +0 -0
  251. data/vendor/cache/actionpack-3.0.11.gem +0 -0
  252. data/vendor/cache/activemodel-3.0.11.gem +0 -0
  253. data/vendor/cache/activerecord-3.0.11.gem +0 -0
  254. data/vendor/cache/activeresource-3.0.11.gem +0 -0
  255. data/vendor/cache/activesupport-3.0.11.gem +0 -0
  256. data/vendor/cache/arel-2.0.10.gem +0 -0
  257. data/vendor/cache/blacklight-3.1.2.gem +0 -0
  258. data/vendor/cache/builder-2.1.2.gem +0 -0
  259. data/vendor/cache/childprocess-0.3.0.gem +0 -0
  260. data/vendor/cache/columnize-0.3.6.gem +0 -0
  261. data/vendor/cache/crack-0.3.1.gem +0 -0
  262. data/vendor/cache/cucumber-1.1.4.gem +0 -0
  263. data/vendor/cache/curb-0.7.15.gem +0 -0
  264. data/vendor/cache/daemons-1.1.6.gem +0 -0
  265. data/vendor/cache/database_cleaner-0.7.1.gem +0 -0
  266. data/vendor/cache/devise-1.5.3.gem +0 -0
  267. data/vendor/cache/erubis-2.6.6.gem +0 -0
  268. data/vendor/cache/facets-2.8.4.gem +0 -0
  269. data/vendor/cache/factory_girl-2.5.0.gem +0 -0
  270. data/vendor/cache/gherkin-2.7.6.gem +0 -0
  271. data/vendor/cache/haml-3.1.4.gem +0 -0
  272. data/vendor/cache/httparty-0.8.1.gem +0 -0
  273. data/vendor/cache/httpi-0.9.5.gem +0 -0
  274. data/vendor/cache/i18n-0.5.0.gem +0 -0
  275. data/vendor/cache/json_pure-1.6.5.gem +0 -0
  276. data/vendor/cache/launchy-2.0.5.gem +0 -0
  277. data/vendor/cache/linecache-0.46.gem +0 -0
  278. data/vendor/cache/mail-2.2.19.gem +0 -0
  279. data/vendor/cache/marc-0.4.3.gem +0 -0
  280. data/vendor/cache/mediashelf-loggable-0.4.7.gem +0 -0
  281. data/vendor/cache/mocha-0.10.3.gem +0 -0
  282. data/vendor/cache/multi_json-1.0.4.gem +0 -0
  283. data/vendor/cache/multi_xml-0.4.1.gem +0 -0
  284. data/vendor/cache/nori-1.0.2.gem +0 -0
  285. data/vendor/cache/om-1.5.1.gem +0 -0
  286. data/vendor/cache/rack-1.2.5.gem +0 -0
  287. data/vendor/cache/rack-mount-0.6.14.gem +0 -0
  288. data/vendor/cache/rack-test-0.5.7.gem +0 -0
  289. data/vendor/cache/railties-3.0.11.gem +0 -0
  290. data/vendor/cache/rbx-require-relative-0.0.5.gem +0 -0
  291. data/vendor/cache/rdf-0.3.4.1.gem +0 -0
  292. data/vendor/cache/rsolr-1.0.2.gem +0 -0
  293. data/vendor/cache/rspec-2.8.0.gem +0 -0
  294. data/vendor/cache/rspec-core-2.8.0.gem +0 -0
  295. data/vendor/cache/rspec-expectations-2.8.0.gem +0 -0
  296. data/vendor/cache/rspec-mocks-2.8.0.gem +0 -0
  297. data/vendor/cache/rspec-rails-2.8.1.gem +0 -0
  298. data/vendor/cache/ruby-debug-0.10.4.gem +0 -0
  299. data/vendor/cache/ruby-debug-base-0.10.4.gem +0 -0
  300. data/vendor/cache/rubydora-0.5.1.gem +0 -0
  301. data/vendor/cache/rubyzip-0.9.5.gem +0 -0
  302. data/vendor/cache/savon-0.9.7.gem +0 -0
  303. data/vendor/cache/selenium-webdriver-2.18.0.gem +0 -0
  304. data/vendor/cache/solrizer-fedora-1.2.3.gem +0 -0
  305. data/vendor/cache/sqlite3-ruby-1.2.5.gem +0 -0
  306. data/vendor/cache/stomp-1.2.0.gem +0 -0
  307. data/vendor/cache/trollop-1.16.2.gem +0 -0
  308. data/vendor/cache/tzinfo-0.3.31.gem +0 -0
  309. data/vendor/cache/unicode-0.4.0.gem +0 -0
  310. data/vendor/cache/warden-1.1.0.gem +0 -0
  311. data/vendor/cache/wasabi-2.0.0.gem +0 -0
  312. data/vendor/cache/will_paginate-3.0.2.gem +0 -0
  313. data/vendor/cache/yard-0.7.4.gem +0 -0
@@ -1,8 +1,14 @@
1
1
  development:
2
- url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
2
+ user: fedoraAdmin
3
+ password: fedoraAdmin
4
+ url: http://127.0.0.1:8983/fedora
3
5
  test: &TEST
4
- url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
6
+ user: fedoraAdmin
7
+ password: fedoraAdmin
8
+ url: http://127.0.0.1:8983/fedora
5
9
  production:
6
- url: http://fedoraAdmin:fedoraAdmin@your.production.server:8080/fedora
10
+ user: fedoraAdmin
11
+ password: fedoraAdmin
12
+ url: http://your.production.server:8080/fedora
7
13
  cucumber:
8
14
  <<: *TEST
@@ -29,13 +29,13 @@ if Hydra.respond_to?(:configure)
29
29
  :mods_assets => [{:name => "contributor", :edit_partial => "mods_assets/contributor_form", :show_partial => "mods_assets/show_contributors"},
30
30
  {:name => "publication", :edit_partial => "mods_assets/publication_form", :show_partial => "mods_assets/show_publication"},
31
31
  {:name => "additional_info", :edit_partial => "mods_assets/additional_info_form", :show_partial => "mods_assets/show_additional_info"},
32
- {:name => "files", :edit_partial => "file_assets/file_assets_form", :show_partial => "mods_assets/show_file_assets"},
33
- {:name => "permissions", :edit_partial => "permissions/permissions_form", :show_partial => "mods_assets/show_permissions"}
32
+ {:name => "files", :edit_partial => "hydra/file_assets/file_assets_form", :show_partial => "mods_assets/show_file_assets"},
33
+ {:name => "permissions", :edit_partial => "hydra/permissions/permissions_form", :show_partial => "mods_assets/show_permissions"}
34
34
  ],
35
35
  # Not being used right now
36
36
  :generic_contents => [{:name => "description", :edit_partial => "generic_content_objects/description_form", :show_partial => "generic_contents/show_description"},
37
- {:name => "files", :edit_partial => "file_assets/file_assets_form", :show_partial => "file_assets/index"},
38
- {:name => "permissions", :edit_partial => "permissions/permissions_form", :show_partial => "generic_contents/show_permissions"},
37
+ {:name => "files", :edit_partial => "hydra/file_assets/file_assets_form", :show_partial => "file_assets/index"},
38
+ {:name => "permissions", :edit_partial => "hydra/permissions/permissions_form", :show_partial => "generic_contents/show_permissions"},
39
39
  {:name => "contributor", :edit_partial => "generic_content_objects/contributor_form", :show_partial => "generic_contents/show_contributors"}
40
40
  ]
41
41
  }
@@ -1,6 +1,5 @@
1
1
  module HydraHead
2
2
  require 'hydra-head/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
3
- require 'hydra-head/railtie' if defined? Rails
4
3
  require 'hydra-head/controller'
5
4
 
6
5
  require 'hydra-head/version'
@@ -8,23 +8,22 @@ module HydraHead
8
8
  before_filter :method_for_before_filtering
9
9
  end
10
10
 
11
- module InstanceMethods
12
- def method_for_before_filtering
13
- #puts "Filtering before"
14
- end
11
+ def method_for_before_filtering
12
+ #puts "Filtering before"
13
+ end
15
14
 
16
- def method_not_a_filter
17
- puts "not used as a filter"
18
- end
15
+ def method_not_a_filter
16
+ puts "not used as a filter"
17
+ end
19
18
 
20
- def layout_name
21
- puts " ***** CALLING LAYOUT_NAME ****"
22
- 'application'
23
- end
19
+ def layout_name
20
+ puts " ***** CALLING LAYOUT_NAME ****"
21
+ 'application'
24
22
  end
25
23
  end
26
24
  end
27
25
 
26
+ #TODO this seems bad.
28
27
  ::ActionController::Base.send :include, HydraHead::Controller
29
28
 
30
29
 
@@ -32,23 +32,25 @@ module HydraHead
32
32
 
33
33
  def assets_with_all_nested_routes
34
34
  add_routes do |options|
35
- resources :file_assets
36
35
  match "withdraw", :to => "assets#withdraw", :as => "withdraw"
37
- resources :assets do
38
- # this is to remove documents from SOLR but not from Fedora.
39
- resources :contributors, :only=>[:new,:create]
40
- match '/contributors', :to => 'contributors#update', :as => 'update_contributors'
41
- # We would need to include the rails JS files (or implement our own) if we want this to work w/ DELETE because we delete from a link not a button.
42
- #match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect', :via => 'delete'
43
- match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect'
44
- # There is no ContributorsController#show
45
- match 'contributors/:contributor_type/:index', :to => 'contributors#show', :as => 'contributor', :via => 'get'
36
+ namespace :hydra do
46
37
  resources :file_assets
47
- resources :downloads, :only=>[:index]
48
- resources :grants, :only=>[:new,:create]
49
- resources :permissions
50
- # Allow updates to assets/:asset_id/permissions (no :id necessary)
51
- match '/permissions', :to => 'permissions#update', :as => 'update_group_permissions'
38
+ resources :assets do
39
+ # this is to remove documents from SOLR but not from Fedora.
40
+ resources :contributors, :only=>[:new,:create]
41
+ match '/contributors', :to => 'contributors#update', :as => 'update_contributors'
42
+ # We would need to include the rails JS files (or implement our own) if we want this to work w/ DELETE because we delete from a link not a button.
43
+ #match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect', :via => 'delete'
44
+ match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect'
45
+ # There is no ContributorsController#show
46
+ match 'contributors/:contributor_type/:index', :to => 'contributors#show', :as => 'contributor', :via => 'get'
47
+ resources :file_assets
48
+ resources :downloads, :only=>[:index]
49
+ resources :grants, :only=>[:new,:create]
50
+ resources :permissions
51
+ # Allow updates to assets/:asset_id/permissions (no :id necessary)
52
+ match '/permissions', :to => 'permissions#update', :as => 'update_group_permissions'
53
+ end
52
54
  end
53
55
  match "generic_contents_object/content/:container_id", :to=>"generic_content_objects#create", :as=>'generic_content_object', :via => 'post'
54
56
  end
@@ -56,7 +58,9 @@ module HydraHead
56
58
 
57
59
  def permissions
58
60
  add_routes do |options|
59
- resources :permissions
61
+ namespace :hydra do
62
+ resources :permissions
63
+ end
60
64
  end
61
65
  end
62
66
 
@@ -72,12 +76,6 @@ module HydraHead
72
76
  match 'catalog/:id/edit', :to => 'catalog#edit', :as => 'edit_catalog'
73
77
  # The delete method renders a confirmation page with a button to submit actual destroy request
74
78
  match 'catalog/:id/delete', :to => 'catalog#delete', :as => 'delete_catalog'
75
- ### The rest of these routes are defined in blacklight
76
- #resources :catalog, :id=> /.+/
77
- # resources :catalog, :only => [:index, :show], :controller => "hydra_head/catalog", :path_prefix => HydraHead::Engine.config.mount_at, :as => "hydra_head", :id=> /.+/
78
- #match 'catalog/:id', :to => "hydra_head/catalog#show", :path_prefix => HydraHead::Engine.config.mount_at, :as => "catalog", :id => /.+/
79
- #match 'catalog/:id', :to => "hydra_head/catalog#show", :id => /.+/
80
- # match 'about', :to => 'catalog#about', :as => 'about'
81
79
  end
82
80
  end
83
81
 
@@ -1,4 +1,4 @@
1
1
  module HydraHead
2
- VERSION = "3.3.0"
2
+ VERSION = "4.0.0.rc2"
3
3
  end
4
4
 
@@ -1,13 +1,12 @@
1
1
  require "blacklight"
2
2
  # Hydra libraries
3
3
  module Hydra
4
- extend Blacklight::Configurable
4
+ extend Blacklight::GlobalConfigurable
5
5
  extend ActiveSupport::Autoload
6
6
  autoload :AccessControlsEvaluation
7
7
  autoload :AccessControlsEnforcement
8
8
  autoload :Assets
9
9
  autoload :Catalog
10
- autoload :Configurable, 'blacklight/configurable'
11
10
  autoload :Controller
12
11
  autoload :FileAssets
13
12
  autoload :GenericContent
@@ -16,6 +15,7 @@ module Hydra
16
15
  autoload :ModelMixins
17
16
  autoload :ModsGenericContent
18
17
  autoload :ModsImage
18
+ autoload :RepositoryController
19
19
  autoload :SubmissionWorkflow
20
20
  autoload :SuperuserAttributes
21
21
  autoload :User
@@ -24,9 +24,7 @@ module Hydra
24
24
  end
25
25
 
26
26
 
27
- require 'mediashelf/active_fedora_helper'
28
27
 
29
- require 'hydra/repository_controller'
30
28
  require 'hydra/assets_controller_helper'
31
29
  require 'hydra/file_assets_helper'
32
30
 
@@ -1,6 +1,5 @@
1
1
  module Hydra::Assets
2
2
  extend ActiveSupport::Concern
3
- include MediaShelf::ActiveFedoraHelper
4
3
  include Blacklight::SolrHelper
5
4
  include Hydra::RepositoryController
6
5
  include Hydra::AssetsControllerHelper
@@ -11,10 +10,8 @@ module Hydra::Assets
11
10
  helper :hydra
12
11
  include Hydra::UI::Controller
13
12
  before_filter :search_session, :history_session
14
- before_filter :require_solr
15
13
  before_filter :load_document, :only => :update # allows other filters to operate on the document before the update method is called
16
14
 
17
- # need to include this after the :require_solr before filters because of the before filter that the workflow provides.
18
15
  include Hydra::SubmissionWorkflow
19
16
 
20
17
 
@@ -26,10 +23,7 @@ module Hydra::Assets
26
23
  if params.has_key?("field")
27
24
 
28
25
  @response, @document = get_solr_response_for_doc_id
29
- # @document = SolrDocument.new(@response.docs.first)
30
26
  result = @document["#{params["field"]}_t"]
31
- # document_fedora = SaltDocument.load_instance(params[:id])
32
- # result = document_fedora.datastreams_in_memory[params["datastream"]].send("#{params[:field]}_values")
33
27
  unless result.nil?
34
28
  if params.has_key?("field_index")
35
29
  result = result[params["field_index"].to_i-1]
@@ -42,7 +36,7 @@ module Hydra::Assets
42
36
  format.textile { render :text=> RedCloth.new(result, [:sanitize_html]).to_html }
43
37
  end
44
38
  else
45
- redirect_to :controller=>"catalog", :action=>"show"
39
+ redirect_to catalog_path(params[:id])
46
40
  end
47
41
  end
48
42
 
@@ -62,11 +56,11 @@ module Hydra::Assets
62
56
  @document.save
63
57
  flash[:notice] = "Your changes have been saved."
64
58
 
65
- logger.debug("returning #{@response.inspect}")
59
+ #logger.debug("returning #{@response.inspect}")
66
60
 
67
61
  respond_to do |want|
68
62
  want.html {
69
- redirect_to( {:controller => "catalog", :action => "edit", :id => params[:id]}.merge(params_for_next_step_in_wokflow) )
63
+ redirect_to next_step(params[:id])
70
64
  }
71
65
  want.js {
72
66
  render :json=> tidy_response_from_update(@response)
@@ -82,31 +76,27 @@ module Hydra::Assets
82
76
 
83
77
  def new
84
78
  af_model = retrieve_af_model(params[:content_type])
85
- if af_model
86
- @asset = af_model.new
87
- apply_depositor_metadata(@asset)
88
- set_collection_type(@asset, params[:content_type])
89
- @asset.save
90
- model_display_name = af_model.to_s.camelize.scan(/[A-Z][^A-Z]*/).join(" ")
91
- msg = "Created a #{model_display_name} with pid #{@asset.pid}. Now it's ready to be edited."
92
- flash[:notice]= msg
93
- end
79
+ raise "Can't find a model for #{params[:content_type]}" unless af_model
80
+ @asset = af_model.new
81
+ apply_depositor_metadata(@asset)
82
+ set_collection_type(@asset, params[:content_type])
83
+ @asset.save
84
+ model_display_name = af_model.to_s.camelize.scan(/[A-Z][^A-Z]*/).join(" ")
85
+ msg = "Created a #{model_display_name} with pid #{@asset.pid}. Now it's ready to be edited."
86
+ flash[:notice]= msg
94
87
  session[:scripts] = params[:combined] == "true"
95
- redirect_to url_for(:action=>"edit", :controller=>"catalog", :id=>@asset.pid, :new_asset=>true)
88
+
89
+ redirect_to edit_catalog_path(@asset.pid, :new_asset=>true)
96
90
  end
97
91
 
98
92
  def destroy
99
- af = ActiveFedora::Base.load_instance_from_solr(params[:id])
100
- the_model = ActiveFedora::ContentModel.known_models_for( af ).first
101
- unless the_model.nil?
102
- af = the_model.load_instance_from_solr(params[:id])
103
- assets = af.destroy_child_assets
104
- end
93
+ af = ActiveFedora::Base.find(params[:id])
94
+ assets = af.destroy_child_assets
105
95
  af.delete
106
96
  msg = "Deleted #{params[:id]}"
107
97
  msg.concat(" and associated file_asset(s): #{assets.join(", ")}") unless assets.empty?
108
98
  flash[:notice]= msg
109
- redirect_to url_for(:action => 'index', :controller => "catalog", :q => nil , :f => nil)
99
+ redirect_to catalog_index_path()
110
100
  end
111
101
 
112
102
 
@@ -13,15 +13,8 @@ module Hydra::Controller
13
13
  def self.included(klass)
14
14
  # Other modules to auto-include
15
15
  klass.send(:include, Hydra::AccessControlsEnforcement)
16
- klass.send(:include, MediaShelf::ActiveFedoraHelper)
17
16
  klass.send(:include, Hydra::RepositoryController)
18
17
 
19
-
20
- # Controller filters
21
- # Also see the generator (or generated CatalogController) to see more before_filters in action
22
- klass.before_filter :require_solr
23
- # klass.before_filter :load_fedora_document, :only=>[:show,:edit]
24
-
25
18
  # View Helpers
26
19
  klass.helper :hydra
27
20
  klass.helper :hydra_assets
@@ -31,16 +24,14 @@ module Hydra::Controller
31
24
  # Sets @document_fedora with the loaded object
32
25
  # Sets @file_assets with file objects that are children of the loaded object
33
26
  def load_fedora_document
34
- af_base = ActiveFedora::Base.load_instance(params[:id])
35
- the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
36
- unless the_model.include?(ActiveFedora::Relationships)
37
- the_model.send :include, ActiveFedora::Relationships
27
+ @document_fedora = ActiveFedora::Base.find(params[:id])
28
+ unless @document_fedora.class.include?(ActiveFedora::Relationships)
29
+ @document_fedora.class.send :include, ActiveFedora::Relationships
38
30
  end
39
- unless the_model.include?(ActiveFedora::FileManagement)
40
- the_model.send :include, ActiveFedora::FileManagement
31
+ unless @document_fedora.class.include?(ActiveFedora::FileManagement)
32
+ @document_fedora.class.send :include, ActiveFedora::FileManagement
41
33
  end
42
34
 
43
- @document_fedora = af_base.adapt_to(the_model)
44
35
  @file_assets = @document_fedora.file_objects(:response_format=>:solr)
45
36
  end
46
37
 
@@ -7,12 +7,11 @@ module Hydra::FileAssets
7
7
  include Hydra::AssetsControllerHelper
8
8
  include Hydra::FileAssetsHelper
9
9
  include Hydra::RepositoryController
10
- include MediaShelf::ActiveFedoraHelper
11
10
  include Hydra::UI::Controller
12
11
  include Blacklight::SolrHelper
13
- before_filter :require_solr, :only=>[:index, :create, :show, :destroy]
14
- # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
15
12
  include Hydra::SubmissionWorkflow
13
+ include Blacklight::Configurable
14
+ copy_blacklight_config_from(CatalogController)
16
15
  prepend_before_filter :sanitize_update_params
17
16
  helper :hydra_uploader
18
17
  end
@@ -34,7 +33,7 @@ module Hydra::FileAssets
34
33
  @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
35
34
 
36
35
  # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
37
- @container = ActiveFedora::Base.load_instance(params[:asset_id])
36
+ @container = ActiveFedora::Base.find(params[:asset_id])
38
37
  @solr_result = @container.file_objects(:response_format=>:solr)
39
38
  end
40
39
 
@@ -54,9 +53,9 @@ module Hydra::FileAssets
54
53
  # * the method will redirect to the container object's edit view after saving
55
54
  def create
56
55
  if params.has_key?(:number_of_files) and params[:number_of_files] != "0"
57
- return redirect_to({:controller => "catalog", :action => "edit", :id => params[:id], :wf_step => :files, :number_of_files => params[:number_of_files]})
56
+ return redirect_to edit_catalog_path(params[:id], :wf_step => :files, :number_of_files => params[:number_of_files])
58
57
  elsif params.has_key?(:number_of_files) and params[:number_of_files] == "0"
59
- return redirect_to( {:controller => "catalog", :action => "edit", :id => params[:id]}.merge(params_for_next_step_in_wokflow) )
58
+ return redirect_to next_step(params[:id])
60
59
  end
61
60
 
62
61
  if params.has_key?(:Filedata)
@@ -66,12 +65,12 @@ module Hydra::FileAssets
66
65
  flash[:notice] = "You must specify a file to upload."
67
66
  end
68
67
 
69
- unless params[:container_id].nil?
70
- redirect_params = {:controller => "catalog", :action => "edit", :id => params[:container_id]}.merge(params_for_next_step_in_wokflow)
68
+ if params[:container_id]
69
+ redirect_to next_step(params[:container_id])
70
+ else
71
+ redirect_to catalog_index_path
71
72
  end
72
- redirect_params ||= {:controller => "catalog", :action => "index"}
73
-
74
- redirect_to redirect_params
73
+
75
74
  end
76
75
 
77
76
  def process_files
@@ -80,7 +79,7 @@ module Hydra::FileAssets
80
79
  @file_assets.each do |file_asset|
81
80
  apply_depositor_metadata(file_asset)
82
81
 
83
- notice << render_to_string(:partial=>'file_assets/asset_saved_flash', :locals => { :file_asset => file_asset })
82
+ notice << render_to_string(:partial=>'hydra/file_assets/asset_saved_flash', :locals => { :file_asset => file_asset })
84
83
 
85
84
  if !params[:container_id].nil?
86
85
  associate_file_asset_with_container(file_asset,'info:fedora/' + params[:container_id])
@@ -99,7 +98,7 @@ module Hydra::FileAssets
99
98
 
100
99
  # Common destroy method for all AssetsControllers
101
100
  def destroy
102
- ActiveFedora::Base.load_instance(params[:id]).delete
101
+ ActiveFedora::Base.find(params[:id]).delete
103
102
 
104
103
  flash[:notice] = "Deleted #{params[:id]} from #{params[:container_id]}."
105
104
 
@@ -114,32 +113,36 @@ module Hydra::FileAssets
114
113
 
115
114
 
116
115
  def show
117
- @file_asset = FileAsset.find(params[:id])
118
- if (@file_asset.nil?)
116
+ begin
117
+ @file_asset = FileAsset.find(params[:id])
118
+ rescue ActiveFedora::ObjectNotFoundError
119
119
  logger.warn("No such file asset: " + params[:id])
120
120
  flash[:notice]= "No such file asset."
121
121
  redirect_to(:action => 'index', :q => nil , :f => nil)
122
- else
123
- # get containing object for this FileAsset
124
- pid = @file_asset.container_id
125
- @downloadable = false
126
- # A FileAsset is downloadable iff the user has read or higher access to a parent
122
+ return
123
+ end
124
+ # get containing object for this FileAsset
125
+ pid = @file_asset.container_id
126
+ @downloadable = false
127
+ # A FileAsset is downloadable iff the user has read or higher access to a parent
128
+ begin
127
129
  @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
128
- if reader?
129
- @downloadable = true
130
- end
130
+ rescue Blacklight::Exceptions::InvalidSolrID
131
+ end
132
+ if reader?
133
+ @downloadable = true
134
+ end
131
135
 
132
- if @downloadable
133
- # First try to use datastream_id value (set in FileAssetsHelper)
134
- if @file_asset.datastreams.include?(datastream_id)
135
- send_datastream @file_asset.datastreams[datastream_id]
136
- elsif @file_asset.datastreams.include?("DS1")
137
- send_datastream @file_asset.datastreams["DS1"]
138
- end
139
- else
140
- flash[:notice]= "You do not have sufficient access privileges to download this file."
141
- redirect_to(:action => 'index', :q => nil , :f => nil)
136
+ if @downloadable
137
+ # First try to use datastream_id value (set in FileAssetsHelper)
138
+ if @file_asset.datastreams.include?(datastream_id)
139
+ send_datastream @file_asset.datastreams[datastream_id]
140
+ elsif @file_asset.datastreams.include?("DS1")
141
+ send_datastream @file_asset.datastreams["DS1"]
142
142
  end
143
+ else
144
+ flash[:notice]= "You do not have sufficient access privileges to download this file."
145
+ redirect_to(:action => 'index', :q => nil , :f => nil)
143
146
  end
144
147
  end
145
148
  end
@@ -1,6 +1,6 @@
1
- require "hydra"
2
- require "httparty"
3
- require "mime/types"
1
+ # require "hydra"
2
+ # require "httparty"
3
+ # require "mime/types"
4
4
 
5
5
  module Hydra::GenericContent
6
6