blacklight 5.4.0.rc1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540546b2abe3b14b82ac1bf0bc9c079db212a291
-  data.tar.gz: 7fa2ffa45e80e88b3d02a744124b94be1f7b64a5
+  metadata.gz: 8c37c9845bc5cd732386ab0fc43bbf2935022e25
+  data.tar.gz: f8aebbe56c4b6f9f7120d1e9901896da3dc0b71f
 SHA512:
-  metadata.gz: a06c30a6d5e7b2bb8686ed8f80a8bad01e237b9bf52d6af2fb63c546c15a631e4b8f77c033afffcd231499101d404369d8eda26c2ed58f18f02b8e490c4884d4
-  data.tar.gz: b47793969ac19bd39fc851cd1ade641be5b97c84ecc2bdbc34a0412ca628150833c2d50dda1f093ba4e8d331543c46fb5ca6e5b5d5978a38d79610177b5ce26a
+  metadata.gz: 5318ae2e9e5507c0afd82e057eeef478df545c8f17c2ba817ba0e216a455222392ab1a093ceca2d2223ac51d8be18386ec4b453693f1e4c2016ede24fdaea6a6
+  data.tar.gz: c4969efe9347576951e642bd6f9506624ea35a03eaf5dbf14fd1d428c9760de80481e3fc97d6fc0e5cc2dca4a0f22cb2e57f7566714e037340ee504cd19cb1c6

data/VERSION

@@ -1 +1 @@
-5.4.0.rc1
+5.4.0

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -125,7 +125,7 @@ module Blacklight::FacetsHelperBehavior
   # @return [String]
   def render_facet_count(num, options = {})
     classes = (options[:classes] || []) << "facet-count"
-    content_tag("span", t('blacklight.search.facets.count', :number => num), :class => classes)
+    content_tag("span", t('blacklight.search.facets.count', :number => number_with_delimiter(num)), :class => classes)
   end
   
   ##

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -266,7 +266,7 @@ module Blacklight::UrlHelperBehavior
   # user's bookmarks in 'refworks marc txt' format -- we tell refworks
   # to expect that format. 
   def bookmarks_export_url(format, params = {})
-    bookmarks_url(params.merge(format: :format, encrypted_user_id: encrypt_user_id(current_or_guest_user.id) ))
+    bookmarks_url(params.merge(format: format, encrypted_user_id: encrypt_user_id(current_or_guest_user.id) ))
   end
   
   # This method should move to BlacklightMarc in Blacklight 6.x

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

@@ -3,7 +3,7 @@
   <span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
 <div id="per_page-dropdown" class="btn-group">
   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><%= link_to(t(:'blacklight.search.per_page.button_label', :count => current_per_page), "#") %> <span class="caret"></span></button>
-  <ul class="dropdown-menu">
+  <ul class="dropdown-menu" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>
       <li><%= link_to(label, url_for(params_for_search(:per_page => count))) %></li>
     <%- end -%>

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

@@ -4,7 +4,7 @@
       <%= link_to(t('blacklight.search.sort.label', :field =>current_sort_field.label), "#") %> <span class="caret"></span>
   </button>
 
-  <ul class="dropdown-menu">
+  <ul class="dropdown-menu" role="menu">
       <%- 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 -%>

data/lib/generators/blacklight/models_generator.rb

@@ -40,15 +40,13 @@ This generator makes the following changes to your application:
         generate "devise_guests", model_name.classify
 
         # add the #to_s to the model.
-        insert_into_file("app/models/#{model_name}.rb", :before => /end(\n| )*$/) do
-          %{
-            # Method added by Blacklight; Blacklight uses #to_s on your
-            # user class to get a user-displayable login/identifier for
-            # the account.
-            def to_s
-              email
-            end
-          }
+        insert_into_file("app/models/#{model_name}.rb", before: /end(\n| )*$/) do
+          "\n  # Method added by Blacklight; Blacklight uses #to_s on your\n" +
+          "  # user class to get a user-displayable login/identifier for\n" +
+          "  # the account.\n" +
+          "  def to_s\n" +
+          "    email\n" +
+          "  end\n"
         end
         gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
       end

data/spec/helpers/url_helper_spec.rb

@@ -424,4 +424,12 @@ describe BlacklightUrlHelper do
       expect(added_facet_params_from_facet_action).to eq added_facet_params.except(Blacklight::Solr::FacetPaginator.request_keys[:page], Blacklight::Solr::FacetPaginator.request_keys[:sort])     
     end
   end
+  
+  describe "#bookmarks_export_url" do
+    it "should be the bookmark url with an encrypted user token" do
+      helper.stub(encrypt_user_id: 'xyz', current_or_guest_user: double(id: 123))
+      url = helper.bookmarks_export_url(:html)
+      expect(url).to eq helper.bookmarks_url(format: :html, encrypted_user_id: 'xyz')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc1
+  version: 5.4.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -521,9 +521,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2