gds-api-adapters 10.6.0 → 10.6.1

data/lib/gds_api/finder_api.rb

@@ -3,9 +3,9 @@ require_relative 'finder_schema'
 
 module GdsApi
   class FinderApi < Base
-    def initialize(url, options, &block)
-      @schema_factory = options.fetch(:schema_factory) { Schema.method(:new) }
-      super(url, options, &block)
+    def initialize(url, options = {})
+      @schema_factory = options.fetch(:schema_factory) { FinderSchema.method(:new) }
+      super
     end
 
     def get_documents(finder_slug, options = {})

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '10.6.0'
+  VERSION = '10.6.1'
 end

data/test/finder_api_test.rb

@@ -2,10 +2,13 @@ require 'test_helper'
 require 'gds_api/finder_api'
 
 describe GdsApi::FinderApi do
-  before do
-    @base_api_url = Plek.current.find('finder-api')
-    @api = GdsApi::FinderApi.new(@base_api_url, schema_factory: schema_factory)
-  end
+  let(:base_api_url) { "http://finder-api" }
+  let(:api) {
+    GdsApi::FinderApi.new(
+      base_api_url,
+      schema_factory: schema_factory,
+    )
+  }
 
   let(:schema) { Object.new }
   let(:schema_factory) {
@@ -29,11 +32,11 @@ describe GdsApi::FinderApi do
         ]
       }
 
-      req = WebMock.stub_request(:get, "#{@base_api_url}/finders/some-finder-slug/documents.json").
+      req = WebMock.stub_request(:get, "#{base_api_url}/finders/some-finder-slug/documents.json").
         to_return(:body => documents_hash.to_json,
                   :headers => {"Content-type" => "application/json"})
 
-      response = @api.get_documents("some-finder-slug")
+      response = api.get_documents("some-finder-slug")
       assert_equal 200, response.code
       assert_equal documents_hash, response.to_hash
 
@@ -51,12 +54,12 @@ describe GdsApi::FinderApi do
         ]
       }
 
-      req = WebMock.stub_request(:get, "#{@base_api_url}/finders/some-finder-slug/documents.json").
+      req = WebMock.stub_request(:get, "#{base_api_url}/finders/some-finder-slug/documents.json").
         with(query: {case_type: 'market-investigations'}).
         to_return(:body => documents_hash.to_json,
                   :headers => {"Content-type" => "application/json"})
 
-      response = @api.get_documents("some-finder-slug", case_type: 'market-investigations')
+      response = api.get_documents("some-finder-slug", case_type: 'market-investigations')
       assert_equal 200, response.code
       assert_equal documents_hash, response.to_hash
 
@@ -79,41 +82,42 @@ describe GdsApi::FinderApi do
     }
 
     let(:schema_url) {
-      "#{@base_api_url}/finders/cma-cases/schema.json"
+      "#{base_api_url}/finders/cma-cases/schema.json"
     }
 
-    it "requests the finder's schema" do
-      req = WebMock.stub_request(:get, schema_url).
+
+    before do
+      @req = WebMock.stub_request(:get, schema_url).
         to_return(:body => schema_json,
                   :headers => {"Content-type" => "application/json"})
+    end
 
-      response = @api.get_schema("cma-cases")
+    it "requests the finder's schema" do
+      api.get_schema("cma-cases")
 
-      assert_requested(req)
+      assert_requested(@req)
     end
 
     it "constructs and returns a schema object" do
-      WebMock.stub_request(:get, schema_url)
-        .to_return(
-          :body => schema_json,
-          :headers => {"Content-type" => "application/json"},
-        )
-
-      returned_schema = @api.get_schema("cma-cases")
+      returned_schema = api.get_schema("cma-cases")
 
       assert_equal schema, returned_schema
       schema_factory.verify
     end
 
     it "should forward query parameters" do
-      req = WebMock.stub_request(:get, "#{@base_api_url}/finders/some-finder-slug/schema.json").
+      req = WebMock.stub_request(:get, "#{base_api_url}/finders/some-finder-slug/schema.json").
         with(query: {locale: 'fr-FR'}).
         to_return(:body => schema_json,
                   :headers => {"Content-type" => "application/json"})
 
-      response = @api.get_schema("some-finder-slug", locale: 'fr-FR')
+      response = api.get_schema("some-finder-slug", locale: 'fr-FR')
 
       assert_requested(req)
     end
+
+    it "defaults the schema factory if not provided" do
+      GdsApi::FinderApi.new(base_api_url).get_schema("cma-cases")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 10.6.0
+  version: 10.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -376,7 +376,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1564566442515579197
+      hash: 395287235660569090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -385,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1564566442515579197
+      hash: 395287235660569090
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23