blacklight 6.19.2 → 6.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29725d7ac098fe4dfcdadceabf7b03066f14c680a9af21afa54191d643e87e7a
-  data.tar.gz: e36bfb2a98c4eccdd1368f8a06a7a377e5fa5f1d3282a48384e31470148b3c50
+  metadata.gz: 469ca5ef4136d32bb5afe11a51dc7eeec97c6b0eded26f0e2d1a9c607fa175a1
+  data.tar.gz: 7061a8348a91417bffdacb4f7f508e3f1cba134d754ca1cbbe33743229e09e31
 SHA512:
-  metadata.gz: f00f3c5c21af357d7c695888835a92a7ca63ca361fdb670fee07254f69a444fca4bc6d7d0ccd396bb871346eabc6ef6015c82d4dbadd81c1a3e7ccb584f56545
-  data.tar.gz: 4f06db656530cb3b32364815ae24fff6c4ddcd8fe12373e08d6088b263025b9acb292c616ac45377ba43f96dbb6230875e98553fe4c7bd87b5f18f5819557a92
+  metadata.gz: 6427d562139eb605f5bd5e53d61a9f13abb2a1c35430fc20e21fc8e3a3035f8b7c6c2a9f8b72449db2a6478410a64cd1031ed7e17e42611ceb3be0ebe1b65fa9
+  data.tar.gz: c0a27859a10d9c1a97bc2f16794d000b407704146f543aec1acd77fe714626e4ce6cc8e2d93be9d7d066ddb4bccf2faaf84107d5dc9e9266f69c3fcb9bec8566

data/VERSION

@@ -1 +1 @@
-6.19.2
+6.20.0

data/config/routes.rb

@@ -7,7 +7,7 @@ Blacklight::Engine.routes.draw do
   put "saved_searches/save/:id",    :to => "saved_searches#save",    :as => "save_search"
   delete "saved_searches/forget/:id",  :to => "saved_searches#forget",  :as => "forget_search"
   post "saved_searches/forget/:id",  :to => "saved_searches#forget"
-  post "/catalog/:id/track", to: 'catalog#track', as: 'track_search_context'
+  post "/catalog/:id/track", to: 'catalog#track', as: 'track_search_context', constraints: { id: Blacklight::Engine.config.routes.identifier_constraint }
 
   resources :suggest, only: :index, defaults: { format: 'json' }
 end

data/lib/blacklight/engine.rb

@@ -7,7 +7,7 @@ module Blacklight
     require 'twitter-typeahead-rails'
 
     # BlacklightHelper is needed by all helpers, so we inject it
-    # into action view base here. 
+    # into action view base here.
     initializer 'blacklight.helpers' do |app|
       ActionView::Base.send :include, BlacklightHelper
     end
@@ -43,8 +43,12 @@ module Blacklight
       'Cricket' => 'mms.mycricket.com'
     }
 
+    config.routes = OpenStruct.new
+    # Set identifier_constraint to enforce a format for the document identifiers
+    config.routes.identifier_constraint = /[\w-]+/
+
     config.bookmarks_http_method = :post
-    
+
     config.email_regexp = defined?(Devise) ? Devise.email_regexp : /\A[^@\s]+@[^@\s]+\z/
   end
 end

data/spec/routing/catalog_routing_spec.rb

@@ -21,6 +21,22 @@ describe "Routing" do
     end
   end
 
+  describe 'tracking' do
+    context 'when the routing constraint is set to allow periods' do
+      before do
+        if Rails.version < '5.2.0'
+          skip 'requires https://github.com/rails/rails/pull/22435'
+        end
+        allow(Blacklight::Engine.config.routes).to receive(:identifier_constraint).and_return(%r{[^/]+})
+        Rails.application.reload_routes!
+      end
+
+      it 'routes to #track' do
+        expect(post('/catalog/gallica.bnf.fr/track')).to route_to('catalog#track', id: 'gallica.bnf.fr')
+      end
+    end
+  end
+
 
   describe "solr_document_path for SolrDocument", :test => true do
     it "routes correctly" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.19.2
+  version: 6.20.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails