govuk_content_models 35.0.1 → 36.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 818153ae9ec98e66cebfcb9754ad00b7a447ffd4
-  data.tar.gz: e4f79124027a88b3353477a4a62853de0cc846e9
+  metadata.gz: 78511b72b76121386601a27a3406e48cdbdb12ee
+  data.tar.gz: 8b6f3505b3570a4e9015c752ef6b31eaaa3d9917
 SHA512:
-  metadata.gz: e5610c8661285a6a4f06889daa260e339db47318c6ecb3f3046a4f1c3f4a1e790581dfd59eb42c776a3cd8d8276cda9fd4c877111575ecf20546e965378d6922
-  data.tar.gz: 913527e1c41880a7a952271141656107a226d17056c2340f215f11f22e5a04970dbd85ef506e5e5235e818b177c1461759e484ae8565f8376862505a3870c5ae
+  metadata.gz: fc472a37b621228b0d1dc12a61a429a38d8ffab42af3d682afbc100a83c32dfeaad62a887cebb5776ecb5cd5d515a196e9efc614544e23f38f581a11a65c7446
+  data.tar.gz: 7cfe6d0c2585856f333686db8bf9d1a9055752fdd01f381aae4a19647d7218a61b9932145ac32aeb505614ca8acf73a4c404e8e28b96183fc2a196f6cad1833b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 36.0.0
+
+- Remove fields from LocalAuthority
+  - `contact_address`
+  - `contact_url`
+  - `contact_phone`
+  - `contact_email`
+
 ## 35.0.1
 
 - Handle saving changes to promotion toggles correctly for existing documents [#381](https://github.com/alphagov/govuk_content_models/pull/381)

data/app/models/local_authority.rb

@@ -11,10 +11,6 @@ class LocalAuthority
   field :snac,               type: String
   field :local_directgov_id, type: Integer
   field :tier,               type: String
-  field :contact_address,    type: Array
-  field :contact_url,        type: String
-  field :contact_phone,      type: String
-  field :contact_email,      type: String
   field :homepage_url,       type: String
 
   validates_uniqueness_of :snac

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -48,7 +48,7 @@ FactoryGirl.define do
     sequence(:slug) { |n| "slug-#{n}" }
     kind            Artefact::FORMATS.first
     owning_app      'publisher'
-    content_id      { SecureRandom.uuid } 
+    content_id      { SecureRandom.uuid }
 
     trait :whitehall do
       sequence(:slug) {|n| "government/slug--#{n}"}
@@ -216,13 +216,6 @@ FactoryGirl.define do
     tier "county"
   end
 
-  factory :local_authority_with_contact, parent: :local_authority do
-    contact_address ["line one", "line two", "line three"]
-    contact_url "http://www.magic.com/contact"
-    contact_phone "0206778654"
-    contact_email "contact@local.authority.gov.uk"
-  end
-
   factory :local_interaction do
     association :local_authority
     url "http://some.council.gov/do.html"

data/lib/govuk_content_models/test_helpers/local_services.rb

@@ -1,6 +1,6 @@
 module LocalServicesHelper
   def make_authority(tier, options)
-    authority = FactoryGirl.create(:local_authority_with_contact,
+    authority = FactoryGirl.create(:local_authority,
                                    snac: options[:snac], tier: tier)
     add_service_interaction(authority, options[:lgsl]) if options[:lgsl]
     authority

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "35.0.1"
+  VERSION = "36.0.0"
 end

data/test/models/local_authority_test.rb

@@ -13,20 +13,12 @@ describe LocalAuthority do
                   snac: "AA00",
                   local_directgov_id: 1,
                   tier: "county",
-                  contact_address: ["Line one", "line two", "line three"],
-                  contact_url: "http://example.gov/contact",
-                  contact_phone: "0000000000",
-                  contact_email: "contact@example.gov",
                   homepage_url: 'http://example.gov/')
     authority = LocalAuthority.first
     assert_equal "Example", authority.name
     assert_equal "AA00", authority.snac
     assert_equal 1, authority.local_directgov_id
     assert_equal "county", authority.tier
-    assert_equal ["Line one", "line two", "line three"], authority.contact_address
-    assert_equal "http://example.gov/contact", authority.contact_url
-    assert_equal "0000000000", authority.contact_phone
-    assert_equal "contact@example.gov", authority.contact_email
     assert_equal "http://example.gov/", authority.homepage_url
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 35.0.1
+  version: 36.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext