govuk_content_models 26.1.0 → 26.2.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 26.2.0
+- Adds `reviewer` `String` field to `Edition` class.
+
 ## 26.1.0
 - Adds `review_requested_at` `DateTime` field to `Edition` class.
 

data/app/models/edition.rb

@@ -26,6 +26,7 @@ class Edition
   field :additional_topics,    type: Array, default: []
 
   field :assignee,             type: String
+  field :reviewer,             type: String
   field :creator,              type: String
   field :publisher,            type: String
   field :archiver,             type: String
@@ -56,7 +57,7 @@ class Edition
   validates :panopticon_id, presence: true
   validates_with SafeHtml
   validates_with LinkValidator, on: :update
-  validates_with TopicValidator, BrowsePageValidator
+  validates_with TopicValidator, BrowsePageValidator, ReviewerValidator
   validates_presence_of :change_note, if: :major_change
 
   before_save :check_for_archived_artefact

data/app/models/workflow.rb

@@ -28,6 +28,10 @@ module Workflow
         edition.publish_at = nil
       end
 
+      before_transition on: [:approve_review, :request_amendments] do |edition, transition|
+        edition.reviewer = nil
+      end
+
       after_transition on: :publish do |edition, transition|
         edition.was_published
       end

data/app/validators/reviewer_validator.rb

@@ -0,0 +1,20 @@
+class ReviewerValidator < ActiveModel::Validator
+  def validate(record)
+    if record.reviewer
+      validate_reviewer_in_review(record)
+      validate_reviewer_not_assignee(record)
+    end
+  end
+
+private
+  def validate_reviewer_in_review(record)
+    unless record.in_review?
+      record.errors.add(:reviewer, "can only be set when in review")
+    end
+  end
+  def validate_reviewer_not_assignee(record)
+    if record.assigned_to and record.reviewer == record.assigned_to.name
+      record.errors.add(:reviewer, "can't be the assignee")
+    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 = "26.1.0"
+  VERSION = "26.2.0"
 end

data/test/models/edition_test.rb

@@ -131,6 +131,15 @@ class EditionTest < ActiveSupport::TestCase
     end
   end
 
+  test "reviewer cannot be the assignee" do
+    user = FactoryGirl.create(:user)
+    edition = Edition.new(title: "Edition", version_number: 1, panopticon_id: 123,
+                          state: "in_review", review_requested_at: Time.zone.now, assigned_to: user)
+    edition.reviewer = user.name
+    refute edition.valid?
+    assert edition.errors.has_key?(:reviewer)
+  end
+
   test "it should build a clone" do
     edition = FactoryGirl.create(:guide_edition,
                                   state: "published",

data/test/models/workflow_test.rb

@@ -118,6 +118,14 @@ class WorkflowTest < ActiveSupport::TestCase
     assert_in_delta Time.zone.now.to_f, guide.review_requested_at.to_f, 1.0
   end
 
+  test "a guide not in review cannot have a reviewer" do
+    guide = template_guide
+    refute guide.in_review?
+    guide.reviewer = "Bob"
+    refute guide.valid?
+    assert guide.errors.has_key?(:reviewer)
+  end
+
   test "guide workflow" do
     user = User.create(name: "Ben")
     other_user = User.create(name: "James")
@@ -210,9 +218,14 @@ class WorkflowTest < ActiveSupport::TestCase
     edition = guide
 
     request_review(user, edition)
+
+    edition.reviewer = other_user
+    edition.save!
+
     approve_review(other_user, edition)
-    request_amendments(other_user, edition)
+    assert_nil edition.reviewer
 
+    request_amendments(other_user, edition)
     assert_equal "More amendments are required", edition.actions.last.comment
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 26.1.0
+  version: 26.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -378,6 +378,7 @@ files:
 - app/traits/taggable.rb
 - app/validators/browse_page_validator.rb
 - app/validators/link_validator.rb
+- app/validators/reviewer_validator.rb
 - app/validators/safe_html.rb
 - app/validators/slug_validator.rb
 - app/validators/tag_id_validator.rb
@@ -474,7 +475,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3310978517269698520
+      hash: -724937649554228680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -483,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3310978517269698520
+      hash: -724937649554228680
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23