blacklight 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e233726683e123e23d25e7f85920aff1fc6174ae
-  data.tar.gz: 747930b852dfb6a093710a6ba264562063926348
+  metadata.gz: 20820db95c02b75fc8e604045248607f45d085bc
+  data.tar.gz: 6992b7d81e5792a425cd8018d63a50b03c38dae0
 SHA512:
-  metadata.gz: b7c98286303cdc3c45e41bb2991615aa9a082ca5d770fef9e9b5eb538ee8e59a7c754ef4bb10b27597c779590d5d4ed9214135e315997753aae76da4cb7e7fa3
-  data.tar.gz: 07af82e4ba9cf21b51bff27c3219d701db867a02c59aaba3a4920a746be4ec555c5d2910a5f59505a976afd2aa629ef78567fc577c569b14741a96234157abdd
+  metadata.gz: 78fc07fc10e18251ac027e93034e78c85449cda541953fd9a041bc0e7977139f8da349efe311da67b5032931a875e8dba74a972f1603f5bc11a1e04cd4e4423d
+  data.tar.gz: edb93872a34964b0381753e4c2ba25d0feb7ec5cd1bccdb24515a1fb71729b15edab4d673a3af1ee693ba7081efee1602535b1173f711dcfd7c4046cf78bf230

data/VERSION

@@ -1 +1 @@
-4.4.1
+4.4.2

data/app/assets/stylesheets/blacklight/_bookmark.css.scss

@@ -14,11 +14,6 @@ ul.bookmarkTools
   {
     display:inline;
   }
-
-  li.refworks form input.submit
-  {
-    display:none;
-  }
 }
 
 

data/app/assets/stylesheets/blacklight/_facets.css.scss

@@ -7,6 +7,11 @@
   h5 a {
     color: inherit;
     text-decoration: none;
+
+    &:hover
+    {
+      background-color:#eee;
+    }
   }
 
   ul {
@@ -29,11 +34,6 @@
       padding: 3px 5px;
     }
 
-    a:hover
-    {
-      background-color:#eee;
-    }
-
     .count {
       text-align:right;
       float:right;

data/app/controllers/saved_searches_controller.rb

@@ -38,7 +38,7 @@ class SavedSearchesController < ApplicationController
   # Only dereferences the user rather than removing the items in case they
   # are in the session[:history]
   def clear    
-    if Search.update_all("user_id = NULL", "user_id = #{current_user.id}")
+    if current_user.searches.update_all("user_id = NULL")
       flash[:notice] = I18n.t('blacklight.saved_searches.clear.success')
     else
       flash[:error] = I18n.t('blacklight.saved_searches.clear.failure') 

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -477,10 +477,10 @@ module Blacklight::BlacklightHelperBehavior
   # Use the catalog_path RESTful route to create a link to the show page for a specific item.
   # catalog_path accepts a HashWithIndifferentAccess object. The solr query params are stored in the session,
   # so we only need the +counter+ param here. We also need to know if we are viewing to document as part of search results.
-  def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
+  def link_to_document(doc, opts={:label=>nil, :counter => nil})
     opts[:label] ||= blacklight_config.index.show_link.to_sym
     label = render_document_index_label doc, opts
-    link_to label, doc, { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter, :results_view].include? k  })
+    link_to label, doc, { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter].include? k  })
   end
 
   # link_back_to_catalog(:label=>'Back to Search')

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

@@ -3,6 +3,5 @@
     <%= hidden_field_tag "bookmarks[#{index}][document_id]", document.id %>
     <%= hidden_field_tag "bookmarks[#{index}][title]", h(document[document_show_link_field])%>
   <% end %>
-  <%= link_to_function t('blacklight.bookmarks.collection.add.button'), "document.bookmarks.submit()",  :class => "btn" %>
-  <%= submit_tag t('blacklight.bookmarks.collection.add.button'), :class => 'hide' %>
+  <%= submit_tag t('blacklight.bookmarks.collection.add.button'), :class => 'btn' %>
 <% end %>

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

@@ -1,7 +1,6 @@
 <%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :target => "_blank", :id => "refworks-form" do %>
 
 <%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
-<%= submit_tag t('blacklight.tools.refworks'), :class => 'submit'%>
-<%= link_to_function t('blacklight.tools.refworks'), "document.refworks.submit();", :class => "btn" %>
+<%= submit_tag t('blacklight.tools.refworks'), :class => 'submit btn'%>
 <% end %>
 

data/lib/blacklight/catalog.rb

@@ -42,7 +42,16 @@ module Blacklight::Catalog
         format.atom { render :layout => false }
 
         
-        format.json { render json: {response: {docs: @document_list, facets: facets_from_request, pages: pagination_info(@response)}}}
+        format.json do
+          facet = facets_from_request.as_json.each do |f|
+            f["label"] = facet_configuration_for_field(f["name"]).label
+            f["items"] = f["items"].as_json.each do |i|
+              i['label'] ||= i['value']
+            end
+          end 
+
+          render json: {response: {docs: @document_list, facets: facet, pages: pagination_info(@response)}}
+        end
       end
     end
     
@@ -68,7 +77,6 @@ module Blacklight::Catalog
 
     # updates the search counter (allows the show view to paginate)
     def update
-      adjust_for_results_view
       session[:search][:counter] = params[:counter]
       redirect_to :action => "show"
     end
@@ -120,9 +128,7 @@ module Blacklight::Catalog
       @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
       
       if request.post? and validate_email_params
-        url_gen_params = {:host => request.host_with_port, :protocol => request.protocol}
-          
-        email = RecordMailer.email_record(@documents, {:to => params[:to], :message => params[:message]}, url_gen_params)        
+        email = RecordMailer.email_record(@documents, {:to => params[:to], :message => params[:message]}, url_options)
         email.deliver 
 
         flash[:success] = I18n.t("blacklight.email.success")
@@ -145,11 +151,9 @@ module Blacklight::Catalog
       @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
       
       if request.post? and validate_sms_params
-        url_gen_params = {:host => request.host_with_port, :protocol => request.protocol}
-
         to = "#{params[:to].gsub(/[^\d]/, '')}@#{sms_mappings[params[:carrier]]}"
 
-        sms = RecordMailer.sms_record(@documents, { :to => to }, url_gen_params)
+        sms = RecordMailer.sms_record(@documents, { :to => to }, url_options)
         sms.deliver
 
         flash[:success] = I18n.t("blacklight.sms.success")
@@ -261,13 +265,9 @@ module Blacklight::Catalog
     # 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
-      if params[:results_view] == "false"
-        session[:search][:results_view] = false
-      else
-        session[:search][:results_view] = true
-      end
+      # deprecated in blacklight 4.x
+      ActiveSupport::Deprecation.warn("#adjust_for_results_view helper was deprecated in Blacklight 4.x")
     end
-    
        
     # when solr (RSolr) throws an error (RSolr::RequestError), this method is executed.
     def rsolr_request_error(exception)

data/lib/blacklight/controller.rb

@@ -95,15 +95,15 @@ module Blacklight::Controller
     # When a user logs in, transfer any saved searches or bookmarks to the current_user
     def transfer_guest_user_actions_to_current_user
       return unless respond_to? :current_user and respond_to? :guest_user and current_user and guest_user
-      current_user_searches = current_user.searches.all.collect(&:query_params)
-      current_user_bookmarks = current_user.bookmarks.all.collect(&:document_id)
+      current_user_searches = current_user.searches.pluck(:query_params)
+      current_user_bookmarks = current_user.bookmarks.pluck(:document_id)
 
-      guest_user.searches.all.reject { |s| current_user_searches.include?(s.query_params)}.each do |s| 
+      guest_user.searches.reject { |s| current_user_searches.include?(s.query_params)}.each do |s|
         current_user.searches << s
         s.save!
       end
 
-      guest_user.bookmarks.all.reject { |b| current_user_bookmarks.include?(b.document_id)}.each do |b| 
+      guest_user.bookmarks.reject { |b| current_user_bookmarks.include?(b.document_id)}.each do |b|
         current_user.bookmarks << b
         b.save!
       end

data/lib/blacklight/solr_response/pagination_methods.rb

@@ -1,6 +1,7 @@
 module Blacklight::SolrResponse::PaginationMethods
 
   include Kaminari::PageScopeMethods
+  include Kaminari::ConfigurationMethods::ClassMethods
 
   def limit_value #:nodoc:
     rows

data/spec/controllers/catalog_controller_spec.rb

@@ -144,17 +144,40 @@ describe CatalogController do
     end
 
     describe "with format :json" do
-      it "should get the feed" do
+      before do
         get :index, :format => 'json'
         response.should be_success
-        json = JSON.parse response.body
-        json["response"]["pages"]["total_count"].should == 30 
-        json["response"]["pages"]["current_page"].should == 1
-        json["response"]["pages"]["total_pages"].should == 3
-        json["response"]["docs"].size.should == 10
-        json["response"]["docs"].first.keys.should == ["published_display", "author_display", "lc_callnum_display", "pub_date", "subtitle_display", "format", "material_type_display", "title_display", "id", "subject_topic_facet", "language_facet", "score"]
-        json["response"]["facets"].length.should == 9
-        json["response"]["facets"].first.should == {"name"=>"format", "items"=>[{"value"=>"Book", "hits"=>30}]}
+      end
+      let(:json) { JSON.parse(response.body)['response'] }
+      let(:pages) { json["pages"] }
+      let(:docs) { json["docs"] }
+      let(:facets) { json["facets"] }
+
+      it "should get the pages" do
+        pages["total_count"].should == 30 
+        pages["current_page"].should == 1
+        pages["total_pages"].should == 3
+      end
+
+      it "should get the documents" do
+        docs.size.should == 10
+        docs.first.keys.should == ["published_display", "author_display", "lc_callnum_display", "pub_date", "subtitle_display", "format", "material_type_display", "title_display", "id", "subject_topic_facet", "language_facet", "score"]
+      end
+
+      it "should get the facets" do
+        facets.length.should == 9
+        facets.first.should == {"name"=>"format", "label" => "Format", "items"=>[{"value"=>"Book", "hits"=>30, "label"=>"Book"}]}
+      end
+
+      describe "facets" do
+        let(:query_facet_items) { facets.last['items'] }
+        let(:regular_facet_items) { facets.first['items'] }
+        it "should have items with labels and values" do
+          query_facet_items.first['label'].should == 'within 5 Years'
+          query_facet_items.first['value'].should == 'years_5'
+          regular_facet_items.first['label'].should == "Book"
+          regular_facet_items.first['value'].should == "Book"
+        end
       end
     end
 
@@ -254,6 +277,7 @@ describe CatalogController do
 
     describe "@document" do
       before do
+        @mock_response = double()
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }])
         @mock_document = double()
         controller.stub(:find => @mock_response, 
@@ -280,6 +304,7 @@ describe CatalogController do
         end
       end
       before do
+        @mock_response = double()
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }])
         @mock_document = double()
         controller.stub(:find => @mock_response, 
@@ -364,7 +389,11 @@ describe CatalogController do
         request.flash[:error].should be_nil
       end
       it "should redirect back to the record upon success" do
-        post :email, :id => doc_id, :to => 'test_email@projectblacklight.org'
+        mock_mailer = double
+        mock_mailer.should_receive(:deliver)
+        RecordMailer.should_receive(:email_record).with(anything, { :to => 'test_email@projectblacklight.org', :message => 'xyz' }, hash_including(:host => 'test.host')).and_return mock_mailer
+
+        post :email, :id => doc_id, :to => 'test_email@projectblacklight.org', :message => 'xyz'
         request.flash[:error].should be_nil
         request.should redirect_to(catalog_path(doc_id))
       end

data/spec/features/search_results_spec.rb

@@ -44,6 +44,12 @@ describe "Search Results" do
     
   end
 
+  it "should have an opensearch description document" do
+    visit root_path
+    page.should have_xpath("//link[contains(@rel, 'search')]")
+    expect(page.find(:xpath, "//link[contains(@rel, 'search')]")[:href]).to eq "http://www.example.com/catalog/opensearch.xml"
+  end
+
 end
 
 

data/spec/lib/blacklight_solr_response_spec.rb

@@ -63,6 +63,9 @@ describe Blacklight::SolrResponse do
     expect(r.total_count).to eq(r.total)
     expect(r.next_page).to eq(r.current_page + 1)
     expect(r.prev_page).to eq(nil)
+    if Kaminari.config.respond_to? :max_pages
+      expect(r.max_pages).to be_nil
+    end
     expect(r).to be_a_kind_of Kaminari::PageScopeMethods
   end
 

data/spec/views/catalog/_thumbnail_default.erb_spec.rb

@@ -17,7 +17,7 @@ describe "catalog/_thumbnail_default" do
   end
 
   before do
-    assign :response, mock(:params => {})
+    assign :response, double(:params => {})
     view.stub(:render_grouped_response?).and_return false
     view.stub(:blacklight_config).and_return(blacklight_config)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails