govuk_content_models 11.2.0 → 11.3.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 11.3.0
+
+* When an artefact is saved, no longer attempt to update attributes on the
+  edition model - with the exception of the slug field, which will only be
+  updated when the artefact is in draft state.
+
 ## 11.2.0
 
 * Added manual and manual-section formats with custom slug validation.

data/app/models/artefact.rb

@@ -278,12 +278,13 @@ class Artefact
   end
 
   def update_editions
-    if state != 'archived'
+    case state
+    when 'draft'
       Edition.where(:state.nin => ["archived"],
                     panopticon_id: self.id).each do |edition|
-        edition.update_from_artefact(self)
+        edition.update_slug_from_artefact(self)
       end
-    else
+    when 'archived'
       archive_editions
     end
   end

data/app/models/edition.rb

@@ -239,12 +239,8 @@ class Edition
     notify_siblings_of_published_edition
   end
 
-  def update_from_artefact(artefact)
-    self.title = artefact.name unless published?
+  def update_slug_from_artefact(artefact)
     self.slug = artefact.slug
-    self.section = artefact.section
-    self.department = artefact.department
-    self.business_proposition = artefact.business_proposition
     self.save!
   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 = "11.2.0"
+  VERSION = "11.3.0"
 end

data/test/models/artefact_test.rb

@@ -306,29 +306,36 @@ class ArtefactTest < ActiveSupport::TestCase
     end
   end
 
-  test "on save update metadata with associated publication" do
-    FactoryGirl.create(:tag, tag_id: "test-section", title: "Test section", tag_type: "section")
-    artefact = FactoryGirl.create(:artefact,
-        slug: "foo-bar",
-        kind: "answer",
-        name: "Foo bar",
-        primary_section: "test-section",
-        sections: ["test-section"],
-        department: "Test dept",
-        owning_app: "publisher",
-    )
+  should "update the edition's slug when a draft artefact is saved" do
+    artefact = FactoryGirl.create(:draft_artefact)
+    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id)
 
-    user1 = FactoryGirl.create(:user)
-    edition = AnswerEdition.find_or_create_from_panopticon_data(artefact.id, user1, {})
+    artefact.slug = "something-something-draft"
+    artefact.save!
 
-    assert_equal artefact.name, edition.title
-    assert_equal artefact.section, edition.section
+    edition.reload
+    assert_equal artefact.slug, edition.slug
+  end
 
-    artefact.name = "Babar"
-    artefact.save
+  should "not update the edition's slug when a live artefact is saved" do
+    artefact = FactoryGirl.create(:live_artefact, slug: "something-something-live")
+    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id, slug: "something-else")
+
+    artefact.save!
 
     edition.reload
-    assert_equal artefact.name, edition.title
+    assert_equal "something-else", edition.slug
+  end
+
+  should "not update the edition's slug when an archived artefact is saved" do
+    artefact = FactoryGirl.create(:live_artefact, slug: "something-something-live")
+    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id, slug: "something-else")
+
+    artefact.state = 'archived'
+    artefact.save!
+
+    edition.reload
+    assert_equal "something-else", edition.slug
   end
 
   test "should not let you edit the slug if the artefact is live" do

data/test/models/edition_test.rb

@@ -375,33 +375,6 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal artefact.department, publication.department
   end
 
-  # TODO: come back and remove this one.
-  test "should not change edition name if published" do
-    FactoryGirl.create(:tag, tag_id: "test-section", title: "Test section", tag_type: "section")
-    artefact = FactoryGirl.create(:artefact,
-        slug: "foo-bar",
-        kind: "answer",
-        name: "Foo bar",
-        department: "Test dept",
-        owning_app: "publisher",
-    )
-
-    guide = FactoryGirl.create(:guide_edition,
-      panopticon_id: artefact.id,
-      title: "Original title",
-      slug: "original-title"
-    )
-    guide.state = "ready"
-    guide.save!
-    User.create(name: "Winston").publish(guide, comment: "testing")
-    artefact.name = "New title"
-    artefact.primary_section = "test-section"
-    artefact.save
-
-    assert_equal "Original title", guide.reload.title
-    assert_equal "Test section", guide.reload.section
-  end
-
   test "should not change edition metadata if archived" do
     FactoryGirl.create(:tag, tag_id: "test-section", title: "Test section", tag_type: "section")
     artefact = FactoryGirl.create(:artefact,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 11.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -463,7 +463,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1863412532211958025
+      hash: 3691821515300644876
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1863412532211958025
+      hash: 3691821515300644876
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23