blacklight 6.0.0.pre3 → 6.0.0.pre4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/VERSION +1 -1
  4. data/app/controllers/bookmarks_controller.rb +0 -1
  5. data/app/controllers/catalog_controller.rb +0 -1
  6. data/app/controllers/concerns/blacklight/base.rb +0 -1
  7. data/app/controllers/concerns/blacklight/bookmarks.rb +0 -1
  8. data/app/controllers/concerns/blacklight/catalog.rb +6 -38
  9. data/app/controllers/concerns/blacklight/controller.rb +0 -2
  10. data/app/controllers/concerns/blacklight/search_fields.rb +0 -1
  11. data/app/controllers/concerns/blacklight/search_helper.rb +0 -5
  12. data/app/{models → controllers}/concerns/blacklight/token_based_user.rb +6 -10
  13. data/app/controllers/saved_searches_controller.rb +0 -1
  14. data/app/controllers/search_history_controller.rb +0 -1
  15. data/app/helpers/blacklight/blacklight_helper_behavior.rb +0 -4
  16. data/app/helpers/blacklight/catalog_helper_behavior.rb +3 -2
  17. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +0 -1
  18. data/app/helpers/blacklight/layout_helper_behavior.rb +8 -0
  19. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -1
  20. data/app/helpers/blacklight/render_partials_helper.rb +1 -6
  21. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +0 -1
  22. data/app/helpers/blacklight/url_helper_behavior.rb +1 -6
  23. data/app/models/blacklight/solr/facet_paginator.rb +0 -1
  24. data/app/models/bookmark.rb +0 -1
  25. data/app/models/concerns/blacklight/configurable.rb +0 -1
  26. data/app/models/concerns/blacklight/document/cache_key.rb +0 -1
  27. data/app/models/concerns/blacklight/document/email.rb +0 -1
  28. data/app/models/concerns/blacklight/document/sms.rb +0 -1
  29. data/app/models/concerns/blacklight/solr/document.rb +0 -7
  30. data/app/models/concerns/blacklight/user.rb +0 -1
  31. data/app/models/record_mailer.rb +0 -1
  32. data/app/models/search.rb +0 -6
  33. data/app/presenters/blacklight/document_presenter.rb +3 -17
  34. data/app/presenters/blacklight/json_presenter.rb +41 -0
  35. data/app/views/catalog/_document.html.erb +1 -1
  36. data/app/views/catalog/_document_default.atom.builder +2 -4
  37. data/app/views/catalog/facet.json.jbuilder +3 -0
  38. data/app/views/catalog/index.atom.builder +1 -1
  39. data/app/views/catalog/index.json.jbuilder +6 -0
  40. data/app/views/layouts/blacklight.html.erb +1 -1
  41. data/app/views/shared/_header_navbar.html.erb +2 -2
  42. data/blacklight.gemspec +9 -4
  43. data/db/migrate/20140202020201_create_searches.rb +1 -2
  44. data/db/migrate/20140202020202_create_bookmarks.rb +1 -2
  45. data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +0 -1
  46. data/lib/blacklight.rb +0 -10
  47. data/lib/blacklight/configuration.rb +0 -1
  48. data/lib/blacklight/engine.rb +0 -8
  49. data/lib/blacklight/exceptions.rb +0 -1
  50. data/lib/blacklight/routes.rb +0 -1
  51. data/lib/blacklight/version.rb +0 -1
  52. data/lib/generators/blacklight/assets_generator.rb +0 -1
  53. data/lib/generators/blacklight/install_generator.rb +8 -14
  54. data/lib/generators/blacklight/solr4_generator.rb +27 -0
  55. data/lib/generators/blacklight/solr5_generator.rb +21 -0
  56. data/lib/generators/blacklight/templates/alternate_controller.rb +0 -1
  57. data/lib/generators/blacklight/templates/catalog_controller.rb +3 -4
  58. data/lib/generators/blacklight/templates/solr_document.rb +0 -1
  59. data/lib/generators/blacklight/test_support_generator.rb +0 -1
  60. data/lib/railties/blacklight.rake +0 -7
  61. data/provision.sh +11 -1
  62. data/spec/controllers/blacklight/search_helper_spec.rb +0 -1
  63. data/spec/controllers/bookmarks_controller_spec.rb +26 -1
  64. data/spec/controllers/catalog_controller_spec.rb +8 -35
  65. data/spec/features/facets_spec.rb +0 -1
  66. data/spec/features/record_view_spec.rb +0 -1
  67. data/spec/features/search_context_spec.rb +0 -2
  68. data/spec/features/search_formats_spec.rb +0 -2
  69. data/spec/features/search_pagination_spec.rb +0 -2
  70. data/spec/features/search_results_spec.rb +0 -2
  71. data/spec/features/search_spec.rb +0 -2
  72. data/spec/helpers/blacklight_helper_spec.rb +3 -12
  73. data/spec/helpers/catalog_helper_spec.rb +8 -0
  74. data/spec/helpers/layout_helper_spec.rb +7 -0
  75. data/spec/helpers/url_helper_spec.rb +0 -7
  76. data/spec/lib/tasks/blacklight_task_spec.rb +0 -1
  77. data/spec/models/record_mailer_spec.rb +1 -3
  78. data/spec/models/search_spec.rb +1 -2
  79. data/spec/models/solr_document_spec.rb +22 -24
  80. data/spec/presenters/document_presenter_spec.rb +28 -6
  81. data/spec/spec_helper.rb +0 -1
  82. data/spec/views/catalog/_document.html.erb_spec.rb +20 -3
  83. data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +2 -2
  84. data/spec/views/catalog/facet.json.jbuilder_spec.rb +9 -0
  85. data/spec/views/catalog/index.json.jbuilder_spec.rb +30 -0
  86. metadata +15 -15
  87. data/app/models/concerns/blacklight/solr/document/dublin_core.rb +0 -7
  88. data/app/models/concerns/blacklight/solr/document/email.rb +0 -7
  89. data/app/models/concerns/blacklight/solr/document/export.rb +0 -7
  90. data/app/models/concerns/blacklight/solr/document/extensions.rb +0 -8
  91. data/app/models/concerns/blacklight/solr/document/schema_org.rb +0 -7
  92. data/app/models/concerns/blacklight/solr/document/sms.rb +0 -7
  93. data/app/views/catalog/email_sent.html.erb +0 -2
  94. data/app/views/catalog/sms_sent.html.erb +0 -2
  95. data/lib/blacklight/configuration/solr_field.rb +0 -7
@@ -1,7 +0,0 @@
1
- module Blacklight::Solr::Document::DublinCore
2
- include Blacklight::Document::DublinCore
3
-
4
- def self.extended(document)
5
- Deprecation.warn Blacklight::Solr::Document::DublinCore, "Blacklight::Solr::Document::DublinCore is deprecated; use Blacklight::Document::DublinCore instead."
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Blacklight::Solr::Document::Email
2
- include Blacklight::Document::Email
3
-
4
- def self.extended(document)
5
- Deprecation.warn Blacklight::Solr::Document::Email, "Blacklight::Solr::Document::Email is deprecated; use Blacklight::Document::Email instead."
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Blacklight::Solr::Document::Export
2
- include Blacklight::Document::Export
3
-
4
- def self.extended(document)
5
- Deprecation.warn Blacklight::Solr::Document::Export, "Blacklight::Solr::Document::Export is deprecated; use Blacklight::Document::Export instead."
6
- end
7
- end
@@ -1,8 +0,0 @@
1
- module Blacklight::Solr::Document::Extensions
2
- extend ActiveSupport::Concern
3
- include Blacklight::Document::Extensions
4
-
5
- def self.extended(document)
6
- Deprecation.warn Blacklight::Solr::Document::Extensions, "Blacklight::Solr::Document::Extensions is deprecated; use Blacklight::Document::Extensions instead."
7
- end
8
- end
@@ -1,7 +0,0 @@
1
- module Blacklight::Solr::Document::SchemaOrg
2
- include Blacklight::Document::SchemaOrg
3
-
4
- def self.extended(document)
5
- Deprecation.warn Blacklight::Solr::Document::SchemaOrg, "Blacklight::Solr::Document::SchemaOrg is deprecated; use Blacklight::Document::SchemaOrg instead."
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Blacklight::Solr::Document::Sms
2
- include Blacklight::Document::Sms
3
-
4
- def self.extended(document)
5
- Deprecation.warn Blacklight::Solr::Document::Sms, "Blacklight::Solr::Document::Sms is deprecated; use Blacklight::Document::Sms instead."
6
- end
7
- end
@@ -1,2 +0,0 @@
1
- <% Deprecation.warn controller, "The template catalog/email_sent.html.erb is deprecated; use email_success instead" %>
2
- <%= render template: "catalog/email_success" %>
@@ -1,2 +0,0 @@
1
- <% Deprecation.warn controller, "The template catalog/sms_sent.html.erb is deprecated; use sms_success instead" %>
2
- <%= render template: "catalog/sms_success" %>
@@ -1,7 +0,0 @@
1
- module Blacklight
2
- class Configuration::SolrField < Blacklight::Configuration::Field
3
- def self.extended *args
4
- Deprecation.warn Blacklight::Configuration::SolrField, "Blacklight::Configuration::SolrField is deprecated; use Blacklight::Configuration::Field instead"
5
- end
6
- end
7
- end