govuk_content_models 28.2.0 → 28.3.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 28.3.0
+
+- Add error message when validating primary and additional topics
+- Embed part errors within edition errors
+
 ## 28.2.0
 
 - Add an index for `created_at` on Edition.

data/app/models/parted.rb

@@ -5,6 +5,7 @@ module Parted
     klass.embeds_many :parts
     klass.accepts_nested_attributes_for :parts, allow_destroy: true,
       reject_if: proc { |attrs| attrs["title"].blank? and attrs["body"].blank? }
+    klass.after_validation :merge_embedded_parts_errors
   end
 
   def build_clone(edition_class=nil)
@@ -29,4 +30,18 @@ module Parted
   def whole_body
     self.parts.map {|i| %Q{\# #{i.title}\n\n#{i.body}} }.join("\n\n")
   end
+
+  private
+
+  def merge_embedded_parts_errors
+    return if parts.empty?
+
+    if errors.delete(:parts) == ["is invalid"]
+      parts_errors = parts.inject({}) do |result, part|
+        result["#{part._id}:#{part.order}"] = part.errors.messages if part.errors.present?
+        result
+      end
+      errors.add(:parts, parts_errors)
+    end
+  end
 end

data/app/validators/link_validator.rb

@@ -7,7 +7,7 @@ class LinkValidator < ActiveModel::Validator
       next if govspeak_field_value.blank?
 
       messages = errors(govspeak_field_value)
-      record.errors[govspeak_field_name] << messages if messages
+      record.errors[govspeak_field_name] << messages unless messages.blank?
     end
   end
 

data/app/validators/topic_validator.rb

@@ -7,6 +7,7 @@ class TopicValidator < ActiveModel::Validator
 
       if additional_topics.include?(record.primary_topic)
         record.errors.add(:base, "You can't have the primary topic set as an additional topic")
+        record.errors.add(:additional_topics, "can't have the primary topic set as an additional topic")
       end
     end
   end

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 = "28.2.0"
+  VERSION = "28.3.0"
 end

data/test/models/parted_test.rb

@@ -0,0 +1,18 @@
+require "test_helper"
+# require "edition"
+# require "parted"
+
+class PartedTest < ActiveSupport::TestCase
+  test "should merge part validation errors with parent document's errors" do
+    edition = FactoryGirl.create(:guide_edition)
+    edition.parts.build(_id: '54c10d4d759b743528000010', order: '1', title: "", slug: "overview")
+    edition.parts.build(_id: '54c10d4d759b743528000011', order: '2', title: "Prepare for your appointment", slug: "")
+    edition.parts.build(_id: '54c10d4d759b743528000012', order: '3', title: "Valid", slug: "valid")
+
+    refute edition.valid?
+
+    assert_equal({title: ["can't be blank"]}, edition.errors[:parts][0]['54c10d4d759b743528000010:1'])
+    assert_equal({slug: ["can't be blank", "is invalid"]}, edition.errors[:parts][0]['54c10d4d759b743528000011:2'])
+    assert_equal 2, edition.errors[:parts][0].length
+  end
+end

data/test/validators/link_validator_test.rb

@@ -23,6 +23,13 @@ class LinkValidatorTest < ActiveSupport::TestCase
       assert_empty doc.errors
     end
 
+    should "not contain empty array for errors on fields" do
+      doc = Dummy.new(body: "Nothing is invalid")
+
+      assert doc.valid?
+      assert_empty doc.errors[:body]
+    end
+
     should "start with http[s]://, mailto: or /" do
       doc = Dummy.new(body: "abc [external](external.com)")
       assert doc.invalid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 28.2.0
+  version: 28.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -440,6 +440,7 @@ files:
 - test/models/local_transaction_edition_test.rb
 - test/models/manual_change_history_test.rb
 - test/models/overview_dashboard_test.rb
+- test/models/parted_test.rb
 - test/models/prerendered_entity_tests.rb
 - test/models/rendered_manual_test.rb
 - test/models/rendered_specialist_document_test.rb
@@ -477,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3094189113344547894
+      hash: 2774210225727487391
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -486,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3094189113344547894
+      hash: 2774210225727487391
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -522,6 +523,7 @@ test_files:
 - test/models/local_transaction_edition_test.rb
 - test/models/manual_change_history_test.rb
 - test/models/overview_dashboard_test.rb
+- test/models/parted_test.rb
 - test/models/prerendered_entity_tests.rb
 - test/models/rendered_manual_test.rb
 - test/models/rendered_specialist_document_test.rb