blacklight 5.9.2 → 5.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa54bd985624be72c4d598e49b1c3cc9ac6e5da6
-  data.tar.gz: d50f42354e114da71d7f33e9f5d772314831a644
+  metadata.gz: 2ea3fda913edc204db8dbc3b5a06ced2862324ad
+  data.tar.gz: 0b1b41f89ccdfcd3dcd1b88857ccb0919a29afd9
 SHA512:
-  metadata.gz: 19bbfbe1307baed32d2e732b4dc8acbbefe3b567f91302b5b9df40864334e4c1affe87569ea44195e424b62dac14b6450eed5d856ba58b2d0c2c8ba908c73d7a
-  data.tar.gz: 326d4bb0884bcf4bd3fba974ef37891f4e21493639aa650d4ba41d4c95a296f236a993ef83d77b161ffe55180347d93bf07eb5ac98cca048115439e1fdb4af96
+  metadata.gz: 57fbc7119ffaa221ff7e562ba6e1e27d0e4a8c10a44e1bde8ee95164cebd6f5ad40b5054466035aae35faf2f49da9f88f53c6dbc60e0d486f3abea5910b63479
+  data.tar.gz: 29737da492197e076a19f36c103ae9277ea2bd063d036041b10ee1a6aae10589136a0243113c92a7716d929da51d59d5eb7f1e7438833336f1b45ee54161e1e0

data/VERSION

@@ -1 +1 @@
-5.9.2
+5.9.3

data/lib/blacklight/configuration.rb

@@ -252,8 +252,16 @@ module Blacklight
       end
       alias_method :inheritable_copy, :deep_copy
     else
-      alias_method :deep_copy, :deep_dup
-      alias_method :inheritable_copy, :deep_dup
+      ##
+      # Rails 4.x provides `#deep_dup`, but it aggressively `#dup`'s class names
+      # too. These model names should not be `#dup`'ed or we might break ActiveModel::Naming.
+      def deep_copy
+        deep_dup.tap do |copy|
+          copy.solr_response_model = self.solr_response_model
+          copy.solr_document_model = self.solr_document_model
+        end
+      end
+      alias_method :inheritable_copy, :deep_copy
     end
 
     ##

data/lib/blacklight/routes.rb

@@ -66,7 +66,10 @@ module Blacklight
           get "bookmarks/sms", :as => "sms_bookmarks"
           post "bookmarks/sms"
           get "bookmarks/citation", :as => "citation_bookmarks"
-          resources :bookmarks
+
+          args = {}
+          args[:constraints] = options[:constraints] if options[:constraints]
+          resources :bookmarks, args
         end
       end
   

data/spec/lib/blacklight/configuration_spec.rb

@@ -84,6 +84,16 @@ describe "Blacklight::Configuration" do
       expect(@config.facet_fields).to_not include(@mock_facet)
     end
 
+    it "should not dup solr_response_model or solr_document_model" do
+      @config.solr_response_model = Blacklight::SolrResponse
+      @config.solr_document_model = SolrDocument
+
+      config_copy = @config.inheritable_copy
+
+      expect(config_copy.solr_response_model).to eq Blacklight::SolrResponse
+      expect(config_copy.solr_document_model).to eq SolrDocument
+    end
+
     it "should provide cloned copies of mutable data structures" do
       @config.a = { value: 1 }
       @config.b = [1,2,3]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.9.2
+  version: 5.9.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -576,7 +576,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)