govuk_content_models 31.4.0 → 32.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40258d79cad346c7ad24fd75eab16db040358d7c
-  data.tar.gz: fbcb1c49048321f69113c637c9abdd16a00391f8
+  metadata.gz: 6af733bb83f5e4d60a3c405a5492056904e47122
+  data.tar.gz: e5f073c62dd6f5ed47794f3d25e0ea2a82fd7407
 SHA512:
-  metadata.gz: be04aedd7bb95a1523e44da86185e2004fd21b2dc5fc916e814ea9deee7c4d34e9b3137e7d7c19322e69b6b5f9a715c75b480839b879af8c7456be4289bce41b
-  data.tar.gz: 535ca3d75b80953e884fd95cdb8d21cd2b36150f01981b50da64111943288626c9415e82762e81e2c557b8d2409738664d24eee910280ed21fd23af84a0b26ee
+  metadata.gz: a94e635fc55b8526aac787f1d7f72e27e198d9f09704a7c4c577d4cd4668ebe3f3d3d78a4e5de52686c9b34dcb8ab3700801228ae6b82b822209fcae4d5a86d9
+  data.tar.gz: 547d3b7c4ae53e4e8715e1d8e53df28190a884e112bd6349c4c3f1555c9f3f929fa04645c77258cd71c6b62b47482ffe72edc2ff02c1893b02673a7777d8b613

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 32.0.0
+
+- Add body and default parts to mainstream format factories
+- Remove areas field from BusinessSupportEditions and replace with area_gss_codes, which are more stable
+
 ## 31.4.0
 
 - Allow URLs with fragments in Artefact#redirect_url

data/app/models/business_support_edition.rb

@@ -28,7 +28,6 @@ class BusinessSupportEdition < Edition
   field :support_types,   type: Array, default: []
   field :start_date,      type: Date
   field :end_date,        type: Date
-  field :areas,           type: Array, default: []
   field :area_gss_codes,  type: Array, default: []
 
   GOVSPEAK_FIELDS = [:body, :eligibility, :evaluation, :additional_information]
@@ -46,7 +45,7 @@ class BusinessSupportEdition < Edition
 
 
   def whole_body
-    [short_description, body].join("\n\n")
+    [short_description, body, additional_information].join("\n\n")
   end
 
   private

data/app/models/edition.rb

@@ -211,6 +211,7 @@ class Edition
 
   def clone_whole_body_from(origin_edition)
     if self.respond_to?(:parts)
+      self.setup_default_parts if self.respond_to?(:setup_default_parts)
       self.parts.build(title: "Part One", body: origin_edition.whole_body, slug: "part-one")
     elsif self.respond_to?(:more_information=)
       self.more_information = origin_edition.whole_body

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -114,20 +114,25 @@ FactoryGirl.define do
     trait :published do
       state 'published'
     end
+
+    trait :with_body do
+      body 'Some body text'
+    end
+
   end
-  factory :answer_edition, parent: :edition do
+  factory :answer_edition, traits: [:with_body], parent: :edition do
   end
 
-  factory :help_page_edition, :parent => :edition, :class => 'HelpPageEdition' do
+  factory :help_page_edition, traits: [:with_body], :parent => :edition, :class => 'HelpPageEdition' do
   end
 
-  factory :campaign_edition, :parent => :edition, :class => 'CampaignEdition' do
+  factory :campaign_edition, traits: [:with_body], :parent => :edition, :class => 'CampaignEdition' do
   end
 
-  factory :completed_transaction_edition, :parent => :edition, :class => 'CompletedTransactionEdition' do
+  factory :completed_transaction_edition, traits: [:with_body], :parent => :edition, :class => 'CompletedTransactionEdition' do
   end
 
-  factory :video_edition, parent: :edition, :class => 'VideoEdition' do
+  factory :video_edition, traits: [:with_body], parent: :edition, :class => 'VideoEdition' do
   end
 
   factory :business_support_edition, :parent => :edition, :class => "BusinessSupportEdition" do

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 = "31.4.0"
+  VERSION = "32.0.0"
 end

data/test/models/business_support_edition_test.rb

@@ -25,7 +25,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
     support.contact_details = "123 The Street, Townsville, UK. 07324 123456"
 
     support.priority = 2
-    support.areas = ["123","345","45","9"]
     support.area_gss_codes = ["G123","G345","G45","G9"]
     support.business_sizes << "up-to-249"
     support.business_types << "charity"
@@ -55,7 +54,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
 
     assert_equal 2, support.priority
 
-    assert_equal ["123","345","45","9"], support.areas
     assert_equal ["G123","G345","G45","G9"], support.area_gss_codes
     assert_equal ["up-to-249"], support.business_sizes
     assert_equal ["charity"], support.business_types
@@ -153,7 +151,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
       :continuation_link => "http://www.gov.uk",
       :contact_details => "Contact details to be cloned",
       :priority => 2,
-      :areas => ['123','9999'],
       :area_gss_codes => ['G123','G9999'],
       :business_sizes => ['up-to-249'],
       :locations => ['london'],
@@ -181,7 +178,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
     assert_equal support.contact_details, new_support.contact_details
 
     assert_equal support.priority, new_support.priority
-    assert_equal support.areas, new_support.areas
     assert_equal support.area_gss_codes, new_support.area_gss_codes
     assert_equal support.business_sizes, new_support.business_sizes
     assert_equal support.locations, new_support.locations
@@ -197,7 +193,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
     setup do
       @e1 = FactoryGirl.create(
         :business_support_edition,
-        :areas => ['2345', '1234'],
         :area_gss_codes => ['G2345', 'G1234'],
         :business_sizes => ['1', 'up-to-1000000'],
         :locations => ['narnia'],
@@ -208,7 +203,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
       )
       @e2 = FactoryGirl.create(
         :business_support_edition,
-        :areas => ['1212', '1234', '999'],
         :area_gss_codes => ['G1212', 'G1234', 'G999'],
         :business_sizes => ['1', 'up-to-1000000'],
         :locations => ['hades', 'narnia'],
@@ -219,7 +213,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
       )
       @e3 = FactoryGirl.create(
         :business_support_edition,
-        :areas => ['1234'],
         :area_gss_codes => ['G1234'],
         :business_sizes => ['up-to-249', 'up-to-1000000'],
         :locations => ['hades', 'chicken-town'],
@@ -244,7 +237,6 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
     end
     should "support searching with all the facet values" do
       editions = BusinessSupportEdition.for_facets({
-        :areas => '1234',
         :area_gss_codes => 'G1234',
         :business_sizes => 'up-to-1000000',
         :locations => 'narnia,hades,chicken-town',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 31.4.0
+  version: 32.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext