blacklight 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2802ea5dc5949b20ebc3b5c5e2366d61946d7715
-  data.tar.gz: adadf86841b374b3715c107107837311a321ba2a
+  metadata.gz: ec40efd384aeece9251a5a0c48ade57523ea6ce5
+  data.tar.gz: a44796b19ca9c6194f9443049e763faaf20c6620
 SHA512:
-  metadata.gz: f4751dfa6d0dca7e851681d115cd16c0f843e2336b077dd83b0a7c96396776f2558396ac98e7df3f27abc5ec6afb742af25b5136624b0fe32d5c81c7351929e2
-  data.tar.gz: 7a88648e6077a5da60640e8b819daad72784ecb893cea39698ec80e7195cf247b26b573f721cdc838c857eef60d265c74bdd36fe655dc856a8d0bd25470dd09c
+  metadata.gz: 886748c96a35a2946a512c12394c280b96a98f49e245f297c32edd743714d2e9ae8584a7337e1dc4c2d1236d2050c69b8526bcaf040432b8fac863dd003d8146
+  data.tar.gz: a6f1abdc691dacd50af6b2387ee588a4c39ad357c3034a2c92ec0ad9dd12c7954a10a31036c6fe4d717ea9724339fef72167084d0627406b5e79b9ec62289455

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.0.1

data/app/controllers/concerns/blacklight/saved_searches.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+module Blacklight
+  module SavedSearches
+    extend ActiveSupport::Concern
+    include Blacklight::Configurable
+
+    included do
+      copy_blacklight_config_from(CatalogController)
+      before_action :require_user_authentication_provider
+      before_action :verify_user
+    end
+
+    def index
+      @searches = current_user.searches
+    end
+
+    def save
+      current_user.searches << searches_from_history.find(params[:id])
+      if current_user.save
+        flash[:notice] = I18n.t('blacklight.saved_searches.add.success')
+      else
+        flash[:error] = I18n.t('blacklight.saved_searches.add.failure')
+      end
+      if respond_to? :redirect_back
+        redirect_back fallback_location: blacklight.saved_searches_path
+      else
+        # Deprecated in Rails 5.0
+        redirect_to :back
+      end
+    end
+
+    # Only dereferences the user rather than removing the item in case it
+    # is in the session[:history]
+    def forget
+      if search = current_user.searches.find(params[:id])
+        search.user_id = nil
+        search.save
+
+        flash[:notice] =I18n.t('blacklight.saved_searches.remove.success')
+      else
+        flash[:error] = I18n.t('blacklight.saved_searches.remove.failure')
+      end
+      if respond_to? :redirect_back
+        redirect_back fallback_location: blacklight.saved_searches_path
+      else
+        # Deprecated in Rails 5.0
+        redirect_to :back
+      end
+    end
+
+    # Only dereferences the user rather than removing the items in case they
+    # are in the session[:history]
+    def clear
+      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')
+      end
+      redirect_to blacklight.saved_searches_url
+    end
+
+    protected
+
+      def verify_user
+        flash[:notice] = I18n.t('blacklight.saved_searches.need_login') and raise Blacklight::Exceptions::AccessDenied unless current_user
+      end
+  end
+end

data/app/controllers/saved_searches_controller.rb

@@ -1,63 +1,4 @@
 # frozen_string_literal: true
 class SavedSearchesController < ApplicationController
-  include Blacklight::Configurable
-
-  copy_blacklight_config_from(CatalogController)
-  before_action :require_user_authentication_provider
-  before_action :verify_user
-
-  def index
-    @searches = current_user.searches
-  end
-
-  def save
-    current_user.searches << searches_from_history.find(params[:id])
-    if current_user.save
-      flash[:notice] = I18n.t('blacklight.saved_searches.add.success')
-    else
-      flash[:error] = I18n.t('blacklight.saved_searches.add.failure')
-    end
-    if respond_to? :redirect_back
-      redirect_back fallback_location: blacklight.saved_searches_path
-    else
-      # Deprecated in Rails 5.0
-      redirect_to :back
-    end
-  end
-
-  # Only dereferences the user rather than removing the item in case it
-  # is in the session[:history]
-  def forget
-    if search = current_user.searches.find(params[:id])
-      search.user_id = nil
-      search.save
-
-      flash[:notice] =I18n.t('blacklight.saved_searches.remove.success')
-    else
-      flash[:error] = I18n.t('blacklight.saved_searches.remove.failure')
-    end
-    if respond_to? :redirect_back
-      redirect_back fallback_location: blacklight.saved_searches_path
-    else
-      # Deprecated in Rails 5.0
-      redirect_to :back
-    end
-  end
-
-  # Only dereferences the user rather than removing the items in case they
-  # are in the session[:history]
-  def clear
-    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')
-    end
-    redirect_to blacklight.saved_searches_url
-  end
-
-  protected
-
-  def verify_user
-    flash[:notice] = I18n.t('blacklight.saved_searches.need_login') and raise Blacklight::Exceptions::AccessDenied unless current_user
-  end
+  include Blacklight::SavedSearches
 end

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

@@ -10,13 +10,13 @@
       <span class="icon-bar"></span>
     </button>
 
-  <h2 class='facets-heading'>
-  	<%= t('blacklight.search.facets.title') %>
-  </h2>
-    </div>
+    <h2 class='facets-heading'>
+      <%= t('blacklight.search.facets.title') %>
+    </h2>
+  </div>
 
   <div id="facet-panel-collapse" class="collapse panel-group">
-  <%= render_facet_partials %>
+    <%= render_facet_partials %>
+  </div>
 </div>
-</div>
-<% end %>
+<% end %>

data/lib/generators/blacklight/install_generator.rb

@@ -98,7 +98,8 @@ EOF
 
     def generate_blacklight_marc_demo
       if options[:marc]
-        gem "blacklight-marc", "~> 5.0"
+        blacklight_marc = String.new('blacklight-marc')
+        gem blacklight_marc, '~> 6.0'
 
         Bundler.with_clean_env do
           run "bundle install"

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -23,7 +23,7 @@ class TestAppGenerator < Rails::Generators::Base
       run "bundle install"
     end
 
-    generate 'blacklight:install', '--devise --jettywrapper'
+    generate 'blacklight:install', '--devise --marc --jettywrapper'
   end
 
   def run_test_support_generator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -310,6 +310,7 @@ files:
 - app/controllers/concerns/blacklight/default_component_configuration.rb
 - app/controllers/concerns/blacklight/facet.rb
 - app/controllers/concerns/blacklight/request_builders.rb
+- app/controllers/concerns/blacklight/saved_searches.rb
 - app/controllers/concerns/blacklight/search_context.rb
 - app/controllers/concerns/blacklight/search_fields.rb
 - app/controllers/concerns/blacklight/search_helper.rb