active-fedora 6.6.0.pre1 → 6.6.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c819c53e6318b54de501b004a3a907dc223ca7f2
-  data.tar.gz: 9ee7ef31d8c30472b8aa37eacabb5f697bee0778
+  metadata.gz: b17884add8488a281ad74c3dc4642c959e771969
+  data.tar.gz: 77cc1824b8abd311a0abf9ccd8bfb513e3260fbe
 SHA512:
-  metadata.gz: c280347c12e3a7a13ef3b394b2c7df63bc83c49f8f5eee24a4e71565b6da615cb179a437efca408d9b3bef51987215332c5d29704394810f55ba93e2eb9a628a
-  data.tar.gz: 19dad27ff49953e76f6f19d7f599afe81d1df2b9badf7c849373474a44bacf903dd06352e438803652466a3c99914b65463f01753dd6952d21882a9531141b14
+  metadata.gz: 50b13f76fcca7a1a5331523849ab7a454800b8ba6d4af7c0da33e48706a981ea71a25a6a5b3158edd0bc3d7deb8875afdb7446dfdfe4378f3e4e6e6570d9f9f3
+  data.tar.gz: 0fe70f8ca9eacb61b274c84d33403e208228e955ebfd15e285f71d0901bcd5618f533048628d0c616af6da072535123101756b0a9ca034f6a939aac034e65d97

data/lib/active_fedora/querying.rb

@@ -111,9 +111,9 @@ module ActiveFedora
     # @example because the object hydra:dataset1 asserts it is a Dataset (hasModel info:fedora/afmodel:Dataset), return a Dataset object (not a Book).
     #   Book.find_one("hydra:dataset1") 
     def find_one(pid, cast=nil)
-      if cast.nil?
+      if self == ActiveFedora::Base && cast.nil?
         cast = false
-        Deprecation.warn(Querying, "find_one's cast parameter will default to true", caller)
+        Deprecation.warn(Querying, "find_one's cast parameter will default to true in ActiveFedora 7.0.0. If you want to maintain your existing behavior set `false' as the second parameter.", caller)
       end
       inner = DigitalObject.find(self, pid)
       af_base = self.allocate.init_with(inner)

data/lib/active_fedora/relation.rb

@@ -104,11 +104,12 @@ module ActiveFedora
       return to_a.find { |*block_args| yield(*block_args) } if block_given?
       options = args.extract_options!
 
-      # TODO is there any reason not to cast?
-      if !options.has_key?(:cast)
-        Deprecation.warn(Relation, "find's cast option will default to true", caller)
+      cast = if self == ActiveFedora::Base && !options.has_key?(:cast)
+        Deprecation.warn(Relation, "find's cast option will default to true in ActiveFedora 7.0.0.  To preserve existing behavior send parameter: `:cast=> false`", caller)
+        false
+      else 
+        options.delete(:cast)
       end
-      cast = options.delete(:cast)
       if options[:sort]
         # Deprecate sort sometime?
         sort = options.delete(:sort) 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0.pre1"
+  VERSION = "6.6.0.pre2"
 end

data/spec/integration/model_spec.rb

@@ -42,13 +42,20 @@ describe ActiveFedora::Model do
       subject { ActiveFedora::Base.find(@test_instance.pid, :cast=>true) }
       it { should be_instance_of ModelIntegrationSpec::Basic}
     end
-    describe "#find with a valid pid without cast" do
+    describe "#find with a valid pid without cast on Base" do
       subject { ActiveFedora::Base.find(@test_instance.pid) }
       before(:each) do
         Deprecation.should_receive(:warn).at_least(1).times
       end
       it { should be_instance_of ActiveFedora::Base}
     end
+    describe "#find with a valid pid without cast on a model extending Base" do
+      subject { ModelIntegrationSpec::Basic.find(@test_instance.pid) }
+      before(:each) do
+        Deprecation.should_not_receive(:warn)
+      end
+      it { should be_instance_of ModelIntegrationSpec::Basic}
+    end
   end
 
   describe "#load_instance_from_solr" do

data/spec/unit/query_spec.rb

@@ -16,11 +16,21 @@ describe ActiveFedora::Base do
   end
   
   describe '#find_one' do
-    it 'should notify of deprecation if no cast parameter is passed' do
-      Deprecation.should_receive(:warn).at_least(1).times
-      expect {
-        ActiveFedora::Base.find_one('_PID_')
-      }.to raise_error(ActiveFedora::ObjectNotFoundError)
+    describe "when called on AF::Base" do
+      it 'should notify of deprecation if no cast parameter is passed' do
+        Deprecation.should_receive(:warn).at_least(1).times
+        expect {
+          ActiveFedora::Base.find_one('_PID_')
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
+    describe "when called on a model extending AF::Base" do
+      it 'should not have a deprecation warning when no cast parameter is passed' do
+        Deprecation.should_not_receive(:warn)
+        expect {
+          SpecModel::Basic.find_one('_PID_')
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.6.0.pre1
+  version: 6.6.0.pre2
 platform: ruby
 authors:
 - Matt Zumwalt