mas-rad_core 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 729804d663161e4c029297c5f94d0c8860c4154c
-  data.tar.gz: 6aaaf2aa553730efba3af71b9804a71da7a0d741
+  metadata.gz: c5b261f38a51302a85395826c7355cea63db8e13
+  data.tar.gz: 676461c66f0f56cfe67048bcaeb179160f784ed0
 SHA512:
-  metadata.gz: e82e1dc7cf0ff771cffdf919610e8fe04a6904197fe2c2424b23f21cbb522ec8fe7009a56ce28e88b975ba71ddc5bfbbbf2aef20732bf829cfc8dfd1315ce896
-  data.tar.gz: 5ab392895e2039f158f5463b11ff799d6e8117197eb032dc9632c0bd169e6aea0b41300d824c065d4a02049220c9ed798c5956b3d1a0037ed94279296dad369c
+  metadata.gz: e3dc6b9964c8a858a234cf968e899559ed76c7a4dca3b922e1632d87ea423269993cc68ea2a700e4d4c147ab6e979be1e05e0d0ed9cac620a85d3e45774b47fa
+  data.tar.gz: d67170765c73e79eed23d627d6fa8e51afd190c2818f8824c6b804b209379a67ede033e31f25fe836db15703510e165b4c01000a9314274093dceec95253462c

data/app/jobs/geocode_firm_job.rb

@@ -2,20 +2,14 @@ require 'geocoder'
 
 class GeocodeFirmJob < ActiveJob::Base
   def perform(firm)
-    results = Geocoder.search(firm.full_street_address)
-
-    if results.any?
-      stat :success
-      firm.geocode!(results.first.latitude, results.first.longitude)
-    else
-      stat :failed
-      firm.geocode!
-    end
+    coordinates = Geocoder.coordinates(firm.full_street_address)
+    coordinates ? stat(:success) : stat(:failed)
+    firm.geocode!(coordinates)
   end
 
   private
 
   def stat(key)
-    Stats.increment("radsignup.geocode_firm.#{key}")
+    Stats.increment("radsignup.geocode.firm.#{key}")
   end
 end

data/app/models/firm.rb

@@ -1,4 +1,6 @@
 class Firm < ActiveRecord::Base
+  include Geocodable
+
   PERCENTAGE_ATTRIBUTES = [
     :retirement_income_products_percent,
     :pension_transfer_percent,
@@ -96,22 +98,6 @@ class Firm < ActiveRecord::Base
     address_line_one_changed? || address_line_two_changed? || address_postcode_changed?
   end
 
-  def latitude=(value)
-    value = value.to_f.round(6) unless value.nil?
-    write_attribute(:latitude, value)
-  end
-
-  def longitude=(value)
-    value = value.to_f.round(6) unless value.nil?
-    write_attribute(:longitude, value)
-  end
-
-  def geocode!(latitude = nil, longitude = nil)
-    self.latitude = latitude
-    self.longitude = longitude
-    save!(callbacks: false)
-  end
-
   def in_person_advice?
     in_person_advice_methods.present?
   end

data/lib/mas/rad_core/version.rb

@@ -1,5 +1,5 @@
 module MAS
   module RadCore
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/spec/models/adviser_spec.rb

@@ -98,79 +98,9 @@ RSpec.describe Adviser do
     it { is_expected.to eql "#{adviser.postcode}, United Kingdom"}
   end
 
-  describe '#latitude=' do
-    let(:adviser) { create(:adviser) }
-    let(:latitude) { Faker::Address.latitude }
-
-    before { adviser.latitude = latitude }
-
-    it 'casts the value to a float rounded to six decimal places' do
-      expect(adviser.latitude).to eql(latitude.to_f.round(6))
-    end
-
-    context 'when the value is nil' do
-      let(:latitude) { nil }
-
-      it 'does not cast the value' do
-        expect(adviser.latitude).to be_nil
-      end
-    end
-  end
-
-  describe '#longitude=' do
-    let(:adviser) { create(:adviser) }
-    let(:longitude) { Faker::Address.longitude }
-
-    before { adviser.longitude = longitude }
-
-    it 'casts the value to a float rounded to six decimal places' do
-      expect(adviser.longitude).to eql(longitude.to_f.round(6))
-    end
-
-    context 'when the value is nil' do
-      let(:longitude) { nil }
-
-      it 'does not cast the value' do
-        expect(adviser.longitude).to be_nil
-      end
-    end
-  end
-
-  describe '#geocode!' do
-    let(:adviser) { create(:adviser) }
-    let(:coordinates) { [Faker::Address.latitude, Faker::Address.longitude] }
-
-    before do
-      expect(GeocodeFirmJob).not_to receive(:perform_later)
-      adviser.geocode!(coordinates)
-      adviser.reload
-    end
-
-    it 'the adviser is persisted' do
-      expect(adviser).to be_persisted
-    end
-
-    context 'with valid coordinates' do
-      it 'the adviser latitude is updated' do
-        expect(adviser.latitude).to eql(coordinates.first.to_f.round(6))
-      end
-
-      it 'the adviser longitude is updated' do
-        expect(adviser.longitude).to eql(coordinates.last.to_f.round(6))
-      end
-    end
-
-    context 'with no coordinates' do
-      let(:coordinates) { nil }
-
-      it 'the adviser latitude is updated' do
-        expect(adviser.latitude).to be_nil
-      end
-
-      it 'the adviser longitude is updated' do
-        expect(adviser.longitude).to be_nil
-      end
-    end
+  it_should_behave_like 'geocodable' do
+    subject(:adviser) { create(:adviser) }
+    let(:job_class) { GeocodeAdviserJob }
   end
 
   describe 'after save' do

data/spec/models/firm_spec.rb

@@ -229,69 +229,9 @@ RSpec.describe Firm do
     end
   end
 
-  describe '#latitude=' do
-    let(:firm) { create(:firm) }
-    let(:latitude) { Faker::Address.latitude }
-
-    before { firm.latitude = latitude }
-
-    it 'casts the value to a float rounded to six decimal places' do
-      expect(firm.latitude).to eql(latitude.to_f.round(6))
-    end
-
-    context 'when the value is nil' do
-      let(:latitude) { nil }
-
-      it 'does not cast the value' do
-        expect(firm.latitude).to be_nil
-      end
-    end
-  end
-
-  describe '#longitude=' do
-    let(:firm) { create(:firm) }
-    let(:longitude) { Faker::Address.longitude }
-
-    before { firm.longitude = longitude }
-
-    it 'casts the value to a float rounded to six decimal places' do
-      expect(firm.longitude).to eql(longitude.to_f.round(6))
-    end
-
-    context 'when the value is nil' do
-      let(:longitude) { nil }
-
-      it 'does not cast the value' do
-        expect(firm.longitude).to be_nil
-      end
-    end
-  end
-
-  describe '#geocode!' do
-    let(:firm) { create(:firm) }
-    let(:latitude) { Faker::Address.latitude }
-    let(:longitude) { Faker::Address.longitude }
-
-    it 'does not schedule the firm for geocoding' do
-      expect(GeocodeFirmJob).not_to receive(:perform_later)
-      firm.geocode!(latitude, longitude)
-    end
-
-    context 'after the geocode is complete' do
-      before do
-        firm.geocode!(latitude, longitude)
-        firm.reload
-      end
-
-      it 'the firm is persisted' do
-        expect(firm).to be_persisted
-      end
-
-      it 'the latitude and longitude attributes are updated' do
-        expect(firm.latitude).to eql(latitude.to_f.round(6))
-        expect(firm.longitude).to eql(longitude.to_f.round(6))
-      end
-    end
+  it_should_behave_like 'geocodable' do
+    subject(:firm) { create(:firm) }
+    let(:job_class) { GeocodeFirmJob }
   end
 
   describe 'geocoding' do

data/spec/support/shared_examples/geocodable_examples.rb

@@ -0,0 +1,73 @@
+RSpec.shared_examples 'geocodable' do
+  describe '#latitude=' do
+    let(:latitude) { Faker::Address.latitude }
+
+    before { subject.latitude = latitude }
+
+    it 'casts the value to a float rounded to six decimal places' do
+      expect(subject.latitude).to eql(latitude.to_f.round(6))
+    end
+
+    context 'when the value is nil' do
+      let(:latitude) { nil }
+
+      it 'does not cast the value' do
+        expect(subject.latitude).to be_nil
+      end
+    end
+  end
+
+  describe '#longitude=' do
+    let(:longitude) { Faker::Address.longitude }
+
+    before { subject.longitude = longitude }
+
+    it 'casts the value to a float rounded to six decimal places' do
+      expect(subject.longitude).to eql(longitude.to_f.round(6))
+    end
+
+    context 'when the value is nil' do
+      let(:longitude) { nil }
+
+      it 'does not cast the value' do
+        expect(subject.longitude).to be_nil
+      end
+    end
+  end
+
+  describe '#geocode!' do
+    let(:coordinates) { [Faker::Address.latitude, Faker::Address.longitude] }
+
+    before do
+      expect(job_class).not_to receive(:perform_later)
+      subject.geocode!(coordinates)
+      subject.reload
+    end
+
+    it 'the model is persisted' do
+      expect(subject).to be_persisted
+    end
+
+    context 'with valid coordinates' do
+      it 'the latitude is updated' do
+        expect(subject.latitude).to eql(coordinates.first.to_f.round(6))
+      end
+
+      it 'the longitude is updated' do
+        expect(subject.longitude).to eql(coordinates.last.to_f.round(6))
+      end
+    end
+
+    context 'with no coordinates' do
+      let(:coordinates) { nil }
+
+      it 'the latitude is updated' do
+        expect(subject.latitude).to be_nil
+      end
+
+      it 'the longitude is updated' do
+        expect(subject.longitude).to be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ben Lovell
@@ -292,6 +292,7 @@ files:
 - spec/models/principal_spec.rb
 - spec/models/qualification_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples/geocodable_examples.rb
 - spec/support/shared_examples/reference_data.rb
 - spec/support/vcr.rb
 homepage: https://www.moneyadviceservice.org.uk
@@ -392,5 +393,6 @@ test_files:
 - spec/models/principal_spec.rb
 - spec/models/qualification_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples/geocodable_examples.rb
 - spec/support/shared_examples/reference_data.rb
 - spec/support/vcr.rb