govuk_content_models 31.2.2 → 31.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1c8b1bd6abb500ea8be7aa4e1d19b2b3f8491d2
-  data.tar.gz: 3d67a926016a63a09f2320a97da203eb49032345
+  metadata.gz: 958538091c31245d3c30d1007839a122b43e661b
+  data.tar.gz: d80419824d3224945339326583163a70c018fe9b
 SHA512:
-  metadata.gz: 912c6673c12165718b90b0ab1fca381c9588cb0dc232f2dbeb61d454f1fe5ef20201d56ed4891224cc03d0846ea950864d914939fa8820dcad9a4db2101159b2
-  data.tar.gz: 3e8c841fd6212244b754967511ea4cb0ee5b6626d3de3dcc262cfd6ace82e723954d6a1e1f43235938a579fa1458eae36a4bed9f9bc77797412f59dead5015e4
+  metadata.gz: ce9da9e40bc9b2fb21aaa114b1713e4c495b0ce74ed7d5370d5be96d91a0fd622fd77930078701913d7afdbbe77d3ec936fd6a858efe282bcaf1412e3afb5b44
+  data.tar.gz: dd73d319e49c6c15db262f85f25e8d2eb6ebe9389a76dfc62ed5325592eeac4b95b30c00830dc9dfe1d5960109f4917acde09f3065878ea86cb3186645abea2d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 31.3.0
+
+- Include matching type-specific fields when converting editions
+
 ## 31.2.2
 
 - Add "official_statistics" artefact format

data/app/models/edition.rb

@@ -174,7 +174,7 @@ class Edition
     if target_class == self.class
       base_field_keys + type_specific_field_keys
     else
-      base_field_keys
+      base_field_keys + common_type_specific_field_keys(target_class)
     end
   end
 
@@ -341,4 +341,8 @@ private
   def type_specific_field_keys
     (self.fields.keys - Edition.fields.keys).map(&:to_sym)
   end
+
+  def common_type_specific_field_keys(target_class)
+    ((self.fields.keys & target_class.fields.keys) - Edition.fields.keys).map(&:to_sym)
+  end
 end

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -217,7 +217,7 @@ FactoryGirl.define do
     lgil_code 0
   end
 
-  factory :place_edition do
+  factory :place_edition, parent: :edition, class: 'PlaceEdition'  do
     title "Far far away"
     introduction "Test introduction"
     more_information "More information"

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.2.2"
+  VERSION = "31.3.0"
 end

data/test/models/edition_test.rb

@@ -417,6 +417,12 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal 7, new_edition.parts.size #there are 5 'default' parts plus an additional two created by the factory
   end
 
+  test "knows the common fields of two edition subclasses" do
+    to_copy = Set.new([:introduction, :need_to_know, :more_information])
+    result = Set.new(TransactionEdition.new.fields_to_copy(PlaceEdition))
+    assert to_copy.proper_subset?(result)
+  end
+
   # Mongoid 2.x marks array fields as dirty whenever they are accessed.
   # See https://github.com/mongoid/mongoid/issues/2311
   # This behaviour has been patched in lib/mongoid/monkey_patches.rb

metadata

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