active-fedora 6.6.0.rc3 → 6.6.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b35e64f462528b26276ef2a730c8f03b80a24658
-  data.tar.gz: 616b6f3a7ac2297f197bf6792bb76d0055aaa377
+  metadata.gz: b91704416bcc480154725e95946c40f9be9c459b
+  data.tar.gz: 71b13aaf17f894796c68bd314933e2ae4f6c4708
 SHA512:
-  metadata.gz: de1f89551de40f7d43ad138efc174a5428f03561f2ddcf1b475dfdae96abf4e55f2bb6e510f091c7567cb33162d02c5a674ad2540b4bf97a693077a4fbfde68e
-  data.tar.gz: cf48aec03e4bb5502823a1537128aa827c503bc06f4a2d945275d099d6ff40dac82c0257abe1a16a191d2b4876054d1269e61018e6cdd4f9624843bdd4e8232d
+  metadata.gz: decd34709952404b85375d8c87aac27a8054e61d5a2b9c0d5c600aa53d1c8f7eda7c6693fb9a64ef44b34229a602a1e797fb342f6afae0a398dd65e6c69b37b5
+  data.tar.gz: a59b2fbf7e2023e6bbc321428202816d0d3f85798814d86351a1e0819f3cfbffff88a10db2db61a9cd7002f9ee5448816fb4ad88160768759dcb81fe730df71b

data/History.txt

@@ -1,7 +1,7 @@
-v6.6.0 (rc3)
+v6.6.0 (rc4)
+Fix deprecation warning when loading a has_many association [Justin Coyne]
 Explicitly set cast to false on reload to avoid deprecation warnings [Justin Coyne]
-Cast relationship results if class is ActiveFedora::Base [Justin
-Coyne]
+Cast relationship results if class is ActiveFedora::Base [Justin Coyne]
 * Need to put changes for rc1 here* 
 
 v6.5.1 (2013-09-10)

data/lib/active_fedora/solr_service.rb

@@ -46,9 +46,12 @@ module ActiveFedora
     end
 
     def self.reify_solr_result(hit, opts = {})
-      classname = class_from_solr_document(hit)
-      method = opts[:load_from_solr] ? :load_instance_from_solr : :find
-      classname.send(method, hit[SOLR_DOCUMENT_ID])
+      klass = class_from_solr_document(hit)
+      if opts[:load_from_solr]
+        klass.load_instance_from_solr(hit[SOLR_DOCUMENT_ID])
+      else
+        klass.find(hit[SOLR_DOCUMENT_ID], cast: true)
+      end
     end
   
     def self.class_from_solr_document(hit, opts = {})

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0.rc3"
+  VERSION = "6.6.0.rc4"
 end

data/spec/unit/solr_service_spec.rb

@@ -51,9 +51,9 @@ describe ActiveFedora::SolrService do
     end
     describe ".reify_solr_results" do
       it "should use AudioRecord.find to instantiate objects" do
-        AudioRecord.should_receive(:find).with("my:_PID1_")
-        AudioRecord.should_receive(:find).with("my:_PID2_")
-        AudioRecord.should_receive(:find).with("my:_PID3_")
+        AudioRecord.should_receive(:find).with("my:_PID1_", cast: true)
+        AudioRecord.should_receive(:find).with("my:_PID2_", cast: true)
+        AudioRecord.should_receive(:find).with("my:_PID3_", cast: true)
         ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits)
       end
       it "should use AudioRecord.load_instance_from_solr when called with :load_from_solr option" do
@@ -65,9 +65,9 @@ describe ActiveFedora::SolrService do
     end
     describe ".lazy_reify_solr_results" do
       it "should lazily reify solr results" do
-        AudioRecord.should_receive(:find).with("my:_PID1_")
-        AudioRecord.should_receive(:find).with("my:_PID2_")
-        AudioRecord.should_receive(:find).with("my:_PID3_")
+        AudioRecord.should_receive(:find).with("my:_PID1_", cast: true)
+        AudioRecord.should_receive(:find).with("my:_PID2_", cast: true)
+        AudioRecord.should_receive(:find).with("my:_PID3_", cast: true)
         ActiveFedora::SolrService.lazy_reify_solr_results(@sample_solr_hits).each {|r| r}
       end
       it "should use AudioRecord.load_instance_from_solr when called with :load_from_solr option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.6.0.rc3
+  version: 6.6.0.rc4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr