blacklight 5.3.0 → 5.4.0.rc1

data/app/models/solr_document.rb

@@ -0,0 +1,5 @@
+class SolrDocument
+
+  include Blacklight::Solr::Document
+
+end

data/app/views/bookmarks/_tools.html.erb

@@ -1,12 +1,11 @@
-    <ul class="bookmarkTools nav nav-pills">
-      <li class="cite">
-        <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect{|doc| doc.document_id}), {:id => 'citeLink', :name => 'citation', :class => 'btn btn-default', :data => {:ajax_modal => "trigger"}} %>
-      </li>
-      <% if defined? BlacklightMarc %>
-        <%= render partial: 'bookmarks/refworks' %>
-        <%= render partial: 'bookmarks/endnote' %>
-      <% end %>
-      <li class="email">
-        <%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect {|doc| doc.document_id}), :class=>"btn btn-default", :id => "emailLink", :data => {:ajax_modal => "trigger"} %>
-      </li>
+<ul class="bookmarkTools nav nav-pills">
+  <li class="cite">
+    <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @response.documents.map {|doc| doc.id}), {:id => 'citeLink', :name => 'citation', :class => 'btn btn-default', :data => {:ajax_modal => "trigger"}} %>
+  </li>
+
+  <li class="email">
+    <%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @response.documents.map {|doc| doc.id}), :class=>"btn btn-default", :id => "emailLink", :data => {:ajax_modal => "trigger"} %>
+  </li>
+  
+  <%= render_marc_tools %>
 </ul>

data/app/views/catalog/_bookmark_control.html.erb

@@ -3,8 +3,8 @@
   # Note these two forms are pretty similar but for different :methods, classes, and labels. 
   # but it was simpler to leave them seperate instead of DRYing them, got confusing trying that.
   # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
-  -%>  
-  <% unless current_or_guest_user.document_is_bookmarked? document.id %>  
+  -%>
+  <% if current_bookmarks.find { |x| x.document_id == document.id and x.document_type == document.class }.blank? %>  
 
       <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>   
         <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>

data/app/views/catalog/_refworks_form.html.erb

@@ -1,5 +1,6 @@
-<%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :role => 'form', :target => "_blank", :id => "refworks-form" do %>
+<%# this partial is used by blacklight-marc 5.0 %>
+<%= form_tag refworks_export_url, :name => "refworks", :role => 'form', :target => "_blank", :id => "refworks-form" do %>
 
 <%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
 <%= submit_tag t('blacklight.tools.refworks'), :class => 'submit btn btn-default'%>
-<% end %>
+<% end %>

data/app/views/catalog/_sort_widget.html.erb

@@ -1,13 +1,13 @@
-<% if show_sort_and_per_page? and !blacklight_config.sort_fields.blank? %>
+<% if show_sort_and_per_page? and !active_sort_fields.blank? %>
 <div id="sort-dropdown" class="btn-group">
   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
       <%= link_to(t('blacklight.search.sort.label', :field =>current_sort_field.label), "#") %> <span class="caret"></span>
   </button>
 
   <ul class="dropdown-menu">
-        <%- blacklight_config.sort_fields.each do |sort_key, field| %>
-          <li><%= link_to(field.label, url_for(params_for_search(:sort => sort_key))) %></li>
-        <%- end -%>
+      <%- active_sort_fields.each do |sort_key, field_config| %>
+        <li><%= link_to(field_config.label, url_for(params_for_search(:sort => sort_key))) %></li>
+      <%- end -%>
   </ul>
 </div>
-<% end %>
+<% end %>

data/app/views/catalog/_view_type_group.html.erb

@@ -2,7 +2,7 @@
 <div class="view-type">
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
-    <%  blacklight_config.view.keys.each do |view| %>
+    <%  document_index_views.each do |view, config| %>
     <%= link_to url_for(params.merge(:view => view)), :title => t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), :class => "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
       <%= render_view_type_group_icon view %>
         <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
@@ -10,4 +10,4 @@
     <% end %>
   </div>
 </div>
-<% end -%>
+<% end -%>

data/app/views/shared/_header_navbar.html.erb

@@ -18,8 +18,6 @@
 
 <div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
   <div class="container">
-    <div class="navbar-header">
     <%= render_search_bar  %>
-    </div>
   </div>
-</div>
+</div>

data/config/locales/blacklight.pt-BR.yml

@@ -0,0 +1,223 @@
+pt-BR:
+  active_record:
+    models:
+      feedback: 'Feedback'
+    attributes:
+      feedback:
+        name: 'Seu Nome'
+        email: 'Seu Email'
+        message: 'Sua Mensagem'
+  views:
+    pagination:
+      first: '« primeiro'
+      last: 'último »'
+      previous: '« anterior'
+      next: 'próximo »'
+      truncate: '…'
+
+    pagination_compact:
+      previous: '« ant'
+      next: 'próx »'
+
+  blacklight:
+    application_name: 'Blacklight'
+
+    header_links:
+      login: 'Acessar'
+      logout: 'Sair'
+      bookmarks: 'Favoritos'
+      saved_searches: 'Buscas Salvas'
+      search_history: 'Histórico'
+
+    welcome: 'Bem-Vindo!'
+    and: 'e'
+    or: 'ou'
+
+    bookmarks:
+      collection:
+        add:
+          button: 'Adicionar aos Favoritos'
+      title: 'Favoritos'
+      no_bookmarks: 'Você não salvou nenhum Favorito'
+      add:
+        button: 'Favorito'
+        success:
+          one: 'Favorito Adicionado.'
+          other: 'Favoritos Adicionados.'
+        failure:  'Xiii, ocorreu um erro ao salvar o favorito.'
+      remove:
+        button: 'Remover favorito'
+        success: 'Favorito removido.'
+        failure: 'Xiii, ocorreu um erro a remover o favorito.'
+        action_confirm: 'Remover este favorito?'
+      clear:
+        action_title: 'Limpar favoritos'
+        action_confirm: 'Deseja limpar seus favoritos?'
+        success: 'Seus favoritos está limpo.'
+        failure: 'Xiii, ocorreu um erro ao limpar seus favoritos.'
+      need_login: 'Faça o login para ver ou modificar seus favoritos.'
+      list_title: 'Seus Favoritos'
+      delete: 'Excluir'
+
+    feedback:
+      valid_name: 'Preencha o Nome'
+      valid_email: 'Verifique seu endereço de email'
+      need_message: 'Escreva uma mensagem'
+      submit: 'Enviar!'
+      errors:
+        title: 'Por favor corrija os seguintes erros no formulário:'
+      complete:
+        title: 'Obrigado por seu contato'
+
+    saved_searches:
+      add:
+        success: 'Sua busca foi salva.'
+        failure: 'Xiii, ocorreu um erro ao salvar sua pesquisa.'
+      remove:
+        success: 'A busca salva foi excluída.'
+        failure: 'Xiii, ocorreu um erro ao excluir sua pesquisa.'
+      clear:
+        action_title: 'Limpar Buscas Salvas'
+        action_confirm: 'Deseja Excluir as Buscas Salvas?'
+        success: 'As buscas foram removidas.'
+        failure: 'Xiii, ocorreu um erro ao remover suas pesquisas.'
+      title: 'Pesquisas Salvas'
+      need_login: 'Por favor faça o login para gerenciar suas buscas salvas.'
+      no_searches: 'Você não salvou nenhuma busca'
+      list_title: 'Suas Buscas'
+      delete: 'excluir'
+
+    search_history:
+      clear:
+        action_title: 'Limpar Histórico de Busca'
+        action_confirm: 'Deseja limpar o histórico de Busca?'
+        success: 'Histórico de Busca removido.'
+        failure: 'Xiii, ocorreu um erro ao remover o histórico de busca.'
+      title: 'Histórico de Busca'
+      no_history: 'Não existe nada em seu histórico'
+      recent: 'Buscas Recentes'
+      forget: 'limpar'
+      save: 'salvar'
+
+    tools:
+      title: 'Ferramentas'
+      cite: 'Citar'
+      endnote: 'Exportar para EndNote'
+      refworks: 'Exportar para Refworks'
+      email: 'Email'
+      sms: 'SMS'
+      librarian_view: 'Librarian View'
+      clear: 'Limpar'
+
+    citation:
+      mla: 'MLA'
+      apa: 'APA'
+      chicago: 'Chicago'
+
+    email:
+      form:
+        title: 'Enviar por Email'
+        to: 'Email:'
+        message: 'Mensagem:'
+        submit: 'Enviar'
+      text:
+        title: 'Título: %{value}'
+        author: 'Autor: %{value}'
+        format: 'Formato: %{value}'
+        language: 'Idioma: %{value}'
+        subject:
+          one: 'Item: %{title}'
+          other: 'Itens'
+        url: 'URL: %{url}'
+        message: 'Mensagem: %{message}'
+
+      errors:
+        to:
+          invalid: 'Verifique seu endereço de email'
+          blank: 'Você precisa especificar um destinaário para enviar esta mensagem'
+    sms:
+      form:
+        title: 'Enviar por SMS'
+        to: 'Celular:'
+        carrier: 'Operadora'
+        carrier_prompt: 'Selecione a Operadora'
+        submit: 'Enviar'
+      text:
+        title: '%{value}'
+        author: ' por %{value}'
+        url: 'Link: %{url}'
+      errors:
+        to:
+          invalid: 'Você precisa digitar um número de telefone válido'
+          blank: "Você precisa digitar o número de telefone do destinatário para enviar uma mensagem"
+        carrier:
+          blank: 'Você precisa selecionar a operadora'
+
+    back_to_search: 'Voltar a busca'
+    back_to_bookmarks: 'Voltar aos Favoritos'
+
+    search:
+      title: '%{application_name} Resultado da Busca'
+      search_results_header: 'Busca'
+      search_results: 'Resultados da Busca'
+      errors:
+        request_error: "Desculpe, Eu não compreendi sua busca."
+        invalid_solr_id: "Desculpe, você solicitou um cadastro que não existe."
+      per_page:
+        label: '%{count}<span class="hide-text"> por página</span>'
+        button_label: '%{count} por página'
+        title: 'Número de resultados para mostrar por página'
+        submit: 'Atualizar'
+      sort:
+        label: 'Ordenar por %{field}'
+        submit: 'ordenar resultados'
+      form:
+        search_field:
+          label: 'Procurar em'
+          title: 'Opções da Busca'
+          post_label: 'por'
+        q: 'Busca...'
+        submit: 'Buscar'
+      pagination:
+        title: 'Navegação nos Resultados'
+      pagination_info:
+        no_items_found: 'Nenhum resultado encontrado para %{entry_name}'
+        single_item_found: '<strong>1</strong> para <strong>1</strong> de <strong>1</strong>'
+        pages:
+          one: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> de <strong>%{total_num}</strong>'
+          other: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> de <strong>%{total_num}</strong>'
+      entry_pagination_info:
+        one: '<strong>1 de 1</strong>'
+        other: '<strong>%{current}</strong> de <strong>%{total}</strong>'
+      documents:
+        counter: '%{counter}. '
+      facets:
+        title: 'Filtre sua busca'
+        sort:
+          count: 'Ordenar por Número'
+          index: 'Ordem Alfabética A-Z'
+        count: '%{number}'
+        more: 'mais »'
+        selected:
+          remove: '[remover]'
+      filters:
+        title: 'Sua busca por:'
+        label: '%{label}:'
+        remove:
+          value: 'Remover filtro %{value}'
+          label_value: 'Remover %{label}: %{value}'
+      librarian_view:
+        title: 'Librarian View'
+        leader: 'LEADER %{leader}'
+      start_over: 'refazer busca'
+      show:
+        title: '%{document_title} - %{application_name}'
+      rss_feed: 'RSS para resultadoss'
+      atom_feed: 'Atom para resultados'
+      fields:
+        default: 'Palavra-chave'
+
+    entry_name:
+      default: 'registro'
+
+    did_you_mean: 'Você quis dizer: %{options}?'

data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb

@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration
+  def change
+    add_column(:bookmarks, :document_type, :string)
+    
+    add_index :bookmarks, :user_id
+  end
+end

data/gemfiles/rails4.1.gemfile

@@ -9,4 +9,4 @@ end
 gem 'sass', '~> 3.2.15'
 gem 'sprockets', '~> 2.11.0'
 
-gem 'rails', '4.1.0.rc1'
+gem 'rails', '4.1.0'

data/lib/blacklight.rb

@@ -36,6 +36,11 @@ module Blacklight
     attr_accessor :solr, :solr_config
   end
 
+  # Secret key used to share session information with
+  # other services (e.g. refworks callback urls)
+  mattr_accessor :secret_key
+  @@secret_key = nil
+  
   def self.solr_file
     "#{::Rails.root.to_s}/config/solr.yml"
   end

data/lib/blacklight/catalog.rb

@@ -21,7 +21,6 @@ module Blacklight::Catalog
   
     # get search results from the solr index
     def index
-      
       (@response, @document_list) = get_search_results
       
       respond_to do |format|
@@ -33,12 +32,13 @@ module Blacklight::Catalog
         end
 
         additional_response_formats(format)
+        document_export_formats(format)
       end
     end
     
     # get single document from the solr index
     def show
-      @response, @document = get_solr_response_for_doc_id    
+      @response, @document = get_solr_response_for_doc_id   
 
       respond_to do |format|
         format.html {setup_next_and_previous_documents}
