govuk_content_models 6.0.4 → 6.0.5

data/app/models/travel_advice_edition.rb

@@ -151,16 +151,7 @@ class TravelAdviceEdition
   end
 
   def anything_other_than_state_changed?(*additional_allowed_fields)
-    self.changed? and ((real_fields_changed - ['state'] - additional_allowed_fields) != [] or self.parts.any?(&:changed?))
-  end
-
-  def real_fields_changed
-    # There's an issue with dirty-tracking of Array fields.  Merely accessing them will mark
-    # them as changed, but with no changes. This recifies that.
-    # this also allows changes when the change is something changing from nil to an empty array
-    self.changes.reject { |k, v|
-      v.nil? || v == [nil, []]
-    }.keys
+    self.changed? and ((changes.keys - ['state'] - additional_allowed_fields) != [] or self.parts.any?(&:changed?))
   end
 
   def alert_status_contains_valid_values

data/app/validators/slug_validator.rb

@@ -15,7 +15,7 @@ class SlugValidator < ActiveModel::EachValidator
     elsif value.to_s =~ /\Agovernment\/(.+)/ and prefixed_inside_government_format_names.include?(record.kind)
       parts = $1.split('/')
     else
-      parts = [value]
+      parts = [value.clone]
     end
 
     if record.respond_to?(:kind)

data/lib/govuk_content_models.rb

@@ -1,5 +1,6 @@
 require "govuk_content_models/version"
 require "mongoid"
+require "mongoid/monkey_patches"
 
 begin
   module GovukContentModels
@@ -9,4 +10,4 @@ begin
 rescue NameError
   module GovukContentModels
   end
-end
+end

data/lib/govuk_content_models/require_all.rb

@@ -1,6 +1,7 @@
 # Require this file in a non-Rails app to load all the things
 require "active_model"
 require "mongoid"
+require "govuk_content_models"
 
 %w[ app/models app/validators app/repositories app/traits lib ].each do |path|
   full_path = File.expand_path(

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 = "6.0.4"
+  VERSION = "6.0.5"
 end

data/lib/mongoid/monkey_patches.rb

@@ -0,0 +1,17 @@
+# Mongoid 2.x does not track Array field changes accurately.
+# Accessing an array field will mark it dirty which becomes problematic
+# for workflow callbacks, e.g. when checking if a published edition is being edited.
+# See https://github.com/mongoid/mongoid/issues/2311 for details of the mongoid issue.
+#
+module Mongoid
+  module Dirty
+    def changes
+      _changes = {}
+      changed.each do |attr|
+        change = attribute_change(attr)
+        _changes[attr] = change if change
+      end
+      _changes
+    end
+  end
+end

data/test/models/artefact_test.rb

@@ -371,6 +371,13 @@ class ArtefactTest < ActiveSupport::TestCase
     end
   end
 
+  should "not remove double dashes in a Detailed Guide slug" do
+    a = FactoryGirl.create(:artefact, slug: "duplicate-slug--1", kind: "detailed_guide")
+    a.reload
+
+    assert_equal "duplicate-slug--1", a.slug
+  end
+
   context "artefact language" do
     should "return english by default" do
       a = FactoryGirl.create(:artefact)

data/test/models/edition_test.rb

@@ -303,6 +303,21 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal 7, new_edition.parts.size #there are 5 'default' parts plus an additional two created by the factory
   end
 
+  # Mongoid 2.x marks array fields as dirty whenever they are accessed.
+  # See https://github.com/mongoid/mongoid/issues/2311
+  # This behaviour has been patched in lib/mongoid/monkey_patches.rb
+  # in order to prevent workflow validation failures for editions
+  # with array fields.
+  #
+  test "editions with array fields should accurately track changes" do
+    bs = FactoryGirl.create(:business_support_edition, sectors: [])
+    assert_empty bs.changes
+    bs.sectors
+    assert_empty bs.changes
+    bs.sectors << 'manufacturing'
+    assert_equal ['sectors'], bs.changes.keys
+  end
+
   test "edition finder should return the published edition when given an empty edition parameter" do
     dummy_publication = template_published_answer
     second_publication = template_unpublished_answer(2)

data/test/models/travel_advice_edition_test.rb

@@ -136,6 +136,15 @@ class TravelAdviceEditionTest < ActiveSupport::TestCase
         @ta.alert_status = [ ]
         assert @ta.valid?
       end
+
+      # Test that accessing an Array field doesn't mark it as dirty.
+      # mongoid/dirty#changes method is patched in lib/mongoid/monkey_patches.rb
+      # See https://github.com/mongoid/mongoid/issues/2311 for details.
+      should "track changes to alert status accurately" do
+        @ta.alert_status = [ ]
+        @ta.alert_status
+        assert @ta.valid?
+      end
     end
 
     context "on version_number" do

data/test/models/workflow_test.rb

@@ -304,4 +304,22 @@ class WorkflowTest < ActiveSupport::TestCase
     user.take_action!(edition, "archive")
     assert_equal "archived", edition.state
   end
+
+  # Mongoid 2.x marks array fields as dirty whenever they are accessed.
+  # See https://github.com/mongoid/mongoid/issues/2311
+  # This behaviour has been patched in lib/mongoid/monkey_patches.rb
+  # in order to prevent workflow validation failures for editions
+  # with array fields.
+  #
+  test "not_editing_published_item should not consider unchanged array fields as changes" do
+    bs = FactoryGirl.create(:business_support_edition, state: 'published', sectors: [])
+    assert_empty bs.errors
+    bs.sectors # Access the Array field
+    bs.valid?
+    assert_empty bs.errors
+    bs.sectors << 'education'
+    assert_equal ['sectors'], bs.changes.keys
+    bs.valid?
+    assert_equal "Published editions can't be edited", bs.errors[:base].first
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -397,6 +397,7 @@ files:
 - lib/govuk_content_models/test_helpers/factories.rb
 - lib/govuk_content_models/test_helpers/local_services.rb
 - lib/govuk_content_models/version.rb
+- lib/mongoid/monkey_patches.rb
 - test/fixtures/contactotron_api_response.json
 - test/fixtures/uploads/image.jpg
 - test/models/artefact_action_test.rb
@@ -452,7 +453,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4288275942381521382
+      hash: 888131122217194786
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -461,7 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4288275942381521382
+      hash: 888131122217194786
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23