govuk_content_models 10.0.0 → 10.1.0

data/README.md

@@ -1,5 +1,5 @@
-# Gov.uk Content Models
+# GOV.UK Content Models
 
-A gem containing the shared models for Panopticon and Publisher.
+A gem containing the shared models for the GOV.UK publishing platform, including [Panopticon](https://github.com/alphagov/panopticon) and [Publisher](https://github.com/alphagov/publisher).
 
 This is a continual **work in progress**.

data/app/models/edition.rb

@@ -284,4 +284,14 @@ class Edition
       Artefact.find(self.panopticon_id).destroy
     end
   end
+
+  def previous_edition_differences
+    return if version_number <= 1
+
+    if in_progress?
+      edition_changes.to_s # diff of current changes
+    else
+      actions.select { |a| a.request_type == 'publish' }.last.diff # diff with previous published version
+    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 = "10.0.0"
+  VERSION = "10.1.0"
 end

data/test/models/edition_test.rb

@@ -40,6 +40,14 @@ class EditionTest < ActiveSupport::TestCase
     template_answer(version_number)
   end
 
+  def draft_second_edition_from(published_edition)
+    published_edition.build_clone(AnswerEdition).tap { |edition|
+      edition.body = "Test Body 2"
+      edition.save
+      edition.reload
+    }
+  end
+
   test "it must have a title" do
     a = LocalTransactionEdition.new
     refute a.valid?
@@ -542,6 +550,31 @@ class EditionTest < ActiveSupport::TestCase
     assert edition.new_action(user, "note", comment: "Something important")
   end
 
+  test "first edition has no previous edition diffrences" do
+    first_edition = template_published_answer
+
+    assert_nil first_edition.previous_edition_differences
+  end
+
+  test "can access the changes since the last version" do
+    second_edition = draft_second_edition_from(template_published_answer)
+
+    assert_equal("{\"Lots of info\" >> \"Test Body 2\"}",
+                 second_edition.previous_edition_differences)
+  end
+
+  test "can show the differences between published editions" do
+    second_edition = draft_second_edition_from(template_published_answer)
+    second_edition.update_attribute(:state, "ready")
+    second_edition.save!
+
+    user = User.create(name: "bob")
+    user.publish second_edition, comment: "Published comment"
+
+    assert_equal("{\"Lots of info\" >> \"Test Body 2\"}",
+                 second_edition.previous_edition_differences)
+  end
+
   test "status should not be affected by notes" do
     user = User.create(name: "bob")
     edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "ready")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -465,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -283248144793344771
+      hash: -4548551299969788770
 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: -283248144793344771
+      hash: -4548551299969788770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23