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
@@ -23,8 +23,8 @@
23
23
  # hi.send(:generate_derivatives)
24
24
  #
25
25
 
26
- require "hydra"
27
- require "httparty"
26
+ # require "hydra"
27
+ # require "httparty"
28
28
 
29
29
  module Hydra
30
30
  class Image < ActiveFedora::Base
@@ -1,4 +1,3 @@
1
- require "mediashelf/active_fedora_helper"
2
1
  # Hydra-repository Contoller is a controller layer mixin. It is in the controller scope: request params, session etc.
3
2
  #
4
3
  # NOTE: Be careful when creating variables here as they may be overriding something that already exists.
@@ -18,11 +17,6 @@ require "mediashelf/active_fedora_helper"
18
17
  #
19
18
  module Hydra::RepositoryController
20
19
 
21
- include MediaShelf::ActiveFedoraHelper
22
-
23
-
24
-
25
-
26
20
  def self.included(c)
27
21
  if c.respond_to?(:helper_method)
28
22
  c.helper_method :solr_name
@@ -86,6 +80,28 @@ module Hydra::RepositoryController
86
80
  # puts "downloadables result: #{result}"
87
81
  return result
88
82
  end
83
+
84
+ protected
85
+
86
+ def retrieve_af_model(class_name, opts={})
87
+ if !class_name.nil?
88
+ klass = Module.const_get(class_name.camelcase)
89
+ else
90
+ klass = nil
91
+ end
92
+ if klass.is_a?(Class) && klass.superclass == ActiveFedora::Base
93
+ return klass
94
+ else
95
+ return opts.fetch(:default, false)
96
+ end
97
+ rescue NameError
98
+ return false
99
+ end
100
+
101
+ def load_af_instance_from_solr(doc)
102
+ pid = doc[:id] ? doc[:id] : doc[:id.to_s]
103
+ pid ? ActiveFedora::Base.load_instance_from_solr(pid,doc) : nil
104
+ end
89
105
 
90
106
  private
91
107
 
@@ -155,7 +155,7 @@ class RightsMetadata < ActiveFedora::NokogiriDatastream
155
155
  end
156
156
  def embargo_release_date(opts={})
157
157
  embargo_release_date = self.find_by_terms(*[:embargo,:machine,:date]).first ? self.find_by_terms(*[:embargo,:machine,:date]).first.text : nil
158
- if opts[:format] && opts[:format] == :solr_date
158
+ if embargo_release_date.present? && opts[:format] && opts[:format] == :solr_date
159
159
  embargo_release_date << "T23:59:59Z"
160
160
  end
161
161
  embargo_release_date
@@ -42,7 +42,7 @@ module Hydra::SubmissionWorkflow
42
42
  model_config.last[:name] unless model_config.nil?
43
43
  end
44
44
 
45
- def params_for_next_step_in_wokflow
45
+ def next_step(id)
46
46
  return_params = {:wf_step=>next_step_in_workflow(params[:wf_step])}
47
47
  if params[:new_asset]
48
48
  return_params[:new_asset] = true
@@ -50,9 +50,10 @@ module Hydra::SubmissionWorkflow
50
50
  if params[:wf_step] == last_step_in_workflow or params.has_key?(:finish)
51
51
  return_params[:viewing_context] = "browse"
52
52
  return_params[:action] = "show"
53
- return_params[:wf_step] = nil
53
+ return_params.delete(:wf_step)
54
+ return catalog_path(id, return_params)
54
55
  end
55
- return return_params
56
+ return edit_catalog_path(id,return_params)
56
57
  end
57
58
 
58
59
  # Convenience method to return the partial for any given step by name.
@@ -1,105 +1,8 @@
1
1
  require "active-fedora"
2
2
  require "solrizer-fedora"
3
3
  require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
4
-
5
- Rake::TaskManager.class_eval do
6
- def alias_task(fq_name)
7
- new_name = "#{fq_name}:original"
8
- @tasks[new_name] = @tasks.delete(fq_name)
9
- end
10
- end
11
-
12
- def alias_task(fq_name)
13
- Rake.application.alias_task(fq_name)
14
- end
15
-
16
- # Rake does chaining by default, not overriding
17
- def override_task(*args, &block)
18
- name, params, deps = Rake.application.resolve_args(args.dup)
19
- fq_name = Rake.application.instance_variable_get(:@scope).dup.push(name).join(':')
20
- alias_task(fq_name)
21
- Rake::Task.define_task(*args, &block)
22
- end
23
-
24
- namespace :repo do
25
- desc "Load the object located at the provided path or identified by pid."
26
- override_task :load => :environment do
27
- ### override the AF provided task to use the correct fixture directory
28
- if ENV["pid"].nil?
29
- raise "You must specify a valid pid. Example: rake repo:load pid=demo:12"
30
- end
31
- puts "loading #{ENV['pid']}"
32
-
33
- begin
34
- ActiveFedora::FixtureLoader.new('test_support/fixtures').reload(ENV["pid"])
35
- rescue Errno::ECONNREFUSED => e
36
- puts "Can't connect to Fedora! Are you sure jetty is running?"
37
- rescue Exception => e
38
- logger.error("Received a Fedora error while loading #{pid}\n#{e}")
39
- end
40
- end
41
- end
42
4
  namespace :hydra do
43
5
 
44
- desc "[DEPRECATED] Delete and re-import the fixture identified by pid"
45
- task :refresh_fixture do
46
- STDERR.puts "DEPRECATED: hydra:refresh_fixture is deprecated. Use/override repo:refresh instead."
47
- Rake::Task["repo:refresh"].invoke
48
- end
49
-
50
- desc "[DEPRECATED] Delete the object identified by pid. Example: rake hydra:delete pid=demo:12"
51
- task :delete do
52
- STDERR.puts "DEPRECATED: hydra:delete is deprecated. Use/override repo:delete instead."
53
- Rake::Task["repo:delete"].invoke
54
- end
55
-
56
- desc "[DEPRECATED] Delete a range of objects in a given namespace. ie 'rake hydra:purge_range[demo, 22, 50]' will delete demo:22 through demo:50"
57
- task :purge_range do |t, args|
58
- STDERR.puts "DEPRECATED: hydra:purge_range is deprecated. Use/override repo:delete_range instead."
59
- Rake::Task["repo:delete_range"].invoke
60
- end
61
-
62
- desc "[DEPRECATED] Export the object identified by pid into test_support/fixtures. Example:rake hydra:harvest_fixture pid=druid:sb733gr4073 source=http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora"
63
- task :harvest_fixture do
64
- STDERR.puts "DEPRECATED: hydra:harvest_fixture is deprecated. Use/override repo:export instead."
65
- if ENV["path"].nil?
66
- ENV["path"] = File.join("test_support","fixtures")
67
- end
68
- Rake::Task["repo:export"].invoke
69
- end
70
-
71
- desc "[DEPRECATED] Import the fixture located at the provided path. Example: rake hydra:import_fixture fixture=test_support/fixtures/demo_12.foxml.xml"
72
- task :import_fixture do
73
- STDERR.puts "DEPRECATED: hydra:import_fixture is deprecated. Use/override repo:load instead."
74
- if !ENV["pid"].nil?
75
- pid = ENV["pid"]
76
- ENV["pid"] = nil
77
- ENV["path"] = File.join("test_support","fixtures","#{pid.gsub(":","_")}.foxml.xml")
78
- end
79
- Rake::Task["repo:load"].invoke
80
- end
81
-
82
- namespace :default_fixtures do
83
- desc "[DEPRECATED] Load default Hydra fixtures"
84
- task :load do
85
- STDERR.puts "DEPRECATED: hydra:default_fixtures:load is deprecated. Use/override hydra:fixtures:load instead."
86
- Rake::Task["hydra:fixtures:load"].invoke
87
- end
88
-
89
- desc "[DEPRECATED] Remove default Hydra fixtures"
90
- task :delete do
91
- STDERR.puts "DEPRECATED: hydra:default_fixtures:delete is deprecated. Use/override hydra:fixtures:delete instead."
92
- Rake::Task["hydra:fixtures:delete"].invoke
93
- end
94
-
95
- desc "[DEPRECATED] Refresh default Hydra fixtures"
96
- task :refresh do
97
- STDERR.puts "DEPRECATED: hydra:default_fixtures:refresh is deprecated. Use/override hydra:fixtures:refresh instead."
98
- Rake::Task["hydra:fixtures:refresh"].invoke
99
- end
100
- end
101
-
102
-
103
6
  desc "Init Hydra configuration"
104
7
  task :init => [:environment] do
105
8
  # We need to just start rails so that all the models are loaded
@@ -131,6 +34,7 @@ namespace :hydra do
131
34
  ]
132
35
  desc "Load default Hydra fixtures"
133
36
  task :load do
37
+ ENV["dir"] = File.join("test_support", "fixtures")
134
38
  FIXTURES.each do |fixture|
135
39
  ENV["pid"] = fixture
136
40
  Rake::Task["repo:load"].reenable
@@ -140,6 +44,7 @@ namespace :hydra do
140
44
 
141
45
  desc "Remove default Hydra fixtures"
142
46
  task :delete do
47
+ ENV["dir"] = File.join("test_support", "fixtures")
143
48
  FIXTURES.each do |fixture|
144
49
  ENV["pid"] = fixture
145
50
  Rake::Task["repo:delete"].reenable
@@ -33,33 +33,6 @@ namespace :hyhead do
33
33
  FileUtils.cd('../../')
34
34
  end
35
35
 
36
- namespace :fixture do
37
- desc "[DEPRECATED] Call hydra:delete"
38
- task :delete do
39
- STDERR.puts "DEPRECATED: hyhead:fixture:delete is deprecated. Use/override hyhead:delete instead."
40
- Rake::Task["hyhead:delete"].invoke
41
- end
42
-
43
- desc "[DEPRECATED] Call hydra:harvest_fixture"
44
- task :harvest => ["hyhead:use_test_app"] do
45
- STDERR.puts "DEPRECATED: hyhead:fixture:harvest is deprecated. Use/override hyhead:export instead."
46
- Rake::Task["hyhead:export"].invoke
47
- end
48
-
49
- desc "[DEPRECATED] Call hydra:import_fixture from within the test app"
50
- task :import => ["hyhead:use_test_app"] do
51
- STDERR.puts "DEPRECATED: hyhead:fixture:import is deprecated. Use/override hyhead:load instead."
52
- Rake::Task["hyhead:load"].invoke
53
- end
54
-
55
-
56
- desc "[DEPRECATED] Call hydra:refresh_fixture from within the test app"
57
- task :refresh => ["hyhead:use_test_app"] do
58
- STDERR.puts "DEPRECATED: hyhead:fixture:refresh is deprecated. Use/override hyhead:refresh instead."
59
- Rake::Task["hyhead:refresh"].invoke
60
- end
61
- end
62
-
63
36
  namespace :fixtures do
64
37
 
65
38
  desc "Call hydra:fixtures:refresh from within the test app"
@@ -77,12 +50,5 @@ namespace :hyhead do
77
50
  puts %x[rake hydra:fixtures:delete]
78
51
  FileUtils.cd('../../')
79
52
  end
80
-
81
-
82
- desc "[DEPRECATED] Call hydra:purge_range"
83
- task :purge_range => ["hyhead:use_test_app"] do
84
- STDERR.puts "DEPRECATED: hyhead:fixtures:purge_range is deprecated. Use/override hyhead:delete_range instead."
85
- Rake::Task["hyhead:delete_range"].invoke
86
- end
87
53
  end
88
54
  end
@@ -6,7 +6,6 @@ namespace :hyhead do
6
6
 
7
7
  desc "Execute Continuous Integration build (docs, tests with coverage)"
8
8
  task :ci do
9
- Rake::Task["hyhead:doc"].invoke
10
9
  Rake::Task["hydra:jetty:config"].invoke
11
10
 
12
11
  require 'jettywrapper'
@@ -18,6 +17,7 @@ namespace :hyhead do
18
17
  Rake::Task['hyhead:cucumber'].invoke
19
18
  end
20
19
  raise "test failures: #{error}" if error
20
+ Rake::Task["hyhead:doc"].invoke
21
21
  end
22
22
 
23
23
 
@@ -56,7 +56,7 @@ namespace :hyhead do
56
56
  end
57
57
 
58
58
  YARD::Rake::YardocTask.new(:doc) do |yt|
59
- yt.files = ['lib/**/*', project_root+"*", 'app/**/*']
59
+ yt.files = ['lib/**/*.rb', project_root+"*", 'app/**/*.rb']
60
60
 
61
61
  yt.options << "-m" << "textile"
62
62
  yt.options << "--protected"
@@ -147,7 +147,8 @@ namespace :hyhead do
147
147
  FileUtils.cp_r(File.join('..','..','test_support','fixtures'), File.join('.','test_support','fixtures'))
148
148
 
149
149
  puts "Executing bundle install --local in the test app"
150
- puts %x[bundle install --local]
150
+ #puts %x[bundle install --local]
151
+ puts %x[bundle install]
151
152
  errors << 'Error running bundle install in test app' unless $?.success?
152
153
 
153
154
  puts "Installing cucumber in test app"
@@ -3,29 +3,34 @@
3
3
 
4
4
  source 'http://rubygems.org'
5
5
 
6
- gem "rails", '< 3.1'
6
+ gem "rails", '~> 3.2.2'
7
7
 
8
- gem 'sqlite3-ruby', '~>1.2.5', :require => 'sqlite3'
9
- #gem 'sqlite3-ruby', :require => 'sqlite3'
8
+ #gem 'sqlite3-ruby', '~>1.2.5', :require => 'sqlite3'
9
+ gem 'sqlite3-ruby', :require => 'sqlite3'
10
10
  #gem 'sqlite3'
11
11
 
12
- gem 'blacklight', '~>3.1.2'
12
+ gem 'blacklight', :git=>'git://github.com/projectblacklight/blacklight.git'
13
+
14
+
13
15
  gem 'hydra-head', :path => '../../'
14
16
  gem 'devise'
15
17
  gem 'jettywrapper'
16
18
 
17
19
  # For testing
18
20
  group :development, :test do
19
- gem 'solrizer-fedora', '>=1.2.0'
20
- gem 'ruby-debug'
21
- gem 'rspec'
22
- gem 'rspec-rails', '>=2.5.0'
21
+ gem 'rspec-rails', '>=2.8.0'
23
22
  gem 'mocha'
24
23
  gem 'cucumber-rails'
25
- gem 'database_cleaner'
26
24
  gem 'capybara'
27
25
  gem 'factory_girl'
28
- gem 'bcrypt-ruby'
29
26
  gem 'rest-client'
30
27
  end
31
28
 
29
+ # Gems used only for assets and not required
30
+ # in production environments by default.
31
+ group :assets do
32
+ gem 'sass-rails', '~> 3.2.4'
33
+ gem 'coffee-rails', '~> 3.2.2'
34
+ gem 'uglifier', '>= 1.2.3'
35
+ end
36
+
@@ -3,7 +3,7 @@
3
3
  # This is an RVM Project .rvmrc file, used to automatically load the ruby
4
4
  # development environment upon cd'ing into the directory
5
5
 
6
- ruby_string="ree-1.8.7"
6
+ ruby_string="1.9.3"
7
7
  gemset_name="hyhead-testapp"
8
8
 
9
9
  # Install rubies when used instead of only displaying a warning and exiting
@@ -33,7 +33,7 @@ Feature: Edit a ModsAsset object
33
33
  Scenario: Entering different date formats for embargo
34
34
  Given I am logged in as "archivist1@example.com"
35
35
  When I am on the edit additional_info page for hydrangea:fixture_mods_article1
36
- And I fill in "embargo_embargo_release_date" with "11/1/2010"
36
+ And I fill in "embargo_embargo_release_date" with "2010-11-01"
37
37
  When I press "Continue"
38
38
  And I am on the edit additional_info page for hydrangea:fixture_mods_article1
39
39
  Then the "embargo_embargo_release_date" field within "#release_date_field" should contain "2010-11-01"
