govuk_content_models 28.10.0 → 29.0.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# CHANGELOG
+
+## 29.0.0
+
+- Remove fields from Artefact:
+  - `department`
+  - `business_proposition`
+  - `fact_checkers`
+- Remove fields from Edition:
+  - `business_proposition`
+  - `department`
+
 ## 28.10.0
 
 - Add conversion from LicenceEdition to AnswerEdition in `Edition#build_clone`

data/app/models/artefact.rb

@@ -20,11 +20,6 @@ class Artefact
                   :keywords, :legacy_sources, :specialist_sectors, :organisations
   has_primary_tag_for :section
 
-  # NOTE: these fields are deprecated, and soon to be replaced with a
-  # tag-based implementation
-  field "department",           type: String
-  field "business_proposition", type: Boolean, default: false
-
   field "name",                 type: String
   field "slug",                 type: String
   field "paths",                type: Array, default: []
@@ -39,7 +34,6 @@ class Artefact
   field "need_id",              type: String
 
   field "need_ids",             type: Array, default: []
-  field "fact_checkers",        type: String
   field "publication_id",       type: String
   field "description",          type: String
   field "state",                type: String,  default: "draft"

data/app/models/edition.rb

@@ -10,7 +10,6 @@ class Edition
   field :panopticon_id,        type: String
   field :version_number,       type: Integer,  default: 1
   field :sibling_in_progress,  type: Integer,  default: nil
-  field :business_proposition, type: Boolean,  default: false
 
   field :title,                type: String
   field :in_beta,              type: Boolean,  default: false
@@ -18,7 +17,6 @@ class Edition
   field :publish_at,           type: DateTime
   field :overview,             type: String
   field :slug,                 type: String
-  field :department,           type: String
   field :rejected_count,       type: Integer,  default: 0
 
   field :browse_pages,         type: Array, default: []
@@ -196,7 +194,6 @@ class Edition
       :panopticon_id,
       :overview,
       :slug,
-      :department,
       :browse_pages,
       :primary_topic,
       :additional_topics
@@ -242,9 +239,7 @@ class Edition
     importing_user.create_edition(metadata.kind.to_sym,
       panopticon_id: metadata.id,
       slug: metadata.slug,
-      title: metadata.name,
-      department: metadata.department,
-      business_proposition: metadata.business_proposition)
+      title: metadata.name)
   end
 
   def self.find_and_identify(slug, edition)

data/app/models/workflow.rb

@@ -204,7 +204,7 @@ module Workflow
     end
 
     def disallowable_change?
-      allowed_to_change = %w(slug publish_at department business_proposition)
+      allowed_to_change = %w(slug publish_at)
       (changes.keys - allowed_to_change).present?
     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 = "28.10.0"
+  VERSION = "29.0.0"
 end

data/test/models/artefact_action_test.rb

@@ -18,7 +18,6 @@ end
 class ArtefactActionTest < ActiveSupport::TestCase
 
   DEFAULTS = {
-    "business_proposition" => false,
     "active" => false,
     "tag_ids" => [],
     "tags" => [],

data/test/models/artefact_test.rb

@@ -376,7 +376,6 @@ class ArtefactTest < ActiveSupport::TestCase
         name: "Foo bar",
         primary_section: "test-section",
         sections: ["test-section"],
-        department: "Test dept",
         owning_app: "publisher",
     )
 

data/test/models/edition_test.rb

@@ -16,7 +16,6 @@ class EditionTest < ActiveSupport::TestCase
         name: "Foo bar",
         # primary_section: "test-section",
         # sections: ["test-section"],
-        # department: "Test dept",
         owning_app: "publisher")
 
     AnswerEdition.create(state: "ready", slug: "childcare", panopticon_id: artefact.id,
@@ -153,12 +152,10 @@ class EditionTest < ActiveSupport::TestCase
                                   state: "published",
                                   panopticon_id: @artefact.id,
                                   version_number: 1,
-                                  department: "Test dept",
                                   overview: "I am a test overview")
     clone_edition = edition.build_clone
-    assert_equal clone_edition.department, "Test dept"
-    assert_equal clone_edition.overview, "I am a test overview"
-    assert_equal clone_edition.version_number, 2
+    assert_equal "I am a test overview", clone_edition.overview
+    assert_equal 2, clone_edition.version_number
   end
 
   test "cloning can only occur from a published edition" do
@@ -197,7 +194,7 @@ class EditionTest < ActiveSupport::TestCase
                                   version_number: 2)
 
     clone1 = edition.build_clone
-    assert_equal clone1.version_number, 3
+    assert_equal 3, clone1.version_number
   end
 
 # test cloning into different edition types
@@ -207,19 +204,17 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview",
         video_url: "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
     )
     new_edition = edition.build_clone AnswerEdition
 
-    assert_equal new_edition.class, AnswerEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.whole_body, edition.whole_body
+    assert_equal AnswerEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal edition.whole_body, new_edition.whole_body
   end
 
   test "Cloning from LicenceEdition into AnswerEdition" do
@@ -228,7 +223,6 @@ class EditionTest < ActiveSupport::TestCase
       state: "published",
       panopticon_id: @artefact.id,
       version_number: 1,
-      department: "Test dept",
       licence_overview: "I am a test overview",
       licence_identifier: "Test identifier",
       licence_short_description: "I am a test short description",
@@ -241,7 +235,6 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal 2, new_edition.version_number
     assert_equal @artefact.id.to_s, new_edition.panopticon_id
     assert_equal "draft", new_edition.state
-    assert_equal "Test dept", new_edition.department
     assert_equal "I am a test overview", new_edition.overview
     assert_equal edition.whole_body, new_edition.body
   end
@@ -252,18 +245,16 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview"
     )
     new_edition = edition.build_clone AnswerEdition
 
-    assert_equal new_edition.class, AnswerEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.whole_body, edition.whole_body
+    assert_equal AnswerEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal edition.whole_body, new_edition.whole_body
   end
 
   test "Cloning from TransactionEdition into AnswerEdition" do
@@ -272,20 +263,18 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview",
         more_information: "More information",
         alternate_methods: "Alternate methods"
     )
     new_edition = edition.build_clone AnswerEdition
 
-    assert_equal new_edition.class, AnswerEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.whole_body, edition.whole_body
+    assert_equal AnswerEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal edition.whole_body, new_edition.whole_body
   end
 
   test "Cloning from AnswerEdition into TransactionEdition" do
@@ -294,19 +283,17 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview",
         body: "Test body"
     )
     new_edition = edition.build_clone TransactionEdition
 
-    assert_equal new_edition.class, TransactionEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.more_information, "Test body"
+    assert_equal TransactionEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal "Test body", new_edition.more_information
   end
 
   test "Cloning from AnswerEdition into SimpleSmartAnswerEdition" do
@@ -315,19 +302,17 @@ class EditionTest < ActiveSupport::TestCase
       state: "published",
       panopticon_id: @artefact.id,
       version_number: 1,
-      department: "Test dept",
       overview: "I am a test overview",
       body: "Test body"
     )
     new_edition = edition.build_clone SimpleSmartAnswerEdition
 
-    assert_equal new_edition.class, SimpleSmartAnswerEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.body, "Test body"
+    assert_equal SimpleSmartAnswerEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal "Test body", new_edition.body
   end
 
   test "Cloning from GuideEdition into TransactionEdition" do
@@ -336,19 +321,17 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview",
         video_url: "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
     )
     new_edition = edition.build_clone TransactionEdition
 
-    assert_equal new_edition.class, TransactionEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.more_information, edition.whole_body
+    assert_equal TransactionEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal edition.whole_body, new_edition.more_information
   end
 
   test "Cloning from ProgrammeEdition into TransactionEdition" do
@@ -357,18 +340,16 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview",
     )
     new_edition = edition.build_clone TransactionEdition
 
-    assert_equal new_edition.class, TransactionEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
-    assert_equal new_edition.more_information, edition.whole_body
+    assert_equal TransactionEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal edition.whole_body, new_edition.more_information
   end
 
   test "Cloning from AnswerEdition into GuideEdition" do
@@ -377,17 +358,15 @@ class EditionTest < ActiveSupport::TestCase
         state: "published",
         panopticon_id: @artefact.id,
         version_number: 1,
-        department: "Test dept",
         overview: "I am a test overview",
     )
     new_edition = edition.build_clone GuideEdition
 
-    assert_equal new_edition.class, GuideEdition
-    assert_equal new_edition.version_number, 2
-    assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "draft"
-    assert_equal new_edition.department, "Test dept"
-    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal GuideEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "I am a test overview", new_edition.overview
   end
 
   test "Cloning between types with parts" do
@@ -446,7 +425,6 @@ class EditionTest < ActiveSupport::TestCase
         slug: "foo-bar",
         kind: "answer",
         name: "Foo bar",
-        department: "Test dept",
         owning_app: "publisher",
     )
     artefact.save!
@@ -459,7 +437,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 artefact.department, publication.department
   end
 
   test "should not change edition metadata if archived" do
@@ -470,7 +447,6 @@ class EditionTest < ActiveSupport::TestCase
         name: "Foo bar",
         primary_section: "test-section",
         sections: ["test-section"],
-        department: "Test dept",
         owning_app: "publisher",
     )
 
@@ -907,7 +883,6 @@ class EditionTest < ActiveSupport::TestCase
         name: "Foo bar",
         primary_section: "test-section",
         sections: ["test-section"],
-        department: "Test dept",
         owning_app: "publisher",
     )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 28.10.0
+  version: 29.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -478,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2559664419333283544
+      hash: 3770262996979564918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2559664419333283544
+      hash: 3770262996979564918
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23