govuk_content_models 26.2.0 → 27.0.0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 27.0.0
+
+- Corrected to return public timestamp of first edition when no major changes
+- Adds a unique index on the `uid` field for a `User`. (breaking change)
+
+## 26.3.0 (yanked)
+- Corrected to return public timestamp of first edition when no major changes
+- Yanked due to the unintended inclusion of a breaking change.
+
 ## 26.2.0
 - Adds `reviewer` `String` field to `Edition` class.
 

data/app/models/edition.rb

@@ -42,6 +42,7 @@ class Edition
   state_machine.states.map(&:name).each do |state|
     scope state, where(state: state)
   end
+  scope :archived_or_published, where(:state.in => ["archived", "published"])
   scope :in_progress, where(:state.nin => ["archived", "published"])
   scope :assigned_to, lambda { |user|
     if user
@@ -66,6 +67,7 @@ class Edition
   index "assigned_to_id"
   index [["panopticon_id", Mongo::ASCENDING], ["version_number", Mongo::ASCENDING]], :unique => true
   index "state"
+  index "updated_at"
 
   class << self; attr_accessor :fields_to_clone end
   @fields_to_clone = []
@@ -129,11 +131,19 @@ class Edition
   def public_updated_at
     if latest_major_update.present?
       latest_major_update.updated_at
-    elsif (first_published_edition = series.published.order(version_number: "asc").first)
-      first_published_edition.updated_at
+    elsif has_ever_been_published?
+      first_edition_of_published.updated_at
     end
   end
 
+  def has_ever_been_published?
+    series.map(&:state).include?('published')
+  end
+
+  def first_edition_of_published
+    series.archived_or_published.order(version_number: "asc").first
+  end
+
   def meta_data
     PublicationMetadata.new self
   end

data/app/models/user.rb

@@ -23,6 +23,7 @@ class User
   field "organisation_slug",   type: String
   field "disabled",            type: Boolean, default: false
 
+  index "uid", unique: true
   index "disabled"
 
   GOVSPEAK_FIELDS = []

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.2.0"
+  VERSION = "27.0.0"
 end

data/test/models/edition_test.rb

@@ -599,8 +599,8 @@ class EditionTest < ActiveSupport::TestCase
   end
 
   test "should be assigned to the last assigned recipient" do
-    alice = User.create(name: "alice")
-    bob = User.create(name: "bob")
+    alice = FactoryGirl.create(:user, name: "alice")
+    bob = FactoryGirl.create(:user, name: "bob")
     edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "ready")
     alice.assign(edition, bob)
     assert_equal bob, edition.assigned_to
@@ -1132,11 +1132,17 @@ class EditionTest < ActiveSupport::TestCase
 
     should 'return the timestamp of the first published edition when there are no major updates' do
       edition1 = FactoryGirl.create(:answer_edition, major_change: false,
-                                                     updated_at: 1.minute.ago,
+                                                     updated_at: 2.minute.ago,
                                                      state: 'published')
       edition2 = edition1.build_clone
+      Timecop.freeze(1.minute.ago) do
+        #added to allow significant amount of time between edition updated_at values
+        edition2.update_attributes!(state: 'published', major_change: false)
+      end
+      edition1.update_attributes!(state: 'archived', major_change: false)
 
       assert_equal edition1.updated_at, edition2.public_updated_at
+      assert_not_equal edition2.updated_at, edition2.public_updated_at
     end
 
     should 'return nil if there are no major updates and no published editions' do
@@ -1147,4 +1153,38 @@ class EditionTest < ActiveSupport::TestCase
       assert_equal nil, edition1.public_updated_at
     end
   end
+
+  context '#has_ever_been_published?' do
+    should 'return true if any edition has a published state' do
+      edition1 = FactoryGirl.create(:answer_edition, major_change: false,
+        updated_at: 2.minute.ago,
+        state: 'published')
+      edition2 = edition1.build_clone
+      edition2.update_attributes!(state: 'archived', major_change: false)
+      edition4 = FactoryGirl.create(:answer_edition, major_change: false,
+        updated_at: 2.minute.ago,
+        state: 'draft')
+
+      assert_equal true, edition1.has_ever_been_published?
+      assert_equal true, edition2.has_ever_been_published?
+      assert_equal false, edition4.has_ever_been_published?
+    end
+  end
+
+  context '#first_edition_of_published' do
+    should 'return the first edition of a series that has at least one edition state published' do
+      edition1 = FactoryGirl.create(:answer_edition, major_change: false,
+        updated_at: 2.minute.ago,
+        state: 'published')
+      edition2 = edition1.build_clone
+      edition1.update_attributes!(state: 'archived', major_change: false)
+      edition2.update_attributes!(state: 'published', major_change: false)
+      edition3 = edition2.build_clone
+      edition3.update_attributes!(state: 'archived', major_change: false)
+
+      assert_equal edition1, edition1.first_edition_of_published
+      assert_equal edition1, edition2.first_edition_of_published
+      assert_equal edition1, edition3.first_edition_of_published
+    end
+  end
 end

data/test/models/user_test.rb

@@ -112,8 +112,8 @@ class UserTest < ActiveSupport::TestCase
   end
 
   test "Edition becomes assigned to user when user is assigned an edition" do
-    boss_user = User.create(:name => "Mat")
-    worker_user = User.create(:name => "Grunt")
+    boss_user = FactoryGirl.create(:user, :name => "Mat")
+    worker_user = FactoryGirl.create(:user, :name => "Grunt")
 
     publication = boss_user.create_edition(:answer, title: "test answer", slug: "test", panopticon_id: @artefact.id)
     boss_user.assign(publication, worker_user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 26.2.0
+  version: 27.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -475,7 +475,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -724937649554228680
+      hash: 1210122604192578351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -484,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -724937649554228680
+      hash: 1210122604192578351
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23