active-fedora 11.4.1 → 11.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4b83fd7af3c0f5d229ae8cbb7ecb54db6a14d6
-  data.tar.gz: 157910b7d13aa69ae54c8a8934668c1aa766af18
+  metadata.gz: 92d0034bbac0025de2d37bbc3c2338dfe7845c26
+  data.tar.gz: adcd29bb2e0243dc8cb72de4196fda37eddfade4
 SHA512:
-  metadata.gz: 162f909e91544aaa3cd25444a603dcc89d294919ed058c30fa35900707d531ab80a2f362fec99ed8c6df8c3e0f3babf2eaba71498ec025bbd2f905633c539b72
-  data.tar.gz: 3a299f97e7b47258f3b4028caf52741f15979a55f7f498970044eecd51fcbb228e7ac99c00ca0cbfd60ccc2f3a40ce96d3e60ca72ec09cb3228b8ea0a3944186
+  metadata.gz: 91406a7de60279f1e5c78d4e99d62eb8357e76c31dd62ac56b854198a7fb980b08ddaa52e003cd7fe225b75936e98cbc16c57b2a911cb8b69934f67ccb44a18a
+  data.tar.gz: fad213756426a2855107a96a1a8f95abea32220b1eb283ba67a53deb9842c2284ffd195e499bc731068aac122e55c69f6621b433c0d58cfa01a159b9d0738107

data/lib/active_fedora/solr_service.rb

@@ -44,9 +44,23 @@ module ActiveFedora
         SolrService.instance.conn.get(select_path, params: args)
       end
 
+      def post(query, args = {})
+        args = args.merge(q: query, qt: 'standard')
+        SolrService.instance.conn.post(select_path, data: args)
+      end
+
       def query(query, args = {})
         Base.logger.warn "Calling ActiveFedora::SolrService.get without passing an explicit value for ':rows' is not recommended. You will end up with Solr's default (usually set to 10)\nCalled by #{caller[0]}" unless args.key?(:rows)
-        result = get(query, args)
+        method = args.delete(:method) || :get
+
+        result = case method
+                 when :get
+                   get(query, args)
+                 when :post
+                   post(query, args)
+                 else
+                   raise "Unsupported HTTP method for querying SolrService (#{method.inspect})"
+                 end
         result['response']['docs'].map do |doc|
           ActiveFedora::SolrHit.new(doc)
         end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.4.1".freeze
+  VERSION = "11.5.0".freeze
 end

data/spec/unit/solr_service_spec.rb

@@ -65,14 +65,48 @@ describe ActiveFedora::SolrService do
     end
   end
 
+  describe "#post" do
+    it "calls solr" do
+      stub_result = double("Result")
+      expect(mock_conn).to receive(:post).with('select', data: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
+      allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
+      expect(described_class.post('querytext')).to eq stub_result
+    end
+    it "uses select_path" do
+      stub_result = double("Result")
+      expect(mock_conn).to receive(:post).with('select_test', data: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
+      expect(described_class).to receive(:select_path).and_return('select_test')
+      allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
+      expect(described_class.post('querytext')).to eq stub_result
+    end
+  end
+
   describe "#query" do
     let(:doc) { { 'id' => 'x' } }
     let(:docs) { [doc] }
     let(:stub_result) { { 'response' => { 'docs' => docs } } }
+
     before do
       allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
     end
 
+    it "defaults to HTTP GET method" do
+      expect(mock_conn).to receive(:get).with('select', params: { rows: 2, q: 'querytext', qt: 'standard' }).and_return(stub_result)
+      described_class.query('querytext', rows: 2)
+    end
+
+    it "allows callers to specify HTTP POST method" do
+      expect(mock_conn).to receive(:post).with('select', data: { rows: 2, q: 'querytext', qt: 'standard' }).and_return(stub_result)
+      described_class.query('querytext', rows: 2, method: :post)
+    end
+
+    it "raises if method not GET or POST" do
+      expect(mock_conn).not_to receive(:head).with('select', data: { rows: 2, q: 'querytext', qt: 'standard' })
+      expect {
+        described_class.query('querytext', rows: 2, method: :head)
+      }.to raise_error(RuntimeError, "Unsupported HTTP method for querying SolrService (:head)")
+    end
+
     it "wraps the solr response documents in Solr hits" do
       expect(mock_conn).to receive(:get).with('select', params: { rows: 2, q: 'querytext', qt: 'standard' }).and_return(stub_result)
       result = described_class.query('querytext', rows: 2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.4.1
+  version: 11.5.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr