gds-api-adapters 6.1.0 → 7.0.0

data/lib/gds_api/rummager.rb

@@ -4,14 +4,9 @@ require 'rack/utils'
 module GdsApi
   class Rummager < Base
 
-    def search(query, format_filter = nil)
+    def search(query, extra_params={})
       return [] if query.nil? || query == ""
-      get_json!(search_url(:search, query, format_filter))
-    end
-
-    def autocomplete(query, format_filter = nil)
-      return [] if query.nil? || query == ""
-      get_raw!(search_url(:autocomplete, query, format_filter)).body
+      get_json!(search_url(:search, query, extra_params))
     end
 
     def advanced_search(args)
@@ -22,9 +17,12 @@ module GdsApi
 
   private
 
-    def search_url(type, query, format_filter = nil)
+    def search_url(type, query, extra_params={})
       request_path = "#{base_url}/#{type}?q=#{CGI.escape(query)}"
-      request_path << "&format_filter=#{CGI.escape(format_filter)}" if format_filter
+      if extra_params
+        request_path << "&"
+        request_path << Rack::Utils.build_query(extra_params)
+      end
       request_path
     end
 

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '6.1.0'
+  VERSION = '7.0.0'
 end

data/test/rummager_test.rb

@@ -4,7 +4,6 @@ require "gds_api/rummager"
 describe GdsApi::Rummager do
   before(:each) do
     stub_request(:get, /example.com\/search/).to_return(body: "[]")
-    stub_request(:get, /example.com\/autocomplete/).to_return(body: "[]")
     stub_request(:get, /example.com\/advanced_search/).to_return(body: "[]")
   end
 
@@ -63,18 +62,6 @@ describe GdsApi::Rummager do
     assert_requested :get, /\?q=search-term/
   end
 
-  it "should add a format filter parameter to searches if provided" do
-    GdsApi::Rummager.new("http://example.com").search "search-term", "specialist_guidance"
-
-    assert_requested :get, /format_filter=specialist_guidance/
-  end
-
-  it "should add a format filter parameter to autocomplete if provided" do
-    GdsApi::Rummager.new("http://example.com").autocomplete "search-term", "specialist_guidance"
-
-    assert_requested :get, /format_filter=specialist_guidance/
-  end
-
   it "should escape characters that would otherwise be invalid in a URI" do
     GdsApi::Rummager.new("http://example.com").search "search term with spaces"
 
@@ -82,12 +69,10 @@ describe GdsApi::Rummager do
     assert_requested :get, /\?q=search%20term%20with%20spaces/
   end
 
-  it "should pass autocomplete responses back as-is" do
-    search_results_json = {"title" => "document-title"}.to_json
-    stub_request(:get, /example.com\/autocomplete/).to_return(body: search_results_json)
-    results = GdsApi::Rummager.new("http://example.com").autocomplete("test")
+  it "should append arbitrary parameters when supplied" do
+    GdsApi::Rummager.new("http://example.com").search("search-term", foo: "bar", zoo: "baz")
 
-    assert_equal search_results_json, results
+    assert_requested :get, /\?foo=bar&q=search-term&zoo=baz/
   end
 
   # tests for #advanced_search

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors: 
 - James Stewart
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-24 00:00:00 Z
+date: 2013-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
@@ -254,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -673475242320565941
+      hash: 3315844948382405852
       segments: 
       - 0
       version: "0"
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -673475242320565941
+      hash: 3315844948382405852
       segments: 
       - 0
       version: "0"