blacklight 6.7.0 → 6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9d1db7c5b929bb935e9ce41c06af1c4707856c
-  data.tar.gz: 328b4f96a2f73164e0ee3a8b298157ee4025e9ad
+  metadata.gz: 7017f77770714ea07e09285f82825f8e96bb0df4
+  data.tar.gz: 11bbf9de777e8474b4e68a7b76cdd32ef1fe1f8f
 SHA512:
-  metadata.gz: 0690cbe4599e64337bbb09a07c9125b6828ee4734ec2f1d38311dbe178d519df9c8bed4fad85c2276d957d8c74d3089a46579c69e864501b41fe6066adba0fef
-  data.tar.gz: 9a11b1e9ebe49ae02dfb2395e94cd696a38949e4632dd204d4361254bb41d6f0cd5b90117cdae41434862d174daca5ca33fcaf5bb1d60b01a54105141a31fa21
+  metadata.gz: 804aaba34b735e0c33aac3e5972d0ec9d2c1768ce8e830e08ecf55231955c8c45e2e8de37c12c529e8595b868fb87bd7756aabb9ffa900bc8b1d4114c24612a7
+  data.tar.gz: 3ce45061d77dd9daf9ca1fe673eee5da7b423aa6b79fd25987251c2ae9c6b0cb3dd857f7f3d7fae0f678fabc48e55cb296007e25d81b83a82d2f7b6b248814f0

data/VERSION

@@ -1 +1 @@
-6.7.0
+6.7.1

data/app/models/concerns/blacklight/document.rb

@@ -44,7 +44,12 @@ module Blacklight::Document
   delegate :[], :key?, :keys, :to_h, to: :_source
 
   def initialize(source_doc={}, response=nil)
-    @_source = ActiveSupport::HashWithIndifferentAccess.new(source_doc)
+    @_source = if source_doc.respond_to?(:to_hash)
+                 ActiveSupport::HashWithIndifferentAccess.new(source_doc)
+               else
+                 Deprecation.warn(Blacklight::Document, "Blacklight::Document#initialize expects a hash-like object, received #{source_doc.class}.")
+                 ActiveSupport::HashWithIndifferentAccess.new(source_doc.to_h)
+               end
     @response = response
     apply_extensions
   end

data/spec/models/blacklight/document_spec.rb

@@ -2,10 +2,23 @@
 
 describe Blacklight::Document do
   let(:data) { {} }
-  subject do
+  let(:test_class) do
     Class.new do
       include Blacklight::Document
-    end.new(data)
+    end
+  end
+
+  subject { test_class.new(data) }
+
+  describe '.new' do
+    it 'accepts a hash' do
+      expect(test_class.new(id: 1)[:id]).to eq 1
+    end
+
+    it 'accepts a SolrDocument' do
+      expect(Deprecation).to receive(:warn)
+      expect(test_class.new(test_class.new(id: 1))[:id]).to eq 1
+    end
   end
 
   describe "#has?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.7.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails