blacklight 5.8.1 → 5.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9651eef53cd449f3bb428731943e8759b52af1
-  data.tar.gz: 4db418373c1ea6262414f5442c816bd9c0a46d36
+  metadata.gz: a3d10313f3002a4317d920835752d25639bf963a
+  data.tar.gz: 13ab0a0e6cdf3deaab7add1b8f0b4247b340b3c1
 SHA512:
-  metadata.gz: 2505780053f2cc34f8285d3589e82b18ca5bef37a8f0242fea877c14d2f858260e4fe8029b97b1fd4bfcb70042b049f12bc08247b94527dc1812be2c8e184ca4
-  data.tar.gz: 91578686f80295bc9e9a93e543b00ccf9cba18434ab18f5066ec79cdd911d8872220b275391bc9b67d441d12fd53c49e064803581f2a8bd2bbbaf46c2b2a2721
+  metadata.gz: 32b593b6bfd432d4fe5fafdbd93d9269f9f63371c963869a086e8914aeb07771996f9660a80208379e6269195a015d8d3d1b0e78d18edcd168ad74d1fa7ab585
+  data.tar.gz: 9632e817084e378269456a84e930ecf0f1fbc95e12b62eb89d277b03fafd8c5b390af304d5409abf85b259284dc096485a25b085dd897a36badfc52076172231

data/.travis.yml

@@ -1,3 +1,7 @@
+language: ruby
+cache: bundler
+sudo: false
+
 notifications:
   email: false
 
@@ -15,14 +19,16 @@ matrix:
     - rvm: jruby
       env: "RAILS_VERSION=4.1.8 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
     - rvm: 2.1.4
-      env: "RAILS_VERSION=4.2.0.rc3"
+      env: "RAILS_VERSION=4.1.8"
+    - rvm: 2.2.0
+      env: "RAILS_VERSION=4.2.0"
 
 before_install:
   - gem install bundler
 
 env:
  - "RAILS_VERSION=3.2.21"
- - "RAILS_VERSION=4.1.8"
+ - "RAILS_VERSION=4.2.0"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/VERSION

@@ -1 +1 @@
-5.8.1
+5.8.2

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

@@ -21,7 +21,7 @@
     </div>
 
     <% @documents.each do |doc| %>
-      <%=hidden_field_tag "id[]", doc.get(:id)%>
+      <%=hidden_field_tag "id[]", doc.id %>
     <% end %>
     <%- if params[:sort] -%>
       <%= hidden_field_tag "sort", params[:sort] %>

data/app/views/catalog/index.rss.builder

@@ -4,7 +4,7 @@ xml.rss(:version=>"2.0") {
   xml.channel {
           
     xml.title(t('blacklight.search.title', :application_name => application_name))
-    xml.link(catalog_index_url(params))
+    xml.link(search_action_url(params))
     xml.description(t('blacklight.search.title', :application_name => application_name))
     xml.language('en-us')
     @document_list.each do |doc|

data/lib/blacklight/controller.rb

@@ -40,14 +40,15 @@ module Blacklight::Controller
   def blacklight_config
     default_catalog_controller.blacklight_config
   end
-   
+
     protected
 
     # Default route to the search action (used e.g. in global partials). Override this method
     # in a controller or in your ApplicationController to introduce custom logic for choosing
     # which action the search form should use
-    def search_action_url *args
-      catalog_index_url *args
+    def search_action_url options = {}
+      # Rails 4.2 deprecated url helpers accepting string keys for 'controller' or 'action'
+      catalog_index_url(options.except(:controller, :action))
     end
 
     def search_action_path *args

data/lib/blacklight/solr/document/email.rb

@@ -8,7 +8,7 @@ module Blacklight::Solr::Document::Email
     body = []
     body << I18n.t('blacklight.email.text.title', :value => semantics[:title].join(" ")) unless semantics[:title].blank?
     body << I18n.t('blacklight.email.text.author', :value => semantics[:author].join(" ")) unless semantics[:author].blank?
-    body << I18n.t('blacklight.email.text.title', :value => semantics[:title].join(" ")) unless semantics[:title].blank?
+    body << I18n.t('blacklight.email.text.format', :value => semantics[:format].join(" ")) unless semantics[:format].blank?
     body << I18n.t('blacklight.email.text.language', :value => semantics[:language].join(" ")) unless semantics[:language].blank?
     return body.join("\n") unless body.empty?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.8.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -271,17 +271,17 @@ files:
 - app/assets/javascripts/blacklight/collapsable.js
 - app/assets/javascripts/blacklight/core.js
 - app/assets/javascripts/blacklight/search_context.js
-- app/assets/stylesheets/blacklight/_blacklight_base.css.scss
-- app/assets/stylesheets/blacklight/_bookmark.css.scss
-- app/assets/stylesheets/blacklight/_catalog.css.scss
-- app/assets/stylesheets/blacklight/_facets.css.scss
-- app/assets/stylesheets/blacklight/_group.css.scss
-- app/assets/stylesheets/blacklight/_header.css.scss
-- app/assets/stylesheets/blacklight/_layout.css.scss
-- app/assets/stylesheets/blacklight/_modal.css.scss
-- app/assets/stylesheets/blacklight/_search_history.css.scss
-- app/assets/stylesheets/blacklight/blacklight.css.scss
-- app/assets/stylesheets/blacklight/blacklight_defaults.css.scss
+- app/assets/stylesheets/blacklight/_blacklight_base.scss
+- app/assets/stylesheets/blacklight/_bookmark.scss
+- app/assets/stylesheets/blacklight/_catalog.scss
+- app/assets/stylesheets/blacklight/_facets.scss
+- app/assets/stylesheets/blacklight/_group.scss
+- app/assets/stylesheets/blacklight/_header.scss
+- app/assets/stylesheets/blacklight/_layout.scss
+- app/assets/stylesheets/blacklight/_modal.scss
+- app/assets/stylesheets/blacklight/_search_history.scss
+- app/assets/stylesheets/blacklight/blacklight.scss
+- app/assets/stylesheets/blacklight/blacklight_defaults.scss
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
 - app/controllers/saved_searches_controller.rb