active-fedora 6.6.0.rc1 → 6.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964d99013806f9b52b6b916d277df38d6dbea927
-  data.tar.gz: 10f8ff33c035ecccb052c23d2c77166f8f605240
+  metadata.gz: e34459d1ad716b37cd7174ec1312abe1ca33cd87
+  data.tar.gz: 85f71b569ee2010337e1733092c982b4b4021809
 SHA512:
-  metadata.gz: 07707c2080d608e9ed4a3ecadf8e88f64ff4a0867bc8b79f1a63d92383d21152fc67b16c8db191d8987697fd516d99aed3b8d7c8d205ea1caeb6cf017d0bea8e
-  data.tar.gz: aae37c986f98847630f0f9e98d3f8a52fee97a7cc2ab725983478d1d1b3e0e05630e8507528c7986fdfbde7ad84a2f44feffb0b6c5b8cb8d17194886598fcf69
+  metadata.gz: 535fc44e507b82bfcd884033bf95e40df1207b484540eb952c7f1a7163545819a4f6afcfc47636ca6f98865c59ee6441517031d22f25d7fb552a0094af7f8643
+  data.tar.gz: d34bcfcd2d6326a34726337ab744ee284c4ae8dbce9750a9cf1be370ca16a0e7793dc80aef87aecd687ce1fba9e326ef3a1ddb09197a7766d55cd434f0674a1b

data/History.txt

@@ -1,5 +1,10 @@
+v6.6.0 (rc2)
+2013-10-02: Cast relationship results if class is ActiveFedora::Base [Justin
+Coyne]
+
 v6.5.1 (2013-09-10)
 
+
 ActiveFedora::Predicates.set_predicates allows you to set predicates
 without wiping out existing configs [Matt Zumwalt]
 

data/lib/active_fedora/querying.rb

@@ -60,9 +60,10 @@ module ActiveFedora
     # @param [Hash] opts 
     # @option opts [Boolean] :cast when true, examine the model and cast it to the first known cModel
     def find_each( conditions={}, opts={})
+      cast = opts.delete(:cast)
       find_in_batches(conditions, opts.merge({:fl=>SOLR_DOCUMENT_ID})) do |group|
         group.each do |hit|
-          yield(find_one(hit[SOLR_DOCUMENT_ID], opts[:cast]))
+          yield(find_one(hit[SOLR_DOCUMENT_ID], cast))
         end
       end
     end

data/lib/active_fedora/relation.rb

@@ -162,7 +162,7 @@ module ActiveFedora
 
     def to_a
       return @records if loaded?
-      args = {} #:cast=>true}
+      args = @klass == ActiveFedora::Base ? {:cast=>true} : {}
       args[:rows] = @limit_value if @limit_value
       args[:sort] = @order_values if @order_values
       

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0.rc1"
+  VERSION = "6.6.0.rc2"
 end

data/spec/unit/query_spec.rb

@@ -49,8 +49,8 @@ describe ActiveFedora::Base do
         end
         describe "called without a specific class" do
           it "should specify a q parameter" do
-            ActiveFedora::Base.should_receive(:find_one).with("changeme:30", nil).and_return("Fake Object1")
-            ActiveFedora::Base.should_receive(:find_one).with("changeme:22", nil).and_return("Fake Object2")
+            ActiveFedora::Base.should_receive(:find_one).with("changeme:30", true).and_return("Fake Object1")
+            ActiveFedora::Base.should_receive(:find_one).with("changeme:22", true).and_return("Fake Object2")
             mock_docs = [{"id" => "changeme:30"},{"id" => "changeme:22"}]
             mock_docs.should_receive(:has_next?).and_return(false)
             ActiveFedora::SolrService.instance.conn.should_receive(:paginate).with(1, 1000, 'select', :params=>{:q=>'*:*', :qt => 'standard', :sort => [@sort_query], :fl=> 'id', }).and_return('response'=>{'docs'=>mock_docs})

metadata

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