blacklight 3.0.0pre6 → 3.0.0pre7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (123) hide show
  1. data/Rakefile +1 -0
  2. data/VERSION +1 -1
  3. data/app/controllers/bookmarks_controller.rb +1 -0
  4. data/app/controllers/feedback_controller.rb +1 -0
  5. data/app/controllers/folder_controller.rb +11 -10
  6. data/app/controllers/saved_searches_controller.rb +1 -0
  7. data/app/controllers/search_history_controller.rb +1 -0
  8. data/app/helpers/blacklight_helper.rb +1 -0
  9. data/app/helpers/bookmarks_helper.rb +2 -1
  10. data/app/helpers/catalog_helper.rb +23 -10
  11. data/app/helpers/feedback_helper.rb +1 -0
  12. data/app/helpers/hash_as_hidden_fields.rb +1 -0
  13. data/app/helpers/render_constraints_helper.rb +1 -0
  14. data/app/helpers/saved_searches_helper.rb +1 -0
  15. data/app/helpers/search_history_helper.rb +2 -1
  16. data/app/models/bookmark.rb +2 -1
  17. data/app/models/record_mailer.rb +1 -0
  18. data/app/models/search.rb +2 -1
  19. data/app/views/catalog/_opensearch_response_metadata.html.erb +3 -2
  20. data/app/views/catalog/_results_pagination.html.erb +3 -3
  21. data/app/views/kaminari/blacklight/_page.html.erb +1 -1
  22. data/blacklight.gemspec +2 -20
  23. data/config/routes.rb +1 -0
  24. data/db/seeds.rb +1 -0
  25. data/install.rb +1 -0
  26. data/lib/blacklight.rb +1 -0
  27. data/lib/blacklight/catalog.rb +1 -0
  28. data/lib/blacklight/comma_link_renderer.rb +1 -0
  29. data/lib/blacklight/configurable.rb +1 -0
  30. data/lib/blacklight/controller.rb +1 -0
  31. data/lib/blacklight/engine.rb +1 -0
  32. data/lib/blacklight/exceptions.rb +1 -0
  33. data/lib/blacklight/routes.rb +1 -0
  34. data/lib/blacklight/search_fields.rb +1 -0
  35. data/lib/blacklight/solr.rb +1 -0
  36. data/lib/blacklight/solr/document.rb +1 -0
  37. data/lib/blacklight/solr/document/dublin_core.rb +1 -0
  38. data/lib/blacklight/solr/document/email.rb +1 -0
  39. data/lib/blacklight/solr/document/marc.rb +1 -0
  40. data/lib/blacklight/solr/document/marc_export.rb +1 -0
  41. data/lib/blacklight/solr/document/sms.rb +1 -0
  42. data/lib/blacklight/solr/facet_paginator.rb +2 -1
  43. data/lib/blacklight/solr_helper.rb +32 -11
  44. data/lib/blacklight/user.rb +1 -0
  45. data/lib/blacklight/version.rb +1 -0
  46. data/lib/colorize.rb +1 -0
  47. data/lib/generators/blacklight/assets_generator.rb +1 -0
  48. data/lib/generators/blacklight/blacklight_generator.rb +10 -0
  49. data/lib/generators/blacklight/jetty_generator.rb +3 -0
  50. data/lib/generators/blacklight/solr_conf_generator.rb +1 -0
  51. data/lib/generators/blacklight/templates/catalog_controller.rb +1 -0
  52. data/lib/generators/blacklight/templates/config/blacklight_config.rb +1 -0
  53. data/lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb +7 -0
  54. data/lib/generators/blacklight/templates/migrations/create_bookmarks.rb +2 -1
  55. data/lib/generators/blacklight/templates/migrations/create_searches.rb +1 -0
  56. data/lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb +1 -0
  57. data/lib/generators/blacklight/templates/public/javascripts/blacklight/blacklight.js +1 -0
  58. data/lib/generators/blacklight/templates/public/stylesheets/blacklight/blacklight.css +1 -1
  59. data/lib/generators/blacklight/templates/solr_document.rb +1 -0
  60. data/lib/railties/blacklight_cucumber.rake +3 -2
  61. data/lib/railties/jetty_solr_server.rb +1 -0
  62. data/test_support/bin/test.sh +121 -0
  63. data/test_support/features/search_results.feature +1 -1
  64. data/test_support/features/step_definitions/bookmarks_steps.rb +1 -0
  65. data/test_support/features/step_definitions/error_steps.rb +1 -0
  66. data/test_support/features/step_definitions/folder_steps.rb +1 -0
  67. data/test_support/features/step_definitions/general_steps.rb +1 -0
  68. data/test_support/features/step_definitions/record_view_steps.rb +1 -0
  69. data/test_support/features/step_definitions/saved_searches_steps.rb +1 -0
  70. data/test_support/features/step_definitions/search_facets_steps.rb +1 -0
  71. data/test_support/features/step_definitions/search_history_steps.rb +1 -0
  72. data/test_support/features/step_definitions/search_result_steps.rb +1 -0
  73. data/test_support/features/step_definitions/search_steps.rb +1 -0
  74. data/test_support/features/step_definitions/user_steps.rb +2 -1
  75. data/test_support/features/step_definitions/web_steps.rb +1 -0
  76. data/test_support/features/support/env.rb +5 -0
  77. data/test_support/features/support/paths.rb +1 -0
  78. data/test_support/features/support/selectors.rb +1 -0
  79. data/test_support/spec/controllers/application_controller_spec.rb +1 -0
  80. data/test_support/spec/controllers/catalog_controller_spec.rb +1 -0
  81. data/test_support/spec/controllers/folder_controller_spec.rb +1 -0
  82. data/test_support/spec/controllers/search_history_controller_spec.rb +1 -0
  83. data/test_support/spec/data/sample_docs.yml +1 -1
  84. data/test_support/spec/helpers/blacklight_helper_spec.rb +1 -0
  85. data/test_support/spec/helpers/catalog_helper_spec.rb +1 -0
  86. data/test_support/spec/helpers/hash_as_hidden_fields_spec.rb +1 -0
  87. data/test_support/spec/helpers/render_constraints_helper_spec.rb +1 -0
  88. data/test_support/spec/helpers/search_history_helper_spec.rb +1 -0
  89. data/test_support/spec/helpers/solr_helper_spec.rb +33 -5
  90. data/test_support/spec/lib/blacklight_email_spec.rb +1 -0
  91. data/test_support/spec/lib/blacklight_sms_spec.rb +1 -0
  92. data/test_support/spec/lib/blacklight_solr_document_dublin_core_spec.rb +1 -0
  93. data/test_support/spec/lib/blacklight_solr_document_marc_spec.rb +1 -0
  94. data/test_support/spec/lib/blacklight_solr_document_spec.rb +1 -0
  95. data/test_support/spec/lib/blacklight_spec.rb +1 -0
  96. data/test_support/spec/lib/blacklight_user_spec.rb +1 -0
  97. data/test_support/spec/lib/configurable_spec.rb +1 -0
  98. data/test_support/spec/lib/facet_paginator_spec.rb +1 -0
  99. data/test_support/spec/lib/marc_export_spec.rb +1 -0
  100. data/test_support/spec/lib/search_fields_spec.rb +1 -0
  101. data/test_support/spec/lib/tasks/blacklight_task_spec.rb +1 -0
  102. data/test_support/spec/lib/tasks/solr_marc_task_spec.rb +1 -0
  103. data/test_support/spec/models/bookmark_spec.rb +1 -0
  104. data/test_support/spec/models/record_mailer_spec.rb +1 -1
  105. data/test_support/spec/models/search_spec.rb +1 -0
  106. data/test_support/spec/models/solr_docment_spec.rb +1 -1
  107. data/test_support/spec/spec_helper.rb +1 -0
  108. data/test_support/spec/support/action_controller.rb +1 -0
  109. data/test_support/spec/support/assert_difference.rb +1 -0
  110. data/test_support/spec/support/include_text.rb +1 -0
  111. data/test_support/spec/views/catalog/_constraints_element.html.erb_spec.rb +1 -0
  112. data/test_support/spec/views/catalog/_document_list.html.erb_spec.rb +1 -0
  113. data/test_support/spec/views/catalog/_facets.html.erb_spec.rb +1 -0
  114. data/test_support/spec/views/catalog/_index_partials/_default.erb_spec.rb +1 -0
  115. data/test_support/spec/views/catalog/_show_partials/_default.html.erb_spec.rb +1 -0
  116. data/test_support/spec/views/catalog/index.atom.builder_spec.rb +3 -5
  117. data/test_support/spec/views/catalog/show.html.erb_spec.rb +1 -0
  118. data/test_support/spec/views/catalog/unapi.xml.builder_spec.rb +1 -0
  119. data/uninstall.rb +1 -0
  120. metadata +29 -44
  121. data/features/default_setup.feature +0 -52
  122. data/features/generators.feature +0 -58
  123. data/features/support/aruba.rb +0 -9
@@ -1,52 +0,0 @@
1
- Feature:
2
- In order to develop and extend the Blacklight GEM - I need to ensure that the changes
3
- I make will still allow all tests to pass in a fresh default installation.
4
-
5
- Scenario: The Blacklight generator installs devise when given the -d option, and the tests pass
6
- When I run `rails new test_app`
7
- And I cd to "test_app"
8
- And a file named "Gemfile" with:
9
- """
10
- source "http://rubygems.org"
11
- gem 'rails', '>=3.0.4'
12
- gem 'sqlite3-ruby', :require => 'sqlite3'
13
- gem 'blacklight', :path => '../../../'
14
-
15
- # For testing
16
- group :development, :test do
17
- gem "rspec"
18
- gem "rspec-rails", "~>2.5.0"
19
- gem "cucumber-rails"
20
- gem "database_cleaner"
21
- gem "capybara"
22
- gem "webrat"
23
- gem "aruba"
24
- end
25
-
26
- """
27
- And I run `bundle install --local`
28
-
29
- Then the file "app/models/user.rb" should not exist
30
- And I run `rails generate blacklight -d`
31
- Then the exit status should be 0
32
-
33
- # Devise should now be installed.
34
- Then a file named "app/models/user.rb" should exist
35
- Then a directory named "app/views/devise" should exist
36
- Then the file "app/models/user.rb" should contain "devise"
37
-
38
- # And the user model should be setup with Blacklight
39
- And the file "app/models/user.rb" should contain "include Blacklight::User"
40
-
41
- And I run `rake db:migrate`
42
-
43
- # And I complete the setup for testing
44
- And I run `rails g cucumber:install`
45
- And I run `rails generate blacklight:jetty test_jetty -e test`
46
- Then a directory named "test_jetty" should exist
47
- And I run `rake solr:marc:index_test_data RAILS_ENV=test`
48
- And I run `rake blacklight:spec:with_solr`
49
- Then the output should contain "0 failures"
50
- And I remove the file "public/index.html"
51
- And I run `rake blacklight:cucumber:with_solr`
52
- Then the exit status should be 0
@@ -1,58 +0,0 @@
1
- Feature:
2
- In order to easily add Blacklight fucntionality to a new rails app
3
- As a user of Rails3 and Blacklight
4
- I would like to use the blacklight generator.
5
-
6
- Scenario: The Blacklight generators create all the correct files and file modifications when executed with defaults
7
- When I run `rails new test_app`
8
- And I cd to "test_app"
9
- And a file named "Gemfile" with:
10
- """
11
- source "http://rubygems.org"
12
- gem 'rails', '>=3.0.4'
13
- gem 'sqlite3-ruby', :require => 'sqlite3'
14
- gem 'blacklight', :path => '../../../'
15
- """
16
- And I run `bundle install --local`
17
-
18
- When I write to "app/models/user.rb" with:
19
- """
20
- class User < ActiveRecord::Base
21
- end
22
- """
23
- And I run `rails generate blacklight`
24
- Then the following files should exist:
25
- | config/initializers/blacklight_config.rb |
26
- | config/solr.yml |
27
- | public/images/blacklight/bg.png |
28
- | public/javascripts/blacklight/blacklight.js |
29
- | public/javascripts/blacklight/jquery-1.4.2.min.js |
30
- | public/javascripts/blacklight/jquery-ui-1.8.1.custom.min.js |
31
- | public/stylesheets/blacklight/blacklight.css |
32
- | public/stylesheets/blacklight/yui.css |
33
- And a directory named "public/stylesheets/blacklight/jquery" should exist
34
- And the file "app/models/user.rb" should contain "include Blacklight::User"
35
-
36
- # Devise should next exist in thie scenerio
37
- And a directory named "app/views/devise" should not exist
38
- And the file "app/models/user.rb" should not contain "devise"
39
-
40
- Scenario: The Blacklight generator functions correctly when specifying an alternate user model
41
- When I run `rails new test_app`
42
- And I cd to "test_app"
43
- And a file named "Gemfile" with:
44
- """
45
- source "http://rubygems.org"
46
- gem 'rails', '>=3.0.4'
47
- gem 'sqlite3-ruby', :require => 'sqlite3'
48
- gem 'blacklight', :path => '../../../'
49
- """
50
- And I run `bundle install --local`
51
- And I run `rails generate model person`
52
- And I run `rails generate blacklight person`
53
- And the file "app/models/person.rb" should contain "include Blacklight::User"
54
-
55
- # Devise should not exist in thie scenerio
56
- And a directory named "app/views/devise" should not exist
57
- And the file "app/models/person.rb" should not contain "devise"
58
-
@@ -1,9 +0,0 @@
1
- require 'aruba/cucumber'
2
-
3
- Before do
4
- @aruba_timeout_seconds = 60
5
- end
6
-
7
- Before ('@really_slow_process') do
8
- @aruba_timeout_seconds = 120
9
- end