@@ -1,7 +1,3 @@
1
1
  When /^I create a new ([^"]*)$/ do |asset_type|
2
2
  visit path_to("new #{asset_type} page")
3
3
  end
4
-
5
- # Given /^I create a new "([^\"]*)"$/ do |asset_type|
6
- # visit path_to("new #{asset_type} page")
7
- # end
@@ -46,7 +46,7 @@ ActionController::Base.allow_rescue = false
46
46
 
47
47
  # Remove this line if your app doesn't have a database.
48
48
  # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
49
- DatabaseCleaner.strategy = :transaction
49
+ #DatabaseCleaner.strategy = :transaction
50
50
 
51
51
  # Stop endless errors like
52
52
  # ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16:
@@ -20,9 +20,9 @@ module NavigationHelpers
20
20
  when /the base search page/
21
21
  '/catalog?q=&search_field=search&action=index&controller=catalog&commit=search'
22
22
  when /the document page for id (.+)/
23
- catalog_path($1)
23
+ catalog_path(CGI.escape($1))
24
24
  when /the edit page for id (.+)/
25
- edit_catalog_path($1)
25
+ edit_catalog_path(CGI.escape($1))
26
26
  when /the catalog index page/
27
27
  catalog_index_path
28
28
  # Add more mappings here.
@@ -32,36 +32,36 @@ module NavigationHelpers
32
32
  # user_profile_path(User.find_by_login($1))
33
33
 
34
34
  when /the edit document page for (.*)$/i
35
- edit_catalog_path($1)
35
+ edit_catalog_path(CGI.escape $1)
36
36
  when /the show document page for (.*)$/i
37
- catalog_path($1)
37
+ catalog_path(CGI.escape $1)
38
38
  when /the delete confirmation page for (.*)$/i
39
39
  delete_catalog_path($1)
40
40
 
41
41
  when /the file (?:asset )?list page for (.*)$/i
42
- asset_file_assets_path($1)
42
+ hydra_asset_file_assets_path($1)
43
43
  when /the file asset creation page for (.*)$/i
44
- asset_file_assets_path($1)
44
+ hydra_asset_file_assets_path($1)
45
45
  when /the deletable file list page for (.*)/i
46
- asset_file_assets_path($1, :deletable=>"true",:layout=>"false")
46
+ hydra_asset_file_assets_path($1, :deletable=>"true",:layout=>"false")
47
47
  when /the file asset (.*) with (.*) as its container$/i
48
- asset_file_asset_path($2, $1)
48
+ hydra_asset_file_asset_path($2, $1)
49
49
  when /the file asset (.*)$/i
50
50
  file_asset_path($1)
51
51
  when /the permissions page for (.*)$/i
52
- asset_permissions_path($1)
52
+ hydra_asset_permissions_path($1)
53
53
 
54
54
  when /new (.*) page$/i
55
- new_asset_path(:content_type => $1)
55
+ new_hydra_asset_path(:content_type => $1)
56
56
  when /the asset (.*)$/i
57
- asset_path($1)
57
+ hydra_asset_path($1)
58
58
  when /show asset page for (.*)$/i
59
- asset_path($1)
59
+ hydra_asset_path($1)
60
60
 
61
61
 
62
62
  when /the (\d+)(?:st|nd|rd|th) (person|organization|conference) entry in (.*)$/i
63
63
  # contributor_id = "#{$2}_#{$1.to_i-1}"
64
- asset_contributor_path($3, $2, $1.to_i-1, :content_type=>"mods_asset")
64
+ hydra_asset_contributor_path($3, $2, $1.to_i-1, :content_type=>"mods_asset")
65
65
 
66
66
  when /the edit (.*) page for (.*)$/i
67
67
  edit_catalog_path($2,:wf_step=>$1)
@@ -8,7 +8,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
8
8
  # or
9
9
  # rake cucumber
10
10
 
11
- describe ContributorsController do
11
+ describe Hydra::ContributorsController do
12
12
 
13
13
  describe "create" do
14
14
  it "should support adding new person / contributor / organization nodes" do
@@ -18,7 +18,7 @@ describe ContributorsController do
18
18
  mock_document.expects(:save)
19
19
  ModsAsset.expects(:find).with("_PID_").returns(mock_document)
20
20
  post :create, :asset_id=>"_PID_", :controller => "contributors", :content_type => "mods_asset", :contributor_type=>type
21
- response.should redirect_to "http://test.host/catalog/_PID_/edit##{type}_989"
21
+ response.should redirect_to edit_catalog_path('_PID_', :anchor=>"#{type}_989")
22
22
  end
23
23
  end
24
24
  it "should return inline html if format is inline" do