blacklight 4.9.0 → 5.0.0.pre1

data/config/locales/blacklight.fr.yml

@@ -34,9 +34,6 @@ fr:
     or: 'ou'
 
     bookmarks:
-      collection:
-        add:
-          button: 'Panier'
       title: 'Favoris'
       no_bookmarks: 'Accédez à votre compte pour conserver des références dans votre panier'
       add:
@@ -116,7 +113,6 @@ fr:
       refworks: 'Exporter vers Refworks'
       email: 'Envoyer'
       sms: 'SMS'
-      librarian_view: 'Vue UNIMARC'
       clear: 'Effacer'
 
     citation:
@@ -181,7 +177,7 @@ fr:
         request_error: "Pardon, nous n'avons pas compris votre recherche."
         invalid_solr_id: "Vous avez demandé une notice qui n'existe pas."
       per_page:
-        label: '%{count}<span class="hide-text"> par page</span>'
+        label: '%{count}<span class="sr-only"> par page</span>'
         button_label: '%{count} par page'
         title: 'Nombre de résultats à afficher par page'
         submit: 'mettre à jour'
@@ -228,16 +224,9 @@ fr:
         remove:
           value: 'Supprimer la restriction %{value}'
           label_value: 'Supprimer la restriction %{label}: %{value}'
-      librarian_view:
-        title: 'Vue UNIMARC'
-        leader: 'LABEL %{leader}'
-        empty: 'Pas MARC trouvé.'
       start_over: 'Accueil'
-      index:
-        label: '%{label}'
       show:
         title: '%{document_title} - %{application_name}'
-        label: '%{label}'
       rss_feed: 'RSS pour les résultats'
       atom_feed: 'Atom pour les résultats'
       fields:

data/gemfiles/rails3.gemfile

@@ -0,0 +1,21 @@
+source 'http://rubygems.org'
+
+# Please see blacklight.gemspec for dependency information.
+gemspec :path=>"../"
+
+gem 'rails', "~> 3.2"
+
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
+group :test do
+  gem 'devise'
+  gem 'devise-guests'
+  gem "bootstrap-sass"
+  gem 'turbolinks'
+  gem 'uglifier'
+end
+
+f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
+if File.exists?(f)
+  eval File.read(f), nil, f
+end

data/gemfiles/rails4.gemfile

@@ -0,0 +1,20 @@
+source 'http://rubygems.org'
+
+# Please see blacklight.gemspec for dependency information.
+gemspec :path=>"../"
+
+gem 'rails', '~> 4.0.0'
+
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
+group :test do
+  gem 'devise'
+  gem 'devise-guests'
+  gem "bootstrap-sass"
+  gem 'turbolinks'
+end
+
+f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
+if File.exists?(f)
+  eval File.read(f), nil, f
+end

data/lib/blacklight.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
 require 'kaminari'
 require 'rsolr'
-require 'deprecation'
 
 module Blacklight
 
@@ -10,7 +9,6 @@ module Blacklight
   autoload :SearchFields, 'blacklight/search_fields'
 
   autoload :Solr, 'blacklight/solr'
-  autoload :Marc, 'blacklight/marc'
   
   autoload :SolrHelper, 'blacklight/solr_helper'
   
@@ -30,7 +28,6 @@ module Blacklight
   autoload :Facet, 'blacklight/facet'
 
   extend SearchFields
-  extend Deprecation
   
   require 'blacklight/version'
   require 'blacklight/engine' if defined?(Rails)
@@ -41,7 +38,6 @@ module Blacklight
   
   # Adding a little jruby support
   def self.jruby?
-    Deprecation.warn(Blacklight, "Blacklight.jruby? is deprecated")
     defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" 
   end
 
@@ -54,7 +50,6 @@ module Blacklight
   end
 
   def self.solr
-    Deprecation.warn Blacklight, "Blacklight.solr is deprecated and will be removed in Blacklight 5.0"
     @solr ||=  RSolr.connect(Blacklight.solr_config)
   end
 
@@ -119,12 +114,10 @@ module Blacklight
   # BE AWARE - When you do this, you are monkey patching Blacklight
   # we should eventually find a better way - such as the acts_as pattern
   def self.models_dir
-    Deprecation.warn(Blacklight, "Blacklight.models_dir is deprecated")
     "#{root}/app/models"
   end
   
   def self.controllers_dir
-    Deprecation.warn(Blacklight, "Blacklight.controllers_dir is deprecated")
     "#{root}/app/controllers"
   end
 
@@ -138,7 +131,6 @@ module Blacklight
   # full_path_to_solr_marc_jar = Blacklight.locate_path 'solr_marc', 'SolrMarc.jar'
   
   def self.locate_path(*subpath_fragments)
-    Deprecation.warn(Blacklight, "Blacklight.locate_path is deprecated")
     subpath = subpath_fragments.join('/')
     base_match = [Rails.root, self.root].find do |base|
       File.exists? File.join(base, subpath)

data/lib/blacklight/base.rb

@@ -5,8 +5,6 @@ module Blacklight::Base
   include Blacklight::Configurable
   include Blacklight::SolrHelper
 
-  require 'blacklight/catalog/search_context'
-  include Blacklight::Catalog::SearchContext
 
   included do  
     # When RSolr::RequestError is raised, the rsolr_request_error method is executed.

data/lib/blacklight/catalog.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 module Blacklight::Catalog   
-  extend Deprecation
-  self.deprecation_horizon = 'Blacklight 5.x'
-
   extend ActiveSupport::Concern
   
   include Blacklight::Base
+  
+  require 'blacklight/catalog/search_context'
+  include Blacklight::Catalog::SearchContext
 
   SearchHistoryWindow = 100 # how many searches to save in session history
 
@@ -27,12 +27,7 @@ module Blacklight::Catalog
       @filters = params[:f] || []
       
       respond_to do |format|
-        format.html { 
-          Deprecation.silence(Blacklight::LegacyControllerMethods) do
-            extra_head_content << view_context.auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') )
-            extra_head_content << view_context.auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') )
-          end
-        }
+        format.html { }
         format.rss  { render :layout => false }
         format.atom { render :layout => false }
 
@@ -65,8 +60,8 @@ module Blacklight::Catalog
 
     # updates the search counter (allows the show view to paginate)
     def update
-      search_session['counter'] = params[:counter]
-      redirect_to :action => "show"
+      search_session[:counter] = params[:counter]
+      redirect_to :action => "show", :status => 303
     end
     
     # displays values and pagination links for a single facet field
@@ -158,16 +153,6 @@ module Blacklight::Catalog
       end
     end
     
-    def librarian_view
-      @response, @document = get_solr_response_for_doc_id
-
-      respond_to do |format|
-        format.html
-        format.js { render :layout => false }
-      end
-    end
-    
-    
     protected    
     #
     # non-routable methods ->
@@ -199,13 +184,6 @@ module Blacklight::Catalog
       url_for(options.merge(:action => 'index', :only_path => true))
     end
 
-    # we need to know if we are viewing the item as part of search results so we know whether to
-    # include certain partials or not
-    def adjust_for_results_view
-      # deprecated in blacklight 4.x
-      Deprecation.warn(self, "#adjust_for_results_view helper was deprecated in Blacklight 4.x")
-    end
-
     # extract the pagination info from the response object
     def pagination_info response
       h = {}
@@ -264,10 +242,6 @@ module Blacklight::Catalog
       render "index", :status => 404
     end
 
-    def start_new_search_session?
-      action_name == "index"
-    end
-
     def blacklight_solr
       @solr ||=  RSolr.connect(blacklight_solr_config)
     end

data/lib/blacklight/catalog/search_context.rb

@@ -26,9 +26,9 @@ module Blacklight::Catalog::SearchContext
   # The current search session 
   def current_search_session
 
-    @current_search_session ||= if start_new_search_session?
+    @current_search_session ||= if action_name == "index"
       find_or_initialize_search_session_from_params params
-    elsif params[:search_context] and !params[:search_context].blank?
+    elsif params[:search_context].present?
       find_or_initialize_search_session_from_params JSON.load(params[:search_context])
     elsif params[:search_id].present?
       begin
@@ -37,28 +37,19 @@ module Blacklight::Catalog::SearchContext
       rescue ActiveRecord::RecordNotFound
         nil
       end
-    elsif search_session['id']
+    elsif search_session[:id]
       begin
-        searches_from_history.find(search_session['id'])
+        searches_from_history.find(search_session[:id])
       rescue ActiveRecord::RecordNotFound
         nil
       end
     end
 
-    if @current_search_session
-      search_session['id'] = @current_search_session.id
-    end
+    search_session[:id] = @current_search_session.id if @current_search_session
 
     @current_search_session
   end
 
-  ##
-  # If the current action should start a new search session, this should be
-  # set to true
-  def start_new_search_session?
-    false
-  end
-
   def find_or_initialize_search_session_from_params params
     params_copy = params.reject { |k,v| blacklisted_search_session_params.include?(k.to_sym) or v.blank? }
 
@@ -94,46 +85,15 @@ module Blacklight::Catalog::SearchContext
   # calls setup_previous_document then setup_next_document.
   # used in the show action for single view pagination.
   def setup_next_and_previous_documents
-    if search_session['counter'] and current_search_session
-      index = search_session['counter'].to_i - 1
+    if search_session[:counter] and current_search_session
+      index = search_session[:counter].to_i - 1
       response, documents = get_previous_and_next_documents_for_search index, current_search_session.query_params
 
-      search_session['total'] = response.total
+      search_session[:total] = response.total
       @search_context_response = response
       @previous_document = documents.first
       @next_document = documents.last
     end
   end
 
-  # gets a document based on its position within a resultset  
-  def setup_document_by_counter(counter)
-    ActiveSupport::Deprecation.warn("#setup_document_by_counter helper is deprecated in Blacklight 4.x and will be removed")
-
-    return if counter < 1 or current_search_session.nil?
-    get_single_doc_via_search(counter, current_search_session.query_params)
-  end
-
-  def setup_previous_document
-    ActiveSupport::Deprecation.warn("#setup_previous_document helper was deprecated in Blacklight 4.x; now happens automatically as part of #setup_next_and_previous_documents")
-  end
-  
-  def setup_next_document
-    ActiveSupport::Deprecation.warn("#setup_next_document helper was deprecated in Blacklight 4.x; now happens automatically as part of #setup_next_and_previous_documents")
-  end
-
-  def delete_or_assign_search_session_params
-   # deprecated in blacklight 4.x
-    ActiveSupport::Deprecation.warn("#delete_or_assign_search_session_params helper was deprecated in Blacklight 4.x; now happens automatically as part of #current_search_session")
-  end
-  
-  def save_current_search_params    
-   # deprecated in blacklight 4.x
-    ActiveSupport::Deprecation.warn("#save_current_search_params helper was deprecated in Blacklight 4.x; now happens automatically as part of #current_search_session")
-  end
-
-  # sets some additional search metadata so that the show view can display it.
-  def set_additional_search_session_values
-    ActiveSupport::Deprecation.warn("#set_additional_search_session_values helper was deprecated in Blacklight 4.x")
-  end
-
 end

data/lib/blacklight/configurable.rb

@@ -41,7 +41,8 @@ module Blacklight::Configurable
     end
 
     ##
-    # The default configuration object
+    # The default configuration object, by default it reads from Blacklight.config for backwards
+    # compatibility with Blacklight <= 3.1
     def default_configuration
       Blacklight::Configurable.default_configuration.inheritable_copy
     end

data/lib/blacklight/configuration.rb

@@ -25,8 +25,7 @@ module Blacklight
           :search_history_window => Blacklight::Catalog::SearchHistoryWindow,
           :document_index_view_types => ['list'],
           :add_facet_fields_to_solr_request => false,
-          :add_field_configuration_to_solr_request => false,
-          :http_method => :get
+          :add_field_configuration_to_solr_request => false
           }
         end
       end

data/lib/blacklight/configuration/facet_field.rb

@@ -7,8 +7,6 @@ module Blacklight
         self.tag = "#{self.field}_single"
         self.ex = "#{self.field}_single"
       end
-
-      self.show = true if self.show.nil?
       super
     end
   end

data/lib/blacklight/engine.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
-# lib/blacklight/engine.rb
-require "blacklight"
-require "rails"
 
 module Blacklight
   class Engine < Rails::Engine
 
+    require 'bootstrap-sass'
+    require 'blacklight/rails/routes'
+
     # BlacklightHelper is needed by all helpers, so we inject it
     # into action view base here. 
     initializer 'blacklight.helpers' do |app|

data/lib/blacklight/legacy_controller_methods.rb

@@ -6,63 +6,6 @@
 # in here, but you may find them useful. 
 module Blacklight
   module LegacyControllerMethods 
-    extend ActiveSupport::Concern
-
-    extend Deprecation
-    self.deprecation_horizon = 'Blacklight 5.x'
-
-
-    included do
-
-      before_filter :default_html_head_without_deprecation # add JS/stylesheet stuff
-
-      helper_method :extra_head_content, :stylesheet_links, :javascript_includes
-    end
-
-    #############
-    # Display-related methods.
-    #############
-    
-    # before filter to set up our default html HEAD content. Sub-class
-    # controllers can over-ride this method, or instead turn off the before_filter
-    # if they like. See:
-    # http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html
-    # for how to turn off a filter in a sub-class and such.
-    def default_html_head
-      Deprecation.warn Blacklight::LegacyControllerMethods, "#default_html_head is deprecated"
-    end
-    
-    def default_html_head_without_deprecation
-      Deprecation.silence(Blacklight::LegacyControllerMethods) do
-        default_html_head
-      end
-    end
-    
-    # An array of strings to be added to HTML HEAD section of view.
-    # See ApplicationHelper#render_head_content for details.
-    def extra_head_content
-      Deprecation.warn Blacklight::LegacyControllerMethods, "#extra_head_content is deprecated"
-
-      @extra_head_content ||= []
-    end
-
-    # Array, where each element is an array of arguments to
-    # Rails stylesheet_link_tag helper. See
-    # ApplicationHelper#render_head_content for details.
-    def stylesheet_links
-      Deprecation.warn Blacklight::LegacyControllerMethods, "#stylesheet_links is deprecated"
-
-      @stylesheet_links ||= []
-    end
-    
-    # Array, where each element is an array of arguments to
-    # Rails javascript_include_tag helper. See
-    # ApplicationHelper#render_head_content for details.
-    def javascript_includes
-      Deprecation.warn Blacklight::LegacyControllerMethods, "#javascript_includes is deprecated"
-
-      @javascript_includes ||= []
-    end
     
     protected
     #
@@ -71,18 +14,12 @@ module Blacklight
     # don't use a layout, otherwise use the "application.html.erb" layout
     #
     def choose_layout
-      Deprecation.warn Blacklight::LegacyControllerMethods, "#choose_layout is deprecated"
-
-      Deprecation.silence(Blacklight::LegacyControllerMethods) do
-        layout_name unless request.xml_http_request? || ! params[:no_layout].blank?
-      end
+      layout_name unless request.xml_http_request? || ! params[:no_layout].blank?
     end
     
     #over-ride this one locally to change what layout BL controllers use, usually
     #by defining it in your own application_controller.rb
     def layout_name
-      Deprecation.warn Blacklight::LegacyControllerMethods, "#layout_name is deprecated"
-
       'blacklight'
     end
   end