addressfinder 1.6.2 → 1.8.1

data/spec/lib/addressfinder/address_autocomplete_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+RSpec.describe AddressFinder::AddressAutocomplete do
+  before do
+    AddressFinder.configure do |af|
+      af.api_key = 'XXX'
+      af.api_secret = 'YYY'
+      af.default_country = 'au'
+    end
+  end
+
+  describe '#build_request' do
+    let(:locator){ AddressFinder::AddressAutocomplete.new(params: args, http: http) }
+    let(:http){ AddressFinder::HTTP.new(AddressFinder.configuration) }
+
+    subject(:request_uri){ locator.send(:build_request) }
+
+    context 'with minimal arguments' do
+      let(:args){ {q: '186 willis'} }
+
+      it { expect(request_uri).to eq('/api/au/address/autocomplete.json?q=186+willis&key=XXX&secret=YYY') }
+    end
+
+    context 'with more arguments' do
+      let(:args){ {q: '186 willis st', au_paf: 1, max: 10} }
+
+      it { expect(request_uri).to eq('/api/au/address/autocomplete.json?q=186+willis+st&au_paf=1&max=10&key=XXX&secret=YYY') }
+    end
+
+    context 'with a country override' do
+      let(:args){ {q: '186 willis st', country: 'au'} }
+
+      it { expect(request_uri).to eq('/api/au/address/autocomplete.json?q=186+willis+st&key=XXX&secret=YYY') }
+    end
+
+    context 'with a key override' do
+      let(:args){ {q: '186 willis st', key: 'AAA'} }
+
+      it { expect(request_uri).to eq('/api/au/address/autocomplete.json?q=186+willis+st&key=AAA&secret=YYY') }
+    end
+
+    context 'with a secret override' do
+      let(:args){ {q: '186 willis st', secret: 'BBB'} }
+
+      it { expect(request_uri).to eq('/api/au/address/autocomplete.json?q=186+willis+st&secret=BBB&key=XXX') }
+    end
+  end
+
+  describe '#validate_params' do
+    let(:locator){ AddressFinder::AddressAutocomplete.new(params: args, http: http) }
+    let(:http){ AddressFinder::HTTP.new(AddressFinder.configuration) }
+
+    subject(:validate_params){ locator.send(:validate_params) }
+
+    context 'with wrong country' do
+      let(:args){ {q: '186 willis st', country: 'nz'} }
+
+      it { expect{validate_params}.to raise_error(AddressFinder::RequestRejectedError) }
+    end
+
+    context 'with correct country' do
+      let(:args){ {q: '186 willis st', country: 'au'} }
+
+      it { expect{validate_params}.not_to raise_error }
+    end
+  end
+
+  describe '#build_result' do
+    let(:locator){ AddressFinder::AddressSearch.new(params: {q: 'ignored'}, http: nil) }
+
+    before do
+      locator.send('response_body=', body)
+      locator.send('response_status=', status)
+      locator.send(:build_result)
+    end
+
+    subject(:results){ locator.results }
+
+    context 'with completions' do
+      let(:body){ '{"completions":[{"a":"184 William Jones Drive, Otangarei, Whangarei 0112","pxid":"2-.9.2U.F.F.2I","v":1},{"a":"184 Williams Street, Kaiapoi 7630","pxid":"2-.3.1q.2.4G.4c","v":0},{"a":"184 Willis Street, Te Aro, Wellington 6011","pxid":"2-.F.1W.p.1D.1W","v":0}],"paid":true}' }
+      let(:status){ '200' }
+
+      it { expect(results.size).to eq(3) }
+      it { expect(results.first.class).to eq(AddressFinder::AddressSearch::Result) }
+      it { expect(results.first.a).to eq("184 William Jones Drive, Otangarei, Whangarei 0112") }
+    end
+
+    context 'with no completions' do
+      let(:body){ '{"completions":[],"paid":true}' }
+      let(:status){ '200' }
+
+      it { expect(results).to eq([]) }
+    end
+  end
+end

data/spec/lib/addressfinder/bulk_spec.rb

@@ -28,9 +28,9 @@ RSpec.describe AddressFinder::Bulk do
       let(:response){ double(:response, body: %Q({"success": true}), code: "200") }
       let(:block){
         Proc.new do |proxy|
-          proxy.cleanse(q: "1 Willis")
-          proxy.cleanse(q: "2 Willis")
-          proxy.cleanse(q: "3 Willis")
+          proxy.verification(q: "1 Willis")
+          proxy.verification(q: "2 Willis")
+          proxy.verification(q: "3 Willis")
         end
       }
 
@@ -38,7 +38,31 @@ RSpec.describe AddressFinder::Bulk do
         expect(net_http).to receive(:do_start).once.and_call_original
         expect(net_http).to receive(:transport_request).exactly(3).times.and_return(response)
         expect(net_http).to receive(:do_finish).once.and_call_original
-        AddressFinder::Bulk.new(http: http, &block).perform
+        AddressFinder::Bulk.new(http: http, verification_version: 'v2', default_country: 'au', &block).perform
+      end
+
+      it "calls the correct class with v2 verification and au default" do
+        allow(net_http).to receive(:do_start).once.and_call_original
+        allow(net_http).to receive(:transport_request).exactly(3).times.and_return(response)
+        allow(net_http).to receive(:do_finish).once.and_call_original
+        expect(AddressFinder::V2::Au::Verification).to receive(:new).exactly(3).times.and_call_original
+        AddressFinder::Bulk.new(http: http, verification_version: 'v2', default_country: 'au', &block).perform
+      end
+
+      it "calls the correct class with v2 verification and nz default" do
+        allow(net_http).to receive(:do_start).once.and_call_original
+        allow(net_http).to receive(:transport_request).exactly(3).times.and_return(response)
+        allow(net_http).to receive(:do_finish).once.and_call_original
+        expect(AddressFinder::Verification).to receive(:new).exactly(3).times.and_call_original
+        AddressFinder::Bulk.new(http: http, verification_version: 'v2', default_country: 'nz', &block).perform
+      end
+
+      it "calls the correct class without a verification version" do
+        allow(net_http).to receive(:do_start).once.and_call_original
+        allow(net_http).to receive(:transport_request).exactly(3).times.and_return(response)
+        allow(net_http).to receive(:do_finish).once.and_call_original
+        expect(AddressFinder::Verification).to receive(:new).exactly(3).times.and_call_original
+        AddressFinder::Bulk.new(http: http, verification_version: nil, default_country: 'au', &block).perform
       end
 
       it "re-establishes the http connection and continues where we left off when a Net::OpenTimeout, Net::ReadTimeout or SocketError is raised" do
@@ -50,8 +74,42 @@ RSpec.describe AddressFinder::Bulk do
         expect(net_http).to receive(:transport_request).once.and_raise(SocketError) # Retry 2 Willis (error)
         expect(net_http).to receive(:transport_request).exactly(2).and_return(response) # Retry 2 Willis (success) & 3 Willis (success)
         expect(net_http).to receive(:do_finish).exactly(4).times.and_call_original
-        AddressFinder::Bulk.new(http: http, &block).perform
+        AddressFinder::Bulk.new(http: http, verification_version: 'v2', default_country: 'au', &block).perform
+      end
+    end
+
+    context "with the deprecated cleanse method" do
+      let(:response){ double(:response, body: %Q({"success": true}), code: "200") }
+      let(:block){
+        Proc.new do |proxy|
+          proxy.cleanse(q: "1 Willis")
+        end
+      }
+
+      it "has the same behaviour as the verification method" do
+        expect(net_http).to receive(:do_start).once.and_call_original
+        expect(net_http).to receive(:transport_request).once.and_return(response)
+        expect(net_http).to receive(:do_finish).once.and_call_original
+        expect(AddressFinder::Verification).to receive(:new).exactly(1).times.and_call_original
+        AddressFinder::Bulk.new(http: http, verification_version: nil, default_country: 'au', &block).perform
+      end
+    end
+
+    context "with a country override and v2 in the config" do
+      let(:response){ double(:response, body: %Q({"success": true}), code: "200") }
+      let(:block){
+        Proc.new do |proxy|
+          proxy.verification(q: "1 Willis", country: "au")
+        end
+      }
+
+      it "has the same behaviour as the verification method" do
+        expect(net_http).to receive(:do_start).once.and_call_original
+        expect(net_http).to receive(:transport_request).once.and_return(response)
+        expect(net_http).to receive(:do_finish).once.and_call_original
+        expect(AddressFinder::V2::Au::Verification).to receive(:new).exactly(1).times.and_call_original
+        AddressFinder::Bulk.new(http: http, verification_version: "v2", default_country: 'nz', &block).perform
       end
     end
   end
-end
+end

data/spec/lib/addressfinder/v2/au/verification_spec.rb

@@ -0,0 +1,187 @@
+require 'spec_helper'
+
+RSpec.describe AddressFinder::V2::Au::Verification do
+  before do
+    AddressFinder.configure do |af|
+      af.api_key = 'XXX'
+      af.api_secret = 'YYY'
+      af.timeout = 5
+      af.retries = 3
+    end
+  end
+
+  let(:verification_module){ AddressFinder::V2::Au::Verification.new(args) }
+  let(:http){ AddressFinder::HTTP.new(AddressFinder.configuration) }
+  let(:net_http){ http.send(:net_http) }
+
+  describe '#execute_request' do
+    let(:args){ {q: "186 Willis Street", http: http} }
+
+    before do
+      WebMock.allow_net_connect!(net_http_connect_on_start: true)
+      allow(http).to receive(:sleep)
+      allow(verification_module).to receive(:request_uri).and_return("/test/path")
+      expect(http).to_not receive(:re_establish_connection)
+    end
+
+    after do
+      WebMock.disable_net_connect!
+    end
+
+    subject(:execute_request){ verification_module.send(:execute_request) }
+
+    it "retries an errored request another time before succeeding" do
+      expect(net_http).to receive(:do_start).twice.and_call_original
+      expect(net_http).to receive(:transport_request).once.and_raise(Net::OpenTimeout)
+      expect(net_http).to receive(:transport_request).once.and_return(double(:response, body: "OK", code: "200"))
+      expect(net_http).to receive(:do_finish).twice.and_call_original
+      execute_request
+    end
+
+    it "re-raises a Net::OpenTimeout error after 3 retries" do
+      expect(net_http).to receive(:do_start).exactly(4).times.and_call_original
+      expect(net_http).to receive(:transport_request).exactly(4).times.and_raise(Net::OpenTimeout)
+      expect(net_http).to receive(:do_finish).exactly(4).times.and_call_original
+      expect{execute_request}.to raise_error(Net::OpenTimeout)
+    end
+
+    it "re-raises a Net::ReadTimeout error after 3 retries" do
+      expect(net_http).to receive(:do_start).exactly(4).times.and_call_original
+      expect(net_http).to receive(:transport_request).exactly(4).times.and_raise(Net::ReadTimeout)
+      expect(net_http).to receive(:do_finish).exactly(4).times.and_call_original
+      expect{execute_request}.to raise_error(Net::ReadTimeout)
+    end
+
+    it "re-raises a SocketError error after 3 retries" do
+      expect(net_http).to receive(:do_start).exactly(4).times.and_call_original
+      expect(net_http).to receive(:transport_request).exactly(4).times.and_raise(SocketError)
+      expect(net_http).to receive(:do_finish).exactly(4).times.and_call_original
+      expect{execute_request}.to raise_error(SocketError)
+    end
+  end
+
+  describe '#build_request' do
+    subject(:request_uri){ verification_module.send(:build_request) }
+
+    context 'with minimal arguments' do
+      let(:args){ {q: '186 willis st', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=XXX&secret=YYY&format=json') }
+    end
+
+    context 'with more arguments' do
+      let(:args){ {q: '186 willis st', census: '2011', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&census=2011&key=XXX&secret=YYY&format=json') }
+    end
+
+    context 'with a state codes as an array' do
+      let(:args){ {q: '186 willis st', state_codes: ['ACT','NSW'], http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=XXX&secret=YYY&state_codes[]=ACT&state_codes[]=NSW&format=json') }
+    end
+
+    context 'with a reserved character in the query' do
+      let(:args){ {q: '186=willis st', state_codes: ['ACT','NSW'], http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186%3Dwillis+st&key=XXX&secret=YYY&state_codes[]=ACT&state_codes[]=NSW&format=json') }
+    end
+
+    context 'with a state codes as a string' do
+      let(:args){ {q: '186 willis st', state_codes: 'ACT,NSW', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=XXX&secret=YYY&state_codes=ACT%2CNSW&format=json') }
+    end
+
+    context 'with a key override' do
+      let(:args){ {q: '186 willis st', key: 'AAA', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=AAA&secret=YYY&format=json') }
+    end
+
+    context 'with a secret override' do
+      let(:args){ {q: '186 willis st', secret: 'BBB', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=XXX&secret=BBB&format=json') }
+    end
+
+    context 'with a domain given' do
+      let(:args){ {q: '123', domain: 'testdomain.com', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=123&domain=testdomain.com&key=XXX&secret=YYY&format=json') }
+
+      context 'given in the AF configuration' do
+
+        let(:args){ {q: '123', http: http} }
+
+        it 'should use the config domain if set' do
+          AddressFinder.configuration.domain = 'anotherdomain.com'
+          # expect(request_uri).to eq('/api/au/address/v2/verification?q=123&domain=anotherdomain.com&key=XXX&secret=YYY&format=json')
+          AddressFinder.configuration.domain = nil # set back to nil after
+        end
+      end
+    end
+
+    context 'with a post_box exclusion' do
+      let(:args){ {q: '186 willis st', post_box: '0', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&post_box=0&key=XXX&secret=YYY&format=json') }
+    end
+
+    context 'with a gnaf request' do
+      let(:args){ {q: '186 willis st', gnaf: '1', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=XXX&secret=YYY&gnaf=1&format=json') }
+    end
+
+    context 'with a paf request' do
+      let(:args){ {q: '186 willis st', paf: '1', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&key=XXX&secret=YYY&paf=1&format=json') }
+    end
+
+    context 'with a all args included request' do
+      let(:args){ {q: '186 willis st', paf: '1', gnaf:'1', post_box:'0', state_codes:'ACT', census: '2016', domain: 'mysite.com', gps: '1', extended: '1', http: http} }
+
+      it { expect(request_uri).to eq('/api/au/address/v2/verification?q=186+willis+st&post_box=0&census=2016&domain=mysite.com&key=XXX&secret=YYY&paf=1&gnaf=1&gps=1&extended=1&state_codes=ACT&format=json') }
+    end
+  end
+
+  describe '#build_result' do
+    let(:args){ {q: 'ignored', http: nil} }
+
+    before do
+      verification_module.send('response_body=', body)
+      verification_module.send('response_status=', status)
+    end
+
+    subject(:result){ verification_module.send(:build_result) }
+
+    context 'with a successful nz result' do
+      let(:body){ '{"matched": true, "postal_address": "Texas"}' }
+      let(:status){ '200' }
+
+      it { expect(result.class).to eq(AddressFinder::V2::Au::Verification::Result) }
+
+      it { expect(result.matched).to eq(true) }
+
+      it { expect(result.postal_address).to eq("Texas") }
+    end
+
+    context 'with a successful au result' do
+      let(:body){ %Q({"matched": true, "success": true, "address": {"full_address": "Texas"}}) }
+      let(:status){ '200' }
+
+      it { expect(result.class).to eq(AddressFinder::V2::Au::Verification::Result) }
+
+      it { expect(result.full_address).to eq("Texas") }
+    end
+
+    context 'with an unfound result' do
+      let(:body){ '{"matched": false}' }
+      let(:status){ '200' }
+
+      it { expect(result).to eq(nil) }
+    end
+  end
+end

data/spec/lib/addressfinder/{cleanse_spec.rb → verification_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe AddressFinder::Cleanse do
+RSpec.describe AddressFinder::Verification do
   before do
     AddressFinder.configure do |af|
       af.api_key = 'XXX'
@@ -11,7 +11,7 @@ RSpec.describe AddressFinder::Cleanse do
     end
   end
 
-  let(:cleanser){ AddressFinder::Cleanse.new(args) }
+  let(:verification_module){ AddressFinder::Verification.new(args) }
   let(:http){ AddressFinder::HTTP.new(AddressFinder.configuration) }
   let(:net_http){ http.send(:net_http) }
 
@@ -21,7 +21,7 @@ RSpec.describe AddressFinder::Cleanse do
     before do
       WebMock.allow_net_connect!(net_http_connect_on_start: true)
       allow(http).to receive(:sleep)
-      allow(cleanser).to receive(:request_uri).and_return("/test/path")
+      allow(verification_module).to receive(:request_uri).and_return("/test/path")
       expect(http).to_not receive(:re_establish_connection)
     end
 
@@ -29,7 +29,7 @@ RSpec.describe AddressFinder::Cleanse do
       WebMock.disable_net_connect!
     end
 
-    subject(:execute_request){ cleanser.send(:execute_request) }
+    subject(:execute_request){ verification_module.send(:execute_request) }
 
     it "retries an errored request another time before succeeding" do
       expect(net_http).to receive(:do_start).twice.and_call_original
@@ -62,60 +62,60 @@ RSpec.describe AddressFinder::Cleanse do
   end
 
   describe '#build_request' do
-    subject(:request_uri){ cleanser.send(:build_request) }
+    subject(:request_uri){ verification_module.send(:build_request) }
 
     context 'with minimal arguments' do
       let(:args){ {q: '186 willis st', http: http} }
 
-      it { expect(request_uri).to eq('/api/nz/address/cleanse?q=186+willis+st&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/nz/address/verification?q=186+willis+st&key=XXX&secret=YYY&format=json') }
     end
 
     context 'with more arguments' do
       let(:args){ {q: '186 willis st', delivered: true, region_code: 'A', census: '2013', http: http} }
 
-      it { expect(request_uri).to eq('/api/nz/address/cleanse?q=186+willis+st&delivered=true&region_code=A&census=2013&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/nz/address/verification?q=186+willis+st&census=2013&key=XXX&secret=YYY&delivered=true&region_code=A&format=json') }
     end
 
     context 'with a country override' do
       let(:args){ {q: '186 willis st', country: 'au', http: http} }
 
-      it { expect(request_uri).to eq('/api/au/address/cleanse?q=186+willis+st&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/au/address/verification?q=186+willis+st&key=XXX&secret=YYY&format=json') }
     end
 
     context 'with a state codes as an array' do
       let(:args){ {q: '186 willis st', country: 'au', state_codes: ['ACT','NSW'], http: http} }
 
-      it { expect(request_uri).to eq('/api/au/address/cleanse?q=186+willis+st&state_codes[]=ACT&state_codes[]=NSW&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/au/address/verification?q=186+willis+st&key=XXX&secret=YYY&state_codes[]=ACT&state_codes[]=NSW&format=json') }
     end
 
     context 'with a reserved character in the query' do
       let(:args){ {q: '186=willis st', country: 'au', state_codes: ['ACT','NSW'], http: http} }
 
-      it { expect(request_uri).to eq('/api/au/address/cleanse?q=186%3Dwillis+st&state_codes[]=ACT&state_codes[]=NSW&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/au/address/verification?q=186%3Dwillis+st&key=XXX&secret=YYY&state_codes[]=ACT&state_codes[]=NSW&format=json') }
     end
 
     context 'with a state codes as a string' do
       let(:args){ {q: '186 willis st', country: 'au', state_codes: 'ACT,NSW', http: http} }
 
-      it { expect(request_uri).to eq('/api/au/address/cleanse?q=186+willis+st&state_codes=ACT%2CNSW&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/au/address/verification?q=186+willis+st&key=XXX&secret=YYY&state_codes=ACT%2CNSW&format=json') }
     end
 
     context 'with a key override' do
       let(:args){ {q: '186 willis st', key: 'AAA', http: http} }
 
-      it { expect(request_uri).to eq('/api/nz/address/cleanse?q=186+willis+st&format=json&key=AAA&secret=YYY') }
+      it { expect(request_uri).to eq('/api/nz/address/verification?q=186+willis+st&key=AAA&secret=YYY&format=json') }
     end
 
     context 'with a secret override' do
       let(:args){ {q: '186 willis st', secret: 'BBB', http: http} }
 
-      it { expect(request_uri).to eq('/api/nz/address/cleanse?q=186+willis+st&format=json&key=XXX&secret=BBB') }
+      it { expect(request_uri).to eq('/api/nz/address/verification?q=186+willis+st&key=XXX&secret=BBB&format=json') }
     end
 
     context 'with a domain given' do
       let(:args){ {q: '123', domain: 'testdomain.com', http: http} }
 
-      it { expect(request_uri).to eq('/api/nz/address/cleanse?q=123&domain=testdomain.com&format=json&key=XXX&secret=YYY') }
+      it { expect(request_uri).to eq('/api/nz/address/verification?q=123&domain=testdomain.com&key=XXX&secret=YYY&format=json') }
 
       context 'given in the AF configuration' do
 
@@ -123,7 +123,7 @@ RSpec.describe AddressFinder::Cleanse do
 
         it 'should use the config domain if set' do
           AddressFinder.configuration.domain = 'anotherdomain.com'
-          expect(request_uri).to eq('/api/nz/address/cleanse?q=123&domain=anotherdomain.com&format=json&key=XXX&secret=YYY')
+          expect(request_uri).to eq('/api/nz/address/verification?q=123&domain=anotherdomain.com&key=XXX&secret=YYY&format=json')
           AddressFinder.configuration.domain = nil # set back to nil after
         end
       end
@@ -134,17 +134,17 @@ RSpec.describe AddressFinder::Cleanse do
     let(:args){ {q: 'ignored', http: nil} }
 
     before do
-      cleanser.send('response_body=', body)
-      cleanser.send('response_status=', status)
+      verification_module.send('response_body=', body)
+      verification_module.send('response_status=', status)
     end
 
-    subject(:result){ cleanser.send(:build_result) }
+    subject(:result){ verification_module.send(:build_result) }
 
     context 'with a successful nz result' do
       let(:body){ '{"matched": true, "postal_address": "Texas"}' }
       let(:status){ '200' }
 
-      it { expect(result.class).to eq(AddressFinder::Cleanse::Result) }
+      it { expect(result.class).to eq(AddressFinder::Verification::Result) }
 
       it { expect(result.matched).to eq(true) }
 
@@ -155,7 +155,7 @@ RSpec.describe AddressFinder::Cleanse do
       let(:body){ %Q({"matched": true, "success": true, "address": {"full_address": "Texas"}}) }
       let(:status){ '200' }
 
-      it { expect(result.class).to eq(AddressFinder::Cleanse::Result) }
+      it { expect(result.class).to eq(AddressFinder::Verification::Result) }
 
       it { expect(result.full_address).to eq("Texas") }
     end

data/spec/lib/addressfinder_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'fileutils'
+
+RSpec.describe AddressFinder do
+  before do
+    AddressFinder.configure do |af|
+      af.api_key = 'XXX'
+      af.api_secret = 'YYY'
+      af.default_country = 'nz'
+      af.timeout = 5
+      af.retries = 5
+    end
+  end
+
+  describe '#verification with verification_version configured to "v2"' do
+    before do
+      AddressFinder.configuration.verification_version = "v2"
+    end
+
+    after do
+      AddressFinder.configuration.verification_version = nil # set back to nil after
+    end
+
+    subject(:verification){ AddressFinder.verification(args) }
+
+    context "with country set to nz" do
+      let(:args){ {country: "nz", q: "12 high street sydney"} }
+      it "calls the old class" do
+        expect(AddressFinder::Verification).to receive_message_chain(:new, :perform, :result)
+        subject
+      end
+    end
+
+    context "with country set to au" do
+      let(:args){ {country: "au", q: "12 high street sydney"} }
+      it "calls the v2::Au class" do
+        expect(AddressFinder::V2::Au::Verification).to receive_message_chain(:new, :perform, :result)
+        subject
+      end
+    end
+  end
+
+  describe '#verification with verification_version not configured' do
+    subject(:verification){ AddressFinder.verification(args) }
+
+    context "with country set to nz" do
+      let(:args){ {country: "nz", q: "12 high street sydney"} }
+
+      it "calls the old class" do
+        expect(AddressFinder::Verification).to receive_message_chain(:new, :perform, :result)
+        subject
+      end
+    end
+
+    context "with country set to au" do
+      let(:args){ {country: "au", q: "12 high street sydney"} }
+
+      it "calls the old class" do
+        expect(AddressFinder::Verification).to receive_message_chain(:new, :perform, :result)
+        subject
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ require 'addressfinder'
 
 RSpec.configure do |config|
   config.mock_with :rspec
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
 WebMock.disable_net_connect!