govuk_content_models 15.1.0 → 15.1.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 15.1.1
+* Allow archiving of siblings with validation errors
+
 ## 15.1.0
 * Add draft tag functionality to `Tag.by_tag_id/s`.
 * Permit tag type to be provided via an options

data/app/models/edition.rb

@@ -236,7 +236,7 @@ class Edition
   end
 
   def was_published
-    previous_siblings.all.each(&:archive)
+    previous_siblings.each { |s| s.perform_event_without_validations(:archive) }
     notify_siblings_of_published_edition
   end
 

data/app/models/workflow.rb

@@ -221,6 +221,13 @@ module Workflow
     published? ? 'Published editions' : 'Editions scheduled for publishing'
   end
 
+  def perform_event_without_validations(event)
+    # http://rubydoc.info/github/pluginaweek/state_machine/StateMachine/Machine:event
+    # pass false to transition state without performing state machine actions
+    public_send(event, false)
+    save(validate: false)
+  end
+
   private
 
     def publish_at_is_in_the_future

data/app/models/workflow_actor.rb

@@ -95,11 +95,7 @@ module WorkflowActor
 
   # Always records the action.
   def receive_fact_check(edition, details)
-    # advance state if possible (i.e. if in "fact_check" state),
-    # save separately without validation
-    # http://rubydoc.info/github/pluginaweek/state_machine/StateMachine/Machine:event
-    edition.receive_fact_check(false)
-    edition.save(validate: false)
+    edition.perform_event_without_validations(:receive_fact_check)
     # Fact checks are processed async, so the user doesn't get an opportunity
     # to retry without the content that (inadvertantly) fails validation, which happens frequently.
     record_action_without_validation(edition, :receive_fact_check, details)

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 = "15.1.0"
+  VERSION = "15.1.1"
 end

data/test/models/edition_test.rb

@@ -655,20 +655,23 @@ class EditionTest < ActiveSupport::TestCase
     assert_not_nil GuideEdition.where(state: "published", panopticon_id: edition.panopticon_id).first
   end
 
-  test "when an edition of a guide is published, all other published editions are archived" do
-    edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "ready")
+  test "should archive older editions, even if there are validation errors, when a new edition is published" do
+    edition = FactoryGirl.create(:guide_edition_with_two_parts, panopticon_id: @artefact.id, state: "ready")
 
     user = User.create name: "bob"
     user.publish edition, comment: "First publication"
 
     second_edition = edition.build_clone
-    second_edition.update_attribute(:state, "ready")
-    second_edition.save!
+    second_edition.state = "ready"
     user.publish second_edition, comment: "Second publication"
 
+    # simulate link validation errors in published edition
+    second_edition.parts.first.update_attribute(:body, "[register your vehicle](registering-an-imported-vehicle)")
+
     third_edition = second_edition.build_clone
-    third_edition.update_attribute(:state, "ready")
-    third_edition.save!
+    # fix link validation error in cloned edition by appending a '/' to the relative url
+    third_edition.parts.first.body = "[register your vehicle](/registering-an-imported-vehicle)"
+    third_edition.state = "ready"
     user.publish third_edition, comment: "Third publication"
 
     edition.reload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 15.1.0
+  version: 15.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -466,7 +466,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -630092204464727193
+      hash: -4160553769298563389
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -630092204464727193
+      hash: -4160553769298563389
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23