blacklight 5.9.0 → 5.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fedd8110404760fccc7f451d8c48086a291ee6b5
-  data.tar.gz: 7576a604fa84a87d1c09b4cbede4715eaf28adf8
+  metadata.gz: 6fbed68275361c9a4e94bf4c2c435ac7883869bb
+  data.tar.gz: 03843ab60ef311245df30f2e261a912c05d52251
 SHA512:
-  metadata.gz: b3fba026879c4a1f690d2998581eec9e89f4cdf9e93d5785b1d23270a2fd67a5e6792122df90c49fb7be802c50ee6a5449f2377a6523c26643ed2c4021d1f963
-  data.tar.gz: 1206489a87d12d763df09ca14b0490860530983b754d3c7c6523f90e7abd5bcf015d3d5fc0384ff638df63e944b15b172d235dc14f2279a058f6b08287b51e09
+  metadata.gz: 904db4c831d484e6bc2693a7a10e79f2a2d66d37228d7dd20310d3c00a1eb87e10ca8eddc7766f51d2affbd3b8ad287dc9d6f3a0517b11eee0d4dc5589b7af53
+  data.tar.gz: 55a043a1eb3c7820d2ceaf5209e834c114034639ed1c8b80030856a4b96f131c7086e562fca3f8309b419146439b0828cacb099dba19fa562e732dffec93be3a

data/VERSION

@@ -1 +1 @@
-5.9.0
+5.9.1

data/lib/blacklight/solr/document.rb

@@ -175,9 +175,9 @@ module Blacklight::Solr::Document
     def unique_key
       @unique_key ||= 'id' 
     end
-    
+
     def primary_key
-      'id'
+      unique_key
     end
     
     def base_class

data/spec/lib/blacklight/solr/document_spec.rb

@@ -47,6 +47,18 @@ describe "Blacklight::Solr::Document" do
 
     end
 
+    describe "Primary key" do
+      before(:each) do
+        MockDocument.unique_key = 'my_unique_key'
+      end
+      after(:each) do
+        MockDocument.unique_key = 'id'
+      end
+      it "should be the same as the unique key" do
+        expect(MockDocument.primary_key).to eq MockDocument.unique_key
+      end
+    end
+
     describe "#to_param" do
       it "should be a string" do
         @document = MockDocument.new :id => 1234

data/template.demo.rb

@@ -1,4 +1,5 @@
 gem "blacklight", ">= 5.3.0"
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 
 run "bundle install"
 
@@ -16,4 +17,4 @@ if options =~ /jettywrapper/
   rake "jetty:start"
   rake "blacklight:solr:seed"
   rake "jetty:stop"
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.9.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails