gds-api-adapters 22.0.0 → 23.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30afe3107beb650860db70e91c9d42835c570de2
-  data.tar.gz: d3b8c1636e24c02501718a1f6f1c319cd43c818c
+  metadata.gz: 5ea6ab5e0f8cd1e6568d3588d21b9918c7818a65
+  data.tar.gz: 57953905ccbcd5453f4acc5548248a02b57e1fa2
 SHA512:
-  metadata.gz: 085750359ca93887f245ffe02241413cfd2d5532c4eee64265fc8605ddc04b50df7994b9f3a869b43b36eb1d1359f1da1c308deef366f1284db75fcc95970ee5
-  data.tar.gz: 7b34634b10f4ba9c74c3bbe271d411681d831af8fa2405f78036f7856ade1c893af9ab8b7fdab2587f3b9388630fcc8df24dd6107021df67a486b027d70c3007
+  metadata.gz: fed21cbb734110e486fe6e390a4e8960b4f018d886643a76cd1d75c91ca076a87fd052103c5c982afc287b869c83336d60da7e6a60bcd66ca7f43f3ba6c6db32
+  data.tar.gz: e2f4fdf14f51fe5ece8d45ffd822b4c4f1fcbc393a3d601bf224a89a6c94bacea7ccf941f20b0e9b0ed8db0ddc045e255da3a0930e3740233c0f3e4947fca885

data/lib/gds_api/rummager.rb

@@ -4,11 +4,6 @@ require 'rack/utils'
 module GdsApi
   class Rummager < Base
 
-    def search(query, extra_params={})
-      raise ArgumentError.new("Query cannot be blank") if query.nil? || query.strip.empty?
-      get_json!(search_url(:search, query, extra_params))
-    end
-
     def unified_search(args)
       request_url = "#{base_url}/unified_search.json?#{Rack::Utils.build_nested_query(args)}"
       get_json!(request_url)
@@ -43,15 +38,6 @@ module GdsApi
 
   private
 
-    def search_url(type, query, extra_params={})
-      request_path = "#{base_url}/#{type}?q=#{CGI.escape(query)}"
-      if extra_params
-        request_path << "&"
-        request_path << Rack::Utils.build_query(extra_params)
-      end
-      request_path
-    end
-
     def base_url
       endpoint
     end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '22.0.0'
+  VERSION = '23.0.0'
 end

data/test/rummager_test.rb

@@ -3,77 +3,10 @@ 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\/advanced_search/).to_return(body: "[]")
     stub_request(:get, /example.com\/unified_search/).to_return(body: "[]")
   end
 
-  it "should raise an exception if the service at the search URI returns a 500" do
-    stub_request(:get, /example.com\/search/).to_return(status: [500, "Internal Server Error"])
-    assert_raises(GdsApi::HTTPServerError) do
-      GdsApi::Rummager.new("http://example.com").search("query")
-    end
-  end
-
-  it "should raise an exception if the service at the search URI returns a 404" do
-    stub_request(:get, /example.com\/search/).to_return(status: [404, "Not Found"])
-    assert_raises(GdsApi::HTTPNotFound) do
-      GdsApi::Rummager.new("http://example.com").search("query")
-    end
-  end
-
-  it "should raise an exception if the service at the search URI times out" do
-    stub_request(:get, /example.com\/search/).to_timeout
-    assert_raises(GdsApi::TimedOutException) do
-      GdsApi::Rummager.new("http://example.com").search("query")
-    end
-  end
-
-  it "should return the search deserialized from json" do
-    search_results = [{"title" => "document-title"}]
-    stub_request(:get, /example.com\/search/).to_return(body: search_results.to_json)
-    results = GdsApi::Rummager.new("http://example.com").search("query")
-
-    assert_equal search_results, results.to_hash
-  end
-
-  it "should return an empty set of results without making request if query is empty" do
-    assert_raises(ArgumentError) do
-      GdsApi::Rummager.new("http://example.com").search("")
-    end
-  end
-
-  it "should return an empty set of results without making request if query is nil" do
-    assert_raises(ArgumentError) do
-      GdsApi::Rummager.new("http://example.com").search(nil)
-    end
-  end
-
-  it "should request the search results in JSON format" do
-    GdsApi::Rummager.new("http://example.com").search("query")
-
-    assert_requested :get, /.*/, headers: {"Accept" => "application/json"}
-  end
-
-  it "should issue a request for the search term specified" do
-    GdsApi::Rummager.new("http://example.com").search "search-term"
-
-    assert_requested :get, /\?q=search-term/
-  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"
-
-    #the actual request is "?q=search+term+with+spaces", but Webmock appears to be re-escaping.
-    assert_requested :get, /\?q=search%20term%20with%20spaces/
-  end
-
-  it "should append arbitrary parameters when supplied" do
-    GdsApi::Rummager.new("http://example.com").search("search-term", foo: "bar", zoo: "baz")
-
-    assert_requested :get, /\?foo=bar&q=search-term&zoo=baz/
-  end
-
   # tests for #organisations
 
   it "should request the list of organisations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 22.0.0
+  version: 23.0.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek