Merge pull request #581 from projecthydra/deprecations

Deprecate calling .find with hash
samvera · Nov 11, 2014 · ec85cac · ec85cac
2 parents 8e31a71 + 79314f2
commit ec85cac
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 29 deletions.
diff --git a/lib/active_fedora/relation/finder_methods.rb b/lib/active_fedora/relation/finder_methods.rb
@@ -52,6 +52,7 @@ def find(*args)
 
       if options.present?
         options = args.first unless args.empty?
+        Deprecation.warn(ActiveFedora::Base, "Calling .find with a hash has been deprecated and will not be allowed in active-fedora 10.0. Use .where instead")
         options = {conditions: options}
         apply_finder_options(options)
       else

diff --git a/spec/unit/query_spec.rb b/spec/unit/query_spec.rb
@@ -49,43 +49,52 @@ class Basic < ActiveFedora::Base
         end
       end
     end
-
-    describe "with conditions" do
+    describe "using an options hash" do
       before do
-        ActiveFedora::Base.stub(:relation => relation)
-        relation.stub(clone: relation)
+        Deprecation.default_deprecation_behavior = :raise
       end
-      let(:relation) { ActiveFedora::Relation.new(SpecModel::Basic) }
-      let(:solr) { ActiveFedora::SolrService.instance.conn }
-      let(:expected_query) { "#{@model_query} AND foo:bar AND baz:quix AND baz:quack" }
-      let(:expected_params) { { params: { sort: [@sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
-      let(:mock_docs) { [{"id" => "changeme:30"},{"id" => "changeme:22"}] }
+      it "should be deprecated" do
+        expect { SpecModel::Basic.find(id: "_ID_") }.to raise_error RuntimeError
+      end
+    end
+  end
 
-      it "should filter by the provided fields" do
-        expect(relation).to receive(:load_from_fedora).with("changeme:30", nil).and_return("Fake Object1")
-        expect(relation).to receive(:load_from_fedora).with("changeme:22", nil).and_return("Fake Object2")
+  describe "#where" do
+    before do
+      ActiveFedora::Base.stub(:relation => relation)
+      relation.stub(clone: relation)
+    end
+    let(:relation) { ActiveFedora::Relation.new(SpecModel::Basic) }
+    let(:solr) { ActiveFedora::SolrService.instance.conn }
+    let(:expected_query) { "#{@model_query} AND foo:bar AND baz:quix AND baz:quack" }
+    let(:expected_params) { { params: { sort: [@sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
+    let(:expected_sort_params) { { params: { sort: ["title_t desc"], fl: 'id', q: expected_query, qt: 'standard' } } }
+    let(:mock_docs) { [{"id" => "changeme:30"},{"id" => "changeme:22"}] }
 
-        expect(mock_docs).to receive(:has_next?).and_return(false)
-        expect(solr).to receive(:paginate).with(1, 1000, 'select', expected_params).and_return('response'=>{'docs'=>mock_docs})
-        expect(SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']})).to eq ["Fake Object1", "Fake Object2"]
-      end
+    it "should filter by the provided fields" do
+      expect(relation).to receive(:load_from_fedora).with("changeme:30", nil).and_return("Fake Object1")
+      expect(relation).to receive(:load_from_fedora).with("changeme:22", nil).and_return("Fake Object2")
 
-      it "should correctly query for empty strings" do
-        expect(SpecModel::Basic.find( :active_fedora_model_ssi => '').count).to eq 0
-      end
+      expect(mock_docs).to receive(:has_next?).and_return(false)
+      expect(solr).to receive(:paginate).with(1, 1000, 'select', expected_params).and_return('response'=>{'docs'=>mock_docs})
+      expect(SpecModel::Basic.where({:foo=>'bar', :baz=>['quix','quack']})).to eq ["Fake Object1", "Fake Object2"]
+    end
 
-      it 'should correctly query for empty arrays' do
-        expect(SpecModel::Basic.find( :active_fedora_model_ssi => []).count).to eq 0
-      end
+    it "should correctly query for empty strings" do
+      expect(SpecModel::Basic.where( :active_fedora_model_ssi => '').count).to eq 0
+    end
 
-      it "should add options" do
-        expect(relation).to receive(:load_from_fedora).with("changeme:30", nil).and_return("Fake Object1")
-        expect(relation).to receive(:load_from_fedora).with("changeme:22", nil).and_return("Fake Object2")
+    it 'should correctly query for empty arrays' do
+      expect(SpecModel::Basic.where( :active_fedora_model_ssi => []).count).to eq 0
+    end
 
-        expect(mock_docs).to receive(:has_next?).and_return(false)
-        expect(solr).to receive(:paginate).with(1, 1000, 'select', expected_params).and_return('response'=>{'docs'=>mock_docs})
-        expect(SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}, :sort=>'title_t desc')).to eq ["Fake Object1", "Fake Object2"]
-      end
+    it "should add options" do
+      expect(relation).to receive(:load_from_fedora).with("changeme:30", nil).and_return("Fake Object1")
+      expect(relation).to receive(:load_from_fedora).with("changeme:22", nil).and_return("Fake Object2")
+
+      expect(mock_docs).to receive(:has_next?).and_return(false)
+      expect(solr).to receive(:paginate).with(1, 1000, 'select', expected_sort_params).and_return('response'=>{'docs'=>mock_docs})
+      expect(SpecModel::Basic.where(:foo=>'bar', :baz=>['quix','quack']).order('title_t desc')).to eq ["Fake Object1", "Fake Object2"]
     end
   end