@@ -103,7 +103,7 @@ module Blacklight::Catalog
     
     # citation action
     def citation
-      @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
+      @response, @documents = get_solr_response_for_document_ids(params[:id])
       respond_to do |format|
         format.html
         format.js { render :layout => false }
@@ -113,7 +113,7 @@ module Blacklight::Catalog
     
     # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
     def email
-      @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
+      @response, @documents = get_solr_response_for_document_ids(params[:id])
       
       if request.post? and validate_email_params
         email = RecordMailer.email_record(@documents, {:to => params[:to], :message => params[:message]}, url_options)
@@ -136,7 +136,7 @@ module Blacklight::Catalog
     
     # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
     def sms 
-      @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
+      @response, @documents = get_solr_response_for_document_ids(params[:id])
       
       if request.post? and validate_sms_params
         to = "#{params[:to].gsub(/[^\d]/, '')}@#{sms_mappings[params[:carrier]]}"
@@ -170,6 +170,8 @@ module Blacklight::Catalog
     # non-routable methods ->
     #
 
+    ##
+    # Render additional response formats, as provided by the blacklight configuration
     def additional_response_formats format
       blacklight_config.index.respond_to.each do |key, config|
         format.send key do
@@ -189,6 +191,32 @@ module Blacklight::Catalog
       end
     end
 
+    ##
+    # Try to render a response from the document export formats available
+    def document_export_formats format
+      format.any do
+        format_name = params.fetch(:format, '').to_sym
+
+        if @response.export_formats.include? format_name
+          render_document_export_format format_name
+        else
+          raise ActionController::UnknownFormat.new
+        end
+      end
+    end
+
+    ##
+    # Render the document export formats for a response
+    # First, try to render an appropriate template (e.g. index.endnote.erb)
+    # If that fails, just concatenate the document export responses with a newline. 
+    def render_document_export_format format_name
+      begin
+        render
+      rescue ActionView::MissingTemplate
+        render text: @response.documents.map { |x| x.export_as(format_name) if x.exports_as? format_name }.compact.join("\n"), layout: false
+      end    
+    end
+
     # override this method to change the JSON response from #index 
     def render_search_results_as_json
       {response: {docs: @document_list, facets: search_facets_as_json, pages: pagination_info(@response)}}

data/lib/blacklight/configuration.rb

@@ -17,9 +17,8 @@ module Blacklight
     # the basic, required Blacklight fields
     class << self
       def default_values
-        @default_values ||= begin
-          unique_key = ((SolrDocument.unique_key if defined?(SolrDocument)) || 'id')
 
+        @default_values ||= begin
           {
           # HTTP method to use when making requests to solr; valid
           # values are :get and :post.
@@ -30,6 +29,8 @@ module Blacklight
           :solr_path => 'select',
           # Default values of parameters to send with every search request
           :default_solr_params => {},
+          # the model to load solr response documents into; set below in #initialize_default_values
+          :solr_document_model => nil,
           # The solr rqeuest handler to use when requesting only a single document 
           :document_solr_request_handler => 'document',
           # THe path to send single document requests to solr
@@ -50,7 +51,7 @@ module Blacklight
           # General configuration for all views
           :index => ViewConfig::Index.new(
             # solr field to use to render a document title
-            :title_field => unique_key,
+            :title_field => nil,
             # solr field to use to render format-specific partials
             :display_type_field => 'format',
             # partials to render for each document(see #render_document_partials)
@@ -131,6 +132,10 @@ module Blacklight
         self[k] ||=  v
       end
     end
+    
+    def solr_document_model
+      super || SolrDocument
+    end
 
     ##
     # DSL helper
@@ -160,6 +165,10 @@ module Blacklight
 
       field
     end
+    
+    def default_title_field
+      solr_document_model.unique_key || 'id'
+    end
 
     ##
     # Add any configured facet fields to the default solr parameters hash