blacklight 5.6.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479622c28e8d18d1eeec6cd98d645dc569661dbc
-  data.tar.gz: 86833f67f334ec5ace5b41ceab9aa0bbf78e01b7
+  metadata.gz: 6fcfb6f2ba3d0e2311b6707cc12d3e39a82ae03a
+  data.tar.gz: 7efc0f476b12a8096ff9f58d5e1f15344bd6b282
 SHA512:
-  metadata.gz: cf903983243c985c8088492ce6c3bae681879b41a653e11e7893885190255c651971358bceb9dbfb0f62dfb088af8139058664c32314b919f722f6f5ecba4da3
-  data.tar.gz: 8e814b2f64604fc14f0a43ac0bdd44f1fd45825046d1eca6bcafc5c5c9df4e0bc1281743b11eb459b38d73a597440a8cd0d3509e7497a24095cf38c0b8ed71cd
+  metadata.gz: 48281cc2fc1f409cf634100dd44a16415c2a531e65dd2d6f89764023b6e1c42e0cea1173692d1b8897e7f61f7b525b8d6e950c983a4af0d735265d044c31449b
+  data.tar.gz: 0bb285df7cbaa528c95b6495b87ac7523e44c9226ec3d1a51fd09ffaca51f0e201420aa6885e7efa3b7bb27815994f2a2a3d180bb1590a6a632bb4dc77a5d8d6

data/.travis.yml

@@ -2,32 +2,34 @@ notifications:
   email: false
 
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.1.2
 
 matrix:
   include:
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails4.gemfile
+    - rvm: 2.1.2
+      env: "RAILS_VERSION=4.0.9"
+    - rvm: 2.0.0
+      env: "RAILS_VERSION=4.1.5"
     - rvm: 1.9.3
-      gemfile: gemfiles/rails4.gemfile
+      env: "RAILS_VERSION=4.1.5"
     - rvm: jruby
-      gemfile: gemfiles/rails4.gemfile
-      
+      env: "RAILS_VERSION=4.1.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.1.2
+      env: "RAILS_VERSION=4.2.0.beta1"
+  allow_failures:
+    - env: "RAILS_VERSION=4.2.0.beta1"
+
 before_install:
-  - gem install bundler 
+  - gem install bundler
 
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
-  - gemfiles/rails4.1.gemfile
+env:
+ - "RAILS_VERSION=3.2.19"
+ - "RAILS_VERSION=4.1.5"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
       - blacklight-commits@googlegroups.com
 
-env:
-  global:
-    - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+global_env:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # Please see blacklight.gemspec for dependency information.
 gemspec path: File.expand_path('..', __FILE__)
 
-
 # Peg simplecov to < 0.8 until this is resolved:
 # https://github.com/colszowka/simplecov/issues/281
 gem 'simplecov', '~> 0.7.1', require: false
@@ -20,4 +19,9 @@ file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_
 if File.exists?(file)
   puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
   instance_eval File.read(file)
+else
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+
+  # explicitly include sass-rails to get compatible sprocket dependencies
+  gem 'sass-rails'
 end

data/VERSION

@@ -1 +1 @@
-5.6.0
+5.7.0

data/app/assets/javascripts/blacklight/bookmark_toggle.js

@@ -4,8 +4,13 @@
 //change form submit toggle to checkbox
     Blacklight.do_bookmark_toggle_behavior = function() {
       $(Blacklight.do_bookmark_toggle_behavior.selector).bl_checkbox_submit({
-          //css_class is added to elements added, plus used for id base
-          css_class: "toggle_bookmark"    
+         //css_class is added to elements added, plus used for id base
+         css_class: "toggle_bookmark",
+ 	 success: function(checked, response) {
+		    if (response.bookmarks) {
+			$('#bookmarks_nav span[data-role=bookmark-counter]').text(response.bookmarks.count);
+		    }
+	          }
       }); 
     };
     Blacklight.do_bookmark_toggle_behavior.selector = "form.bookmark_toggle"; 

data/app/assets/javascripts/blacklight/checkbox_submit.js

@@ -109,7 +109,7 @@
                     update_state_for(checked);
                     label.removeAttr("disabled");
                     checkbox.removeAttr("disabled");
-                    options.success.call(form, checked);
+                    options.success.call(form, checked, xhr.responseJSON);
                   } else {
                     alert("Error");
                     update_state_for(checked);

data/app/controllers/bookmarks_controller.rb

@@ -64,11 +64,11 @@ class BookmarksController < CatalogController
     current_or_guest_user.save! unless current_or_guest_user.persisted?
 
     success = @bookmarks.all? do |bookmark|
-      current_or_guest_user.bookmarks.create(bookmark) unless current_or_guest_user.bookmarks.where(bookmark).exists?
+       current_or_guest_user.bookmarks.where(bookmark).exists? || current_or_guest_user.bookmarks.create(bookmark) 
     end
 
     if request.xhr?
-      success ? head(:no_content) : render(:text => "", :status => "500")
+      success ? render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count }}) : render(:text => "", :status => "500")
     else
       if @bookmarks.length > 0 && success
         flash[:notice] = I18n.t('blacklight.bookmarks.add.success', :count => @bookmarks.length)
@@ -96,10 +96,10 @@ class BookmarksController < CatalogController
       redirect_to :back
     else
       # ajaxy request needs no redirect and should not have flash set
-      success ? head(:no_content) : render(:text => "", :status => "500")
+      success ? render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count }}) : render(:text => "", :status => "500")
     end        
   end
-  
+
   def clear    
     if current_or_guest_user.bookmarks.clear
       flash[:notice] = I18n.t('blacklight.bookmarks.clear.success') 

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -276,11 +276,14 @@ module Blacklight::UrlHelperBehavior
   # This method should move to BlacklightMarc in Blacklight 6.x
   def refworks_export_url params = {}
     if params.is_a? ::SolrDocument or (params.nil? and instance_variable_defined? :@document)
-      Deprecation.warn self, "#refworks_export_url with a SolrDocument is deprecated. Pass in { url: url_for_document(@document) } instead"
-      url = url_for_document(params || @document, format: :refworks_marc_txt, only_path: false)
-      params = { url: url }
+      Deprecation.warn self, "Calling #refworks_export_url without a :url is deprecated. Pass in e.g. { url: url_for_document(@document, format: :refworks_marc_txt) } instead"
+      url = url_for_document(params || @document)
+      params = { url: polymorphic_url(url, format: :refworks_marc_txt, only_path: false) }
+    elsif params[:id]
+      Deprecation.warn self, "Calling #refworks_export_url without a :url is deprecated. Pass in e.g. { url: url_for_document(@document, format: :refworks_marc_txt) } instead"
+      params = { url: polymorphic_url(url_for_document(params), format: :refworks_marc_txt, only_path: false) }
     end
-    
+
     "http://www.refworks.com/express/expressimport.asp?vendor=#{CGI.escape(params[:vendor] || application_name)}&filter=#{CGI.escape(params[:filter] || "MARC Format")}&encoding=65001" + (("&url=#{CGI.escape(params[:url])}" if params[:url]) || "")
   end
 

data/app/views/_user_util_links.html.erb

@@ -2,7 +2,10 @@
   <ul class="nav navbar-nav">
     <% if render_bookmarks_control? %>
     <li>
-      <%= link_to t('blacklight.header_links.bookmarks'), bookmarks_path %>
+      <%= link_to bookmarks_path, id:'bookmarks_nav' do %>
+        <%= t('blacklight.header_links.bookmarks') %>
+	(<span data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>)
+      <% end %>
     </li>
     <% end %>
     <% if has_user_authentication_provider? and current_user %>
@@ -33,4 +36,4 @@
       <% end %>
       </ul>
   <% end %>
-</div>
+</div>

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

@@ -24,7 +24,7 @@
       <% end %>
       <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
         <li class="refworks">
-        <%= link_to t('blacklight.tools.refworks'), refworks_export_url(:id => @document)  %>        
+        <%= link_to t('blacklight.tools.refworks'), refworks_export_url(url: polymorphic_url(url_for_document(@document), format: :refworks_marc_txt, only_path: false))  %>        
         </li>
      <% end %>
      <% if @document.export_formats.keys.include?( :endnote ) %>

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

@@ -1,4 +1,4 @@
-<div id="content" class="col-md-9 show-document">
+<div id="content" class="col-md-9 col-sm-8 show-document">
 
   <%= render 'previous_next_doc' %>
 
@@ -29,6 +29,6 @@
 
 </div>
 
-<div id="sidebar" class="col-md-3">
+<div id="sidebar" class="col-md-3 col-sm-4">
    <%= render_document_sidebar_partial %>
 </div>

data/lib/blacklight/solr_response/facets.rb

@@ -35,16 +35,37 @@ module Blacklight::SolrResponse::Facets
     end
 
     def limit
-      @options[:limit]
+      @options[:limit] || solr_default_limit
     end
 
     def sort
-      @options[:sort] || 'index'
+      @options[:sort] || solr_default_sort
     end
 
     def offset
-      @options[:offset] || 0
+      @options[:offset] || solr_default_offset
     end
+    
+    private
+    # Per https://wiki.apache.org/solr/SimpleFacetParameters#facet.limit
+    def solr_default_limit
+      100
+    end
+    
+    # Per https://wiki.apache.org/solr/SimpleFacetParameters#facet.sort
+    def solr_default_sort
+      if limit > 0
+        'count'
+      else
+        'index'
+      end
+    end
+    
+    # Per https://wiki.apache.org/solr/SimpleFacetParameters#facet.offset
+    def solr_default_offset
+      0
+    end
+    
   end
   
   # @response.facets.each do |facet|

data/spec/controllers/bookmarks_controller_spec.rb

@@ -3,13 +3,14 @@ require 'spec_helper'
 describe BookmarksController do
   # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead. 
   describe "update" do
-    it "has a 204 status code when creating a new one" do
+    it "has a 200 status code when creating a new one" do
       xhr :put, :update, :id => '2007020969', :format => :js
       expect(response).to be_success
-      expect(response.code).to eq "204"
+      expect(response.code).to eq "200"
+      expect(JSON.parse(response.body)["bookmarks"]["count"]).to eq 1
     end
     
-    it "has a 500 status code when fails is success" do
+    it "has a 500 status code when create is not success" do
       allow(@controller).to receive_message_chain(:current_or_guest_user, :existing_bookmark_for).and_return(false)
       allow(@controller).to receive_message_chain(:current_or_guest_user, :persisted?).and_return(true)
       allow(@controller).to receive_message_chain(:current_or_guest_user, :bookmarks, :where, :exists?).and_return(false)  
@@ -25,10 +26,11 @@ describe BookmarksController do
       @controller.send(:current_or_guest_user).bookmarks.create! document_id: '2007020969', document_type: "SolrDocument"
     end
     
-    it "has a 204 status code when delete is success" do
+    it "has a 200 status code when delete is success" do
       xhr :delete, :destroy, :id => '2007020969', :format => :js
       expect(response).to be_success
-      expect(response.code).to eq "204"
+      expect(response.code).to eq "200"
+      expect(JSON.parse(response.body)["bookmarks"]["count"]).to eq 0
     end
 
    it "has a 500 status code when delete is not success" do

data/spec/features/facets_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe "Facets" do
@@ -6,4 +7,29 @@ describe "Facets" do
     expect(page).to have_selector(".modal-title", :text => "Language")
     expect(page).to have_selector(".facet_select", :text => "Tibetan")
   end
-end
+  
+  it "should paginate through a facet's values" do
+    visit catalog_facet_path("subject_topic_facet")
+    expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
+    expect(page).to have_link "A-Z Sort"
+    expect(page).to have_selector '.sort_options .active', text: "Numerical Sort"
+    within ".modal-footer" do
+      click_on "Next »"
+    end
+    expect(page).to have_selector '.facet-values li:first', text: "Jewish law"
+    expect(page).to have_link "« Previous"
+  end
+  
+  it "should be able to change the facet sort" do
+    visit catalog_facet_path("subject_topic_facet")
+    expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
+    within ".modal-footer" do
+      click_on "A-Z Sort"
+    end
+    expect(page).to have_selector '.facet-values li:first', text: "Accident insurance"
+    expect(page).to have_link "Numerical Sort"
+    expect(page).to have_selector '.sort_options .active', text: "A-Z Sort"
+    
+    
+  end
+end

data/spec/features/record_view_spec.rb

@@ -37,4 +37,13 @@ describe "Record View" do
     expect(page.driver.status_code).to eq 404
     expect(page).to have_content "The page you were looking for doesn't exist." 
   end
+  
+  describe "Tools" do
+    it "should have a refworks link" do
+      visit catalog_path('2008305903')
+      expect(page).to have_link "Export to Refworks"
+      link = find_link("Export to Refworks")
+      expect(link['href']).to include CGI.escape(catalog_path('2008305903', format: :refworks_marc_txt))
+    end
+  end
 end

data/spec/lib/blacklight/solr_response/facets_spec.rb

@@ -7,8 +7,8 @@ describe Blacklight::SolrResponse::Facets do
       subject { Blacklight::SolrResponse::Facets::FacetField.new "my_field", [] }
 
       its(:name) { should eq "my_field" }
-      its(:limit) { should eq nil }
-      its(:sort) { should eq 'index' }
+      its(:limit) { should eq 100 }
+      its(:sort) { should eq 'count' }
       its(:offset) { should eq 0 }
     end
 
@@ -40,8 +40,8 @@ describe Blacklight::SolrResponse::Facets do
         expect(subject.facet_by_field_name('my_field').limit).to eq 15
       end
 
-      it "should be nil if no value is found" do
-        expect(subject.facet_by_field_name('my_field').limit).to be_nil
+      it "should be the solr default limit if no value is found" do
+        expect(subject.facet_by_field_name('my_field').limit).to eq 100
       end
     end
 
@@ -74,9 +74,14 @@ describe Blacklight::SolrResponse::Facets do
         expect(subject.facet_by_field_name('my_field').sort).to eq 'alpha'
       end
 
-      it "should default to index if no value is found" do
+      it "should default to count if no value is found and the default limit is used" do
+        expect(subject.facet_by_field_name('my_field').sort).to eq 'count'
+      end
+      
+      it "should default to index if no value is found and the limit is unlimited" do
+        request_params['facet.limit'] = -1
         expect(subject.facet_by_field_name('my_field').sort).to eq 'index'
       end
     end
   end
-end
+end

data/spec/support/features/session_helpers.rb

@@ -16,7 +16,14 @@ module Features
       visit new_user_session_path
       fill_in("user_email", :with => email) 
       fill_in("user_password", :with => "password") 
-      click_button("Sign in")
+      
+      if has_button? "Sign in"
+        click_button("Sign in")
+      elsif has_button? "Log in"
+        click_button("Log in")
+      else
+        raise "Unable to find sign in button"
+      end
     end
   end
 end

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "_user_util_links" do
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  it "should render the correct bookmark count" do
+    count = rand(99)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:render_bookmarks_control?).and_return true
+    allow(view).to receive(:has_user_authentication_provider?). and_return false
+    allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)  
+    render :partial => "user_util_links"
+    expect(rendered).to have_selector('#bookmarks_nav span[data-role=bookmark-counter]', text: "#{count}")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -392,9 +392,6 @@ files:
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.gemfile
 - lib/blacklight.rb
 - lib/blacklight/base.rb
 - lib/blacklight/catalog.rb
@@ -513,6 +510,7 @@ files:
 - spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/views/_user_util_links.html.erb_spec.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -555,7 +553,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -621,6 +619,7 @@ test_files:
 - spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/views/_user_util_links.html.erb_spec.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb

data/gemfiles/rails3.gemfile

@@ -1,9 +0,0 @@
-source 'http://rubygems.org'
-
-file = File.expand_path("../../Gemfile", __FILE__)
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
-end
-
-gem 'rails', "3.2.19"

data/gemfiles/rails4.1.gemfile

@@ -1,12 +0,0 @@
-source 'http://rubygems.org'
-
-file = File.expand_path("../../Gemfile", __FILE__)
-
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
-end
-gem 'sass', '~> 3.2.15'
-gem 'sprockets', '~> 2.11.0'
-
-gem 'rails', '4.1.4'

data/gemfiles/rails4.gemfile

@@ -1,13 +0,0 @@
-source 'http://rubygems.org'
-
-file = File.expand_path("../../Gemfile", __FILE__)
-
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
-end
-
-gem 'sass', '~> 3.2.15'
-gem 'sprockets', '~> 2.11.0'
-
-gem 'rails', '4.0.8'