govuk_content_models 10.2.0 → 10.2.1

data/app/models/edition.rb

@@ -46,7 +46,7 @@ class Edition
   }
 
   validates :title, presence: true
-  validates :version_number, presence: true
+  validates :version_number, presence: true, uniqueness: {scope: :panopticon_id}
   validates :panopticon_id, presence: true
   validates_with SafeHtml
 
@@ -54,7 +54,7 @@ class Edition
   before_destroy :destroy_artefact
 
   index "assigned_to_id"
-  index "panopticon_id"
+  index [["panopticon_id", Mongo::ASCENDING], ["version_number", Mongo::ASCENDING]], :unique => true
   index "state"
 
   class << self; attr_accessor :fields_to_clone end

data/config/mongoid.yml

@@ -3,3 +3,4 @@ test:
   database: govuk_content_shared_test
   logger: false
   use_activesupport_time_zone: true
+  autocreate_indexes: true

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -80,7 +80,11 @@ FactoryGirl.define do
 
     section "test:subsection test"
 
-    association :assigned_to, factory: :user
+    after :build do |ed|
+      if previous = ed.series.order(version_number: "desc").first
+        ed.version_number = previous.version_number + 1
+      end
+    end
 
     trait :scheduled_for_publishing do
       state 'scheduled_for_publishing'
@@ -109,28 +113,15 @@ FactoryGirl.define do
   factory :business_support_edition, :parent => :edition, :class => "BusinessSupportEdition" do
   end
 
-  factory :guide_edition do |ge|
-    panopticon_id {
-        a = create(:artefact)
-        a.id
-      }
-    ge.sequence(:title)  { |n| "Test guide #{n}" }
-    ge.sequence(:slug) { |ns| "slug-#{ns}"}
-    section { "test:subsection test" }
+  factory :guide_edition, :parent => :edition, :class => "GuideEdition" do
+    sequence(:title)  { |n| "Test guide #{n}" }
   end
 
-  factory :programme_edition do |edition|
-    panopticon_id {
-        a = create(:artefact)
-        a.id
-      }
-    edition.sequence(:title) { |n| "Test programme #{n}" }
-    edition.sequence(:slug) { |ns| "slug-#{ns}"}
-    section { "test:subsection test" }
+  factory :programme_edition, :parent => :edition, :class => "ProgrammeEdition" do
+    sequence(:title) { |n| "Test programme #{n}" }
   end
 
   factory :programme_edition_with_multiple_parts, parent: :programme_edition do
-    title "a title"
     after :create do |getp|
       getp.parts.build(title: "PART !", body: "This is some programme version text.",
                        slug: "part-one")
@@ -141,7 +132,6 @@ FactoryGirl.define do
   end
 
   factory :guide_edition_with_two_parts, parent: :guide_edition do
-    title "a title"
     after :create do |getp|
       getp.parts.build(title: "PART !", body: "This is some version text.",
                        slug: "part-one")
@@ -152,7 +142,6 @@ FactoryGirl.define do
   end
 
   factory :guide_edition_with_two_govspeak_parts, parent: :guide_edition do
-    title "A title for govspeak parts"
     after :create do |getp|
       getp.parts.build(title: "Some Part Title!",
                        body: "This is some **version** text.", slug: "part-one")
@@ -162,26 +151,13 @@ FactoryGirl.define do
     end
   end
 
-  factory :local_transaction_edition do |lte|
-    panopticon_id {
-        a = create(:artefact)
-        a.id
-      }
-    title  { "Test title" }
-    version_number 1
-    lte.sequence(:slug) { |ns| "slug-#{ns}"}
-    lte.sequence(:lgsl_code) { |nlgsl| nlgsl }
+  factory :local_transaction_edition, :parent => :edition, :class => "LocalTransactionEdition" do
+    sequence(:lgsl_code) { |nlgsl| nlgsl }
     introduction { "Test introduction" }
     more_information { "This is more information" }
   end
 
-  factory :transaction_edition do |te|
-    panopticon_id {
-        a = create(:artefact)
-        a.id
-      }
-    title  { "Test title" }
-    version_number 1
+  factory :transaction_edition, :parent => :edition, :class => "TransactionEdition" do
     introduction { "Test introduction" }
     more_information { "This is more information" }
     link "http://continue.com"
@@ -279,11 +255,7 @@ FactoryGirl.define do
     case_state 'open'
   end
 
-  factory :simple_smart_answer_edition do
-    panopticon_id {
-      a = create(:artefact)
-      a.id
-    }
+  factory :simple_smart_answer_edition, :parent => :edition, :class => "SimpleSmartAnswerEdition" do
     title "Simple smart answer"
     body "Introduction to the smart answer"
   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 = "10.2.0"
+  VERSION = "10.2.1"
 end

data/test/models/edition_test.rb

@@ -505,7 +505,7 @@ class EditionTest < ActiveSupport::TestCase
     stub_request(:get, %r{http://panopticon\.test\.gov\.uk/artefacts/.*\.js}).
         to_return(status: 200, body: "{}", headers: {})
 
-    a, b = 2.times.map { |i| GuideEdition.create!(panopticon_id: @artefact.id, title: "Guide #{i}", slug: "guide-#{i}") }
+    a, b = 2.times.map { |i| FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id) }
 
     alice, bob, charlie = %w[ alice bob charlie ].map { |s|
       FactoryGirl.create(:user, name: s)
@@ -916,27 +916,27 @@ class EditionTest < ActiveSupport::TestCase
 
   test "should update previous editions when new edition is added" do
     @user = FactoryGirl.create(:user)
-    @edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "ready")
+    @edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "archived")
     @published_edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "published")
     @new_edition = @published_edition.build_clone
-    @new_edition.save
+    @new_edition.save!
     @published_edition.reload
 
-    assert_equal 2, @new_edition.version_number
-    assert_equal 2, @published_edition.sibling_in_progress
+    assert_equal 3, @new_edition.version_number
+    assert_equal 3, @published_edition.sibling_in_progress
   end
 
   test "should update previous editions when new edition is published" do
     @user = FactoryGirl.create(:user)
-    @edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "ready")
+    @edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "archived")
     @published_edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "published")
     @new_edition = @published_edition.build_clone
-    @new_edition.save
+    @new_edition.save!
     @new_edition.update_attribute(:state, "ready")
     @user.publish(@new_edition, comment: "Publishing this")
     @published_edition.reload
 
-    assert_equal 2, @new_edition.version_number
+    assert_equal 3, @new_edition.version_number
     assert_nil @new_edition.sibling_in_progress
     assert_nil @published_edition.sibling_in_progress
   end
@@ -982,6 +982,40 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal "Foo bar", template_published_answer.artefact.name
   end
 
+  context "validating version_number" do
+    should "be required" do
+      ed = FactoryGirl.build(:edition, :panopticon_id => @artefact.id)
+      ed.version_number = nil
+      assert ! ed.valid?, "Expected edition not to be valid with no version_number"
+    end
+
+    should "be unique" do
+      ed1 = FactoryGirl.create(:edition, :panopticon_id => @artefact.id)
+      ed2 = FactoryGirl.build(:edition, :panopticon_id => @artefact.id)
+      ed2.version_number = ed1.version_number
+
+      assert ! ed2.valid?, "Expected edition not to be valid with conflicting version_number"
+    end
+
+    should "allow editions belonging to different artefacts to have matching version_numbers" do
+      ed1 = FactoryGirl.create(:edition, :panopticon_id => @artefact.id)
+      ed2 = FactoryGirl.build(:edition, :panopticon_id => FactoryGirl.create(:artefact).id)
+      ed2.version_number = ed1.version_number
+
+      assert ed2.valid?, "Expected edition to be valid"
+    end
+
+    should "have a database-level constraint on the uniqueness" do
+      ed1 = FactoryGirl.create(:edition, :panopticon_id => @artefact.id)
+      ed2 = FactoryGirl.build(:edition, :panopticon_id => @artefact.id)
+      ed2.version_number = ed1.version_number
+
+      assert_raises Mongo::OperationFailure do
+        ed2.safely.save! :validate => false
+      end
+    end
+  end
+
   context "indexable_content" do
     context "editions with a 'body'" do
       should "include the body with markup removed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 10.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -465,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1908367784692454141
+      hash: 2178874985606860121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -474,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1908367784692454141
+      hash: 2178874985606860121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23