govuk_content_models 19.0.0 → 20.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 20.0.0
+
+* Breaking change: Remove `section` field on `Edition`. This reduces coupling between Panopticon and Publisher apps. Section should be inferred from the edition's artefact instead.
+
 ## 19.0.0
 
 * BREAKING CHANGE: String fields can no longer include arbitrary images. They

data/app/models/edition.rb

@@ -17,7 +17,6 @@ class Edition
   field :overview,             type: String
   field :alternative_title,    type: String
   field :slug,                 type: String
-  field :section,              type: String
   field :department,           type: String
   field :rejected_count,       type: Integer,  default: 0
   field :tags,                 type: String
@@ -154,7 +153,7 @@ class Edition
 
     real_fields_to_merge = fields_to_copy(edition_class) +
                            [:panopticon_id, :overview, :alternative_title,
-                            :slug, :section, :department]
+                            :slug, :department]
 
     real_fields_to_merge.each do |attr|
       new_edition[attr] = read_attribute(attr)
@@ -188,7 +187,6 @@ class Edition
       panopticon_id: metadata.id,
       slug: metadata.slug,
       title: metadata.name,
-      section: metadata.section,
       department: metadata.department,
       business_proposition: metadata.business_proposition)
   end

data/app/models/workflow.rb

@@ -244,7 +244,7 @@ module Workflow
     end
 
     def disallowable_change?
-      allowed_to_change = %w(slug section publish_at department business_proposition)
+      allowed_to_change = %w(slug publish_at department business_proposition)
       (changes.keys - allowed_to_change).present?
     end
 end

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -89,8 +89,6 @@ FactoryGirl.define do
     sequence(:slug) { |n| "slug-#{n}" }
     sequence(:title) { |n| "A key answer to your question #{n}" }
 
-    section "test:subsection test"
-
     after :build do |ed|
       if previous = ed.series.order(version_number: "desc").first
         ed.version_number = previous.version_number + 1

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 = "19.0.0"
+  VERSION = "20.0.0"
 end

data/test/models/artefact_test.rb

@@ -373,7 +373,6 @@ class ArtefactTest < ActiveSupport::TestCase
     edition.save!
 
     assert_equal artefact.name, edition.title
-    assert_equal artefact.section, edition.section
 
     artefact.name = "Babar"
     artefact.save

data/test/models/edition_scheduled_for_publishing_test.rb

@@ -53,15 +53,6 @@ class EditionScheduledForPublishingTest < ActiveSupport::TestCase
       assert_includes edition.errors.full_messages, "Editions scheduled for publishing can't be edited"
     end
 
-    should "allow editing fields like section" do
-      edition = FactoryGirl.create(:edition, :scheduled_for_publishing)
-
-      edition.section = 'new section'
-
-      assert edition.save
-      assert_equal edition.reload.section, 'new section'
-    end
-
     should "return false for #can_destroy?" do
       edition = FactoryGirl.build(:edition, :scheduled_for_publishing)
       refute edition.can_destroy?

data/test/models/edition_test.rb

@@ -118,7 +118,6 @@ class EditionTest < ActiveSupport::TestCase
                                   alternative_title: "Alternative test title")
     clone_edition = edition.build_clone
     assert_equal clone_edition.department, "Test dept"
-    assert_equal clone_edition.section, "test:subsection test"
     assert_equal clone_edition.overview, "I am a test overview"
     assert_equal clone_edition.alternative_title, "Alternative test title"
     assert_equal clone_edition.version_number, 2
@@ -374,7 +373,6 @@ class EditionTest < ActiveSupport::TestCase
   end
 
   test "should create a publication based on data imported from panopticon" do
-    section = FactoryGirl.create(:live_tag, tag_id: "test-section", title: "Test section", tag_type: "section")
     artefact = FactoryGirl.create(:artefact,
         slug: "foo-bar",
         kind: "answer",
@@ -382,13 +380,9 @@ class EditionTest < ActiveSupport::TestCase
         department: "Test dept",
         owning_app: "publisher",
     )
-    artefact.primary_section = section.tag_id
     artefact.save!
 
     a = Artefact.find(artefact.id)
-
-    assert_equal section.tag_id, artefact.primary_section.tag_id
-    assert_equal section.title, artefact.primary_section.title
     user = User.create
 
     publication = Edition.find_or_create_from_panopticon_data(artefact.id, user, {})
@@ -396,7 +390,6 @@ class EditionTest < ActiveSupport::TestCase
     assert_kind_of AnswerEdition, publication
     assert_equal artefact.name, publication.title
     assert_equal artefact.id.to_s, publication.panopticon_id.to_s
-    assert_equal section.title, publication.section
     assert_equal artefact.department, publication.department
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 19.0.0
+  version: 20.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -460,7 +460,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 874598308746352003
+      hash: 2827572676996359108
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 874598308746352003
+      hash: 2827572676996359108
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23