govuk_content_models 7.2.1 → 7.3.0

data/app/models/specialist_document_edition.rb

@@ -6,7 +6,7 @@ class SpecialistDocumentEdition
   include Mongoid::Timestamps
   include Workflow
 
-  field :panopticon_id,        type: String
+  field :document_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
@@ -63,14 +63,11 @@ class SpecialistDocumentEdition
 
   validates :title, presence: true
   validates :version_number, presence: true
-  validates :panopticon_id, presence: true
+  validates :document_id, presence: true
   validates_with SafeHtml
 
-  before_save :check_for_archived_artefact
-  before_destroy :destroy_artefact
-
   index "assigned_to_id"
-  index "panopticon_id"
+  index "document_id"
   index "state"
 
   class << self; attr_accessor :fields_to_clone end
@@ -79,7 +76,7 @@ class SpecialistDocumentEdition
   alias_method :admin_list_title, :title
 
   def series
-    Edition.where(panopticon_id: panopticon_id)
+    SpecialistDocumentEdition.where(document_id: document_id)
   end
 
   def history
@@ -269,35 +266,7 @@ class SpecialistDocumentEdition
     self.save!
   end
 
-  def check_for_archived_artefact
-    if panopticon_id
-      a = Artefact.find(panopticon_id)
-      if a.state == "archived" and changed_attributes.any?
-        # If we're only changing the state to archived, that's ok
-        # Any other changes are not allowed
-        allowed_keys = ["state", "updated_at"]
-        unless ((changed_attributes.keys - allowed_keys).empty?) and state == "archived"
-          raise "Editing of an edition with an Archived artefact is not allowed"
-        end
-      end
-    end
-  end
-
   def artefact
     Artefact.find(panopticon_id)
   end
-
-  # When we delete an edition is the only one in its series
-  # we delete the associated artefact to remove all trace of the
-  # item from the system.
-  #
-  # We don't do this by notifying panopticon as this will only ever
-  # happen for artefacts representing editions that haven't been
-  # published (and therefore aren't registered in the rest of the)
-  # system.
-  def destroy_artefact
-    if can_destroy? && siblings.empty?
-      Artefact.find(self.panopticon_id).destroy
-    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 = "7.2.1"
+  VERSION = "7.3.0"
 end

data/test/models/specialist_document_edition_test.rb

@@ -17,13 +17,12 @@ class SpecialistDocumentEditionTest < ActiveSupport::TestCase
   end
 
   should "be persistable" do
-    artefact = FactoryGirl.create(:artefact)
     edition = SpecialistDocumentEdition.create!(
       slug: 'cma-cases/merger-investigation-2014',
       title: "Merger Investigation 2014",
       summary: "This is the summary of stuff going on in the Merger Investigation 2014",
       state: "published",
-      panopticon_id: artefact.id
+      document_id: 'a-document-id'
     )
 
     found = SpecialistDocumentEdition.where(slug: edition.slug).first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -456,7 +456,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2594756076780898128
+      hash: -2619611699370403934
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2594756076780898128
+      hash: -2619611699370403934
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23