mas-rad_core 0.0.101 → 0.0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc90386da6d397b1372dca8f68182393a58b11cd
-  data.tar.gz: 50628c928c75c79ea774fc00f21510811e119fea
+  metadata.gz: 24f4ec598a3a7418e8ad65db835de6b4530f920d
+  data.tar.gz: 25aeb27b4f4d323b1c64efd6aff4d25b46ff4b25
 SHA512:
-  metadata.gz: 2543c14010a5ed3f4571c0505d99b87da999c7762a78e9f563baaa571c2149f887f897af6234b5f7de80efbb3e2a258bc62a78eb7c577e827bc1bd4d8a4360e5
-  data.tar.gz: f297e1105ad4cad9a9157d5bdcff4219db957feae360984c0bb539d21d859edc4e2d5f6728e9f617dd1351bcc50f9318b55e7c66b5484a3f8b4808a31d37783d
+  metadata.gz: 4f5791c9451f3f9604539b4cc9863ee40b51a5ec14533ca3fe349ba5d1c3e4369952090bea7c719d809c3817ee30c653e1c844a2975de50bfcaed3b03604ab8a
+  data.tar.gz: 005578a9bf1337789d312cb0138c6775d4aa1aa80a4fdd1b0dd6fb00949c8f00ecd26d8921a74e8209120358d503d6b599f023a86dd950c85565417a9a3b04a9

data/app/models/office.rb

@@ -1,4 +1,5 @@
 require 'uk_postcode'
+require 'uk_phone_numbers'
 
 class Office < ActiveRecord::Base
   include Geocodable
@@ -18,10 +19,7 @@ class Office < ActiveRecord::Base
     length: { maximum: 50 },
     format: { with: /.+@.+\..+/ }
 
-  validates :telephone_number,
-    presence: false,
-    length: { maximum: 30 },
-    format: { with: /\A[0-9 ]+\z/ }
+  validate :telephone_number_is_valid
 
   validates :address_line_one,
     presence: true,
@@ -61,8 +59,12 @@ class Office < ActiveRecord::Base
     ]
   end
 
+  def telephone_number=(new_phone_number)
+    super cleanup_telephone_number(new_phone_number)
+  end
+
   def telephone_number
-    super.try { |x| x.gsub(' ', '') }
+    return format_telephone_number(cleanup_telephone_number(super))
   end
 
   def full_street_address
@@ -95,5 +97,18 @@ class Office < ActiveRecord::Base
       errors.add(:address_postcode, 'is invalid')
     end
   end
-end
 
+  def telephone_number_is_valid
+    if telephone_number.nil? || !UKPhoneNumbers.valid?(telephone_number.gsub(' ', ''))
+      errors.add(:telephone_number, I18n.t("#{model_name.i18n_key}.telephone_number.invalid_format"))
+    end
+  end
+
+  def cleanup_telephone_number(telephone_number)
+    telephone_number.try { |t| t.gsub(/\s+/, ' ').strip }
+  end
+
+  def format_telephone_number(telephone_number)
+    telephone_number.try { |t| UKPhoneNumbers.format(t) || t }
+  end
+end

data/db/migrate/20160222091312_remove_other_accreditation.rb

@@ -0,0 +1,19 @@
+class RemoveOtherAccreditation < ActiveRecord::Migration
+  class Accreditation < ActiveRecord::Base
+  end
+
+  def up
+    Accreditation.where(name: 'Other').destroy_all
+  end
+
+  def down
+    # Unfortunately we can't just insert the 'Other' record, as there are parts
+    # of `rad` and `rad_consumer` which rely on the 'Other' record having the
+    # ID of '5'. This is due to translations and configuring whether or not to
+    # show the record.
+    #
+    # You're allowed to roll back this migration, but be aware that if you're
+    # using an older version of `rad` or `rad_consumer` they may throw errors
+    # if this record doesn't exist.
+  end
+end

data/lib/mas/office_result.rb

@@ -15,10 +15,4 @@ class OfficeResult
     @disabled_access  = data['disabled_access']
     @location = Location.new data['location']['lat'], data['location']['lon']
   end
-
-  def telephone_number
-    return nil unless @telephone_number
-
-    UKPhoneNumbers.format(@telephone_number)
-  end
 end

data/lib/mas/rad_core/version.rb

@@ -1,5 +1,5 @@
 module MAS
   module RadCore
-    VERSION = '0.0.101'
+    VERSION = '0.0.102'
   end
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160211161127) do
+ActiveRecord::Schema.define(version: 20160222091312) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

data/spec/factories/office.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
     address_county { Faker::Address.state }
     address_postcode 'EC1N 2TD'
     email_address { Faker::Internet.email }
-    telephone_number { Faker::Base.numerify('##### ### ###') }
+    telephone_number '07111 333 222'
     disabled_access { [true, false].sample }
     latitude  { Faker::Address.latitude.to_f.round(6) }
     longitude { Faker::Address.longitude.to_f.round(6) }

data/spec/factories/principal.rb

@@ -7,7 +7,7 @@ FactoryGirl.define do
     last_name { Faker::Name.last_name }
     email_address { Faker::Internet.email(first_name) }
     job_title { Faker::Name.title }
-    telephone_number { Faker::Base.numerify('##### ### ###') }
+    telephone_number '07111 333 222'
     confirmed_disclaimer true
 
     after(:build) { |p| create(:lookup_firm, fca_number: p.fca_number) }

data/spec/lib/mas/office_result_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe OfficeResult do
       'address_county'   => 'Cumbria',
       'address_postcode' => 'LA8 9BE',
       'email_address'    => 'postie@example.com',
-      'telephone_number' => '02085952346',
+      'telephone_number' => '020 8595 2346',
       'disabled_access'  => true,
       'location' => { 'lat' => 51.5180697, 'lon' => -0.1085203 }
     }

data/spec/models/office_spec.rb

@@ -67,6 +67,28 @@ RSpec.describe Office do
     end
   end
 
+  describe '#telephone_number=' do
+    context 'when `nil`' do
+      before { office.telephone_number = nil }
+
+      it 'returns `nil`' do
+        expect(office.telephone_number).to be_nil
+      end
+    end
+
+    context 'when provided' do
+      it 'removes whitespace from the front and back' do
+        office.telephone_number = ' 07715 930 457  '
+        expect(office.telephone_number).to eq('07715 930 457')
+      end
+
+      it 'removes extraneous whitespace' do
+        office.telephone_number = '07715    930    457'
+        expect(office.telephone_number).to eq('07715 930 457')
+      end
+    end
+  end
+
   describe '#telephone_number' do
     context 'when `nil`' do
       before { office.telephone_number = nil }
@@ -77,10 +99,19 @@ RSpec.describe Office do
     end
 
     context 'when provided' do
-      before { office.telephone_number = ' 07715 930 457  ' }
+      it 'removes whitespace from the front and back' do
+        office.update_column(:telephone_number, ' 07715 930 457  ')
+        expect(office.telephone_number).to eq('07715 930 457')
+      end
 
-      it 'removes whitespace' do
-        expect(office.telephone_number).to eq('07715930457')
+      it 'removes extraneous whitespace' do
+        office.update_column(:telephone_number, '07715    930    457')
+        expect(office.telephone_number).to eq('07715 930 457')
+      end
+
+      it 'formats if there is no whitespace at all' do
+        office.update_column(:telephone_number, '07715930457')
+        expect(office.telephone_number).to eq('07715 930457')
       end
     end
   end
@@ -114,21 +145,71 @@ RSpec.describe Office do
     end
 
     describe 'telephone number' do
-      context 'when not present' do
-        before { office.telephone_number = nil }
+      # See http://www.area-codes.org.uk/formatting.php#programmers for background info
 
-        it { is_expected.to_not be_valid }
-      end
+      context 'invalid inputs' do
+        context 'when not present' do
+          before { office.telephone_number = nil }
 
-      context 'when badly formatted' do
-        before { office.telephone_number = 'not-valid' }
+          it { is_expected.to_not be_valid }
+        end
 
-        it { is_expected.to_not be_valid }
+        context 'when the input characters other than spaces or numbers' do
+          before { office.telephone_number = 'not-numbers-or-spaces' }
+
+          it { is_expected.to_not be_valid }
+        end
+
+        context 'when the area code is not specified' do
+          before { office.telephone_number = '917561' }
+
+          it { is_expected.to_not be_valid }
+        end
+
+        context 'when the prefix is not a 0' do
+          before { office.telephone_number = '7816917560' }
+
+          it { is_expected.to_not be_valid }
+        end
+
+        context 'when the prefix is not a real area code' do
+          # Currently 04 and 06 are not valid prefixes
+          before { office.telephone_number = '04816 917560' }
+
+          it { is_expected.to_not be_valid }
+        end
+
+        context 'when the prefix is a +nn country code' do
+          before { office.telephone_number = '+44 7816917560' }
+
+          it { is_expected.to_not be_valid }
+        end
+
+        context 'when the prefix is a 00nn international access code' do
+          before { office.telephone_number = '0044 7816917560' }
+
+          it { is_expected.to_not be_valid }
+        end
+
+        context 'when the prefix is a nn international access code' do
+          before { office.telephone_number = '447816917560' }
+
+          it { is_expected.to_not be_valid }
+        end
       end
 
-      context 'length' do
-        specify { expect_length_of(office, :telephone_number, 30, fill_char: '0').to be_valid }
-        specify { expect_length_of(office, :telephone_number, 31, fill_char: '0').not_to be_valid }
+      context 'valid inputs' do
+        context 'when it has no spaces' do
+          before { office.telephone_number = '07816917561' }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when it has spaces' do
+          before { office.telephone_number = '07816 917 561' }
+
+          it { is_expected.to be_valid }
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.101
+  version: 0.0.102
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -328,6 +328,7 @@ files:
 - db/migrate/20151111132037_remove_latitude_and_longitude_from_firm.rb
 - db/migrate/20160205150033_add_bypass_reference_number_check_to_advisers.rb
 - db/migrate/20160211161127_create_snapshots.rb
+- db/migrate/20160222091312_remove_other_accreditation.rb
 - lib/mas/adviser_result.rb
 - lib/mas/elastic_search_client.rb
 - lib/mas/firm_indexer.rb