mas-rad_core 0.0.85 → 0.0.87

data/spec/lib/mas/firm_result_spec.rb

@@ -156,25 +156,10 @@ RSpec.describe FirmResult do
     end
 
     describe '#closest_adviser' do
-      let(:text) { 'less than a mile away' }
+      before { data['sort'] = [1.23456789, 2.34567890] }
 
-      before do
-        I18n.backend.store_translations :en,
-          search: { result: { miles_away_alt: text, miles_away: 'miles away' } }
-      end
-
-      context 'when it is less than 1 mile away' do
-        it 'returns `less than a mile away` localised text' do
-          expect(subject.closest_adviser).to eq(text)
-        end
-      end
-
-      context 'when it is a mile away or more' do
-        before { data['sort'] = [1.23456789] }
-
-        it 'returns the formatted distance' do
-          expect(subject.closest_adviser).to eq('1.2 miles away')
-        end
+      it 'returns the first distance' do
+        expect(subject.closest_adviser).to eq(1.23456789)
       end
     end
 
@@ -193,8 +178,8 @@ RSpec.describe FirmResult do
             end
           end
 
-          context 'has a value of 100 (true)' do
-            let(:value) { 100 }
+          context 'has a value > 0 (true)' do
+            let(:value) { 1 }
 
             it 'returns true' do
               expect(subject.includes_advice_type?(key)).to eq(true)

data/spec/lib/mas/model_geocoder_spec.rb

@@ -0,0 +1,81 @@
+RSpec.describe ModelGeocoder do
+  let(:model_class) do
+    Class.new do
+      attr_accessor :address_line_one, :address_line_two, :address_postcode, :longitude, :latitude
+
+      def update_coordinates!(*args); end
+
+      def full_street_address
+        [address_line_one, address_line_two, address_postcode, 'United Kingdom'].reject(&:blank?).join(', ')
+      end
+    end
+  end
+
+  let(:model) do
+    model_class.new.tap do |thing|
+      thing.address_line_one = address_line_one
+      thing.address_line_two = address_line_two
+      thing.address_postcode = address_postcode
+    end
+  end
+
+  let(:address_line_one) { '120 Holborn' }
+  let(:address_line_two) { 'London' }
+  let(:address_postcode) { 'EC1N 2TD' }
+  let(:expected_coordinates) { [51.5180697, -0.1085203] }
+
+  describe '#geocode' do
+    context 'when the model address can be geocoded' do
+      it 'returns the coordinates' do
+        VCR.use_cassette('geocode-one-result') do
+          expect(ModelGeocoder.geocode(model)).to eql(expected_coordinates)
+        end
+      end
+    end
+
+    context 'when model address cannot be geocoded' do
+      let(:address_line_one) { '1000 Fantasy Ave' }
+      let(:address_line_two) { 'Neverland' }
+      let(:address_postcode) { 'ABC 123' }
+
+      it 'returns nil' do
+        VCR.use_cassette('geocode-no-results') do
+          expect(ModelGeocoder.geocode(model)).to be(nil)
+        end
+      end
+    end
+  end
+
+  describe '#geocode!' do
+    context 'when the model address can be geocoded' do
+      before do
+        allow(ModelGeocoder).to receive(:geocode).and_return(expected_coordinates)
+      end
+
+      it 'calls model.update_coordinates! with the coordinates' do
+        expect(model).to receive(:update_coordinates!).with(expected_coordinates)
+        ModelGeocoder.geocode!(model)
+      end
+
+      it 'returns the true' do
+        expect(ModelGeocoder.geocode!(model)).to be(true)
+      end
+    end
+
+    context 'when model address cannot be geocoded' do
+      before do
+        allow(ModelGeocoder).to receive(:geocode).and_return(nil)
+      end
+
+      # This side effect is required while the geocoding is done on a background job
+      it 'calls model.update_coordinates! with nil' do
+        expect(model).to receive(:update_coordinates!).with(nil)
+        ModelGeocoder.geocode!(model)
+      end
+
+      it 'returns false' do
+        expect(ModelGeocoder.geocode!(model)).to be(false)
+      end
+    end
+  end
+end

data/spec/support/shared_examples/geocodable_examples.rb

@@ -35,12 +35,12 @@ RSpec.shared_examples 'geocodable' do
     end
   end
 
-  describe '#geocode!' do
+  describe '#update_coordinates!' do
     let(:coordinates) { [Faker::Address.latitude, Faker::Address.longitude] }
 
     before do
       expect(job_class).not_to receive(:perform_later)
-      subject.geocode!(coordinates)
+      subject.update_coordinates!(coordinates)
       subject.reload
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.85
+  version: 0.0.87
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -312,6 +312,7 @@ files:
 - lib/mas/firm_repository.rb
 - lib/mas/firm_result.rb
 - lib/mas/languages.rb
+- lib/mas/model_geocoder.rb
 - lib/mas/paginateable.rb
 - lib/mas/rad_core.rb
 - lib/mas/rad_core/engine.rb
@@ -352,6 +353,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -393,6 +395,7 @@ files:
 - spec/lib/mas/firm_repository_spec.rb
 - spec/lib/mas/firm_result_spec.rb
 - spec/lib/mas/languages_spec.rb
+- spec/lib/mas/model_geocoder_spec.rb
 - spec/lib/mas/search_result_spec.rb
 - spec/models/accreditation_spec.rb
 - spec/models/adviser_spec.rb
@@ -441,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MAS RAD Core.
@@ -477,6 +480,7 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -519,6 +523,7 @@ test_files:
 - spec/lib/mas/firm_repository_spec.rb
 - spec/lib/mas/firm_result_spec.rb
 - spec/lib/mas/languages_spec.rb
+- spec/lib/mas/model_geocoder_spec.rb
 - spec/lib/mas/search_result_spec.rb
 - spec/models/accreditation_spec.rb
 - spec/models/adviser_spec.rb