govuk_content_models 8.4.1 → 8.5.0

data/app/models/edition.rb

@@ -21,7 +21,7 @@ class Edition
   field :department,           type: String
   field :rejected_count,       type: Integer,  default: 0
   field :tags,                 type: String
-  field :editors_note,         type: String
+  field :important_note,       type: String
 
   field :assignee,             type: String
   field :creator,              type: String

data/app/models/rendered_specialist_document.rb

@@ -0,0 +1,22 @@
+class RenderedSpecialistDocument
+  include Mongoid::Document
+
+  field :slug,          type: String
+  field :title,         type: String
+  field :summary,       type: String
+  field :body,          type: String
+  field :opened_date,   type: Date
+  field :closed_date,   type: Date
+  field :case_type,     type: String
+  field :case_state,    type: String
+  field :market_sector, type: String
+  field :outcome_type,  type: String
+  field :headers,       type: Array
+
+  index "slug", unique: true
+
+  GOVSPEAK_FIELDS = []
+
+  validates :slug, uniqueness: true
+  validates_with SafeHtml
+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 = "8.4.1"
+  VERSION = "8.5.0"
 end

data/test/fixtures/specialist_document_fixtures.rb

@@ -0,0 +1,16 @@
+module SpecialistDocumentFixtures
+  def basic_specialist_document_fields
+    {
+      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",
+      body: "A body",
+      opened_date: '2012-04-21',
+      document_id: 'a-document-id',
+      market_sector: 'oil-and-gas',
+      case_type: 'some-case-type',
+      case_state: 'open'
+    }
+  end
+end

data/test/models/edition_test.rb

@@ -984,9 +984,9 @@ class EditionTest < ActiveSupport::TestCase
     end
   end
 
-  context "Editors note" do
+  context "Important note" do
     def set_note(edition, note)
-      edition.editors_note = note
+      edition.important_note = note
       edition.save
       edition.reload
     end
@@ -996,18 +996,18 @@ class EditionTest < ActiveSupport::TestCase
       set_note(@edition, "This is an important note.")
     end
 
-    should "be able to add an editors note to an edition" do
-      assert_equal "This is an important note.", @edition.editors_note
+    should "be able to add a important note to an edition" do
+      assert_equal "This is an important note.", @edition.important_note
     end
 
-    should "be able to update an existing editors note" do
+    should "be able to update an existing important note" do
       set_note(@edition, "New note.")
-      assert_equal "New note.", @edition.editors_note
+      assert_equal "New note.", @edition.important_note
     end
 
     should "should not exist when creating new editions" do
       Edition.subclasses.each do |klass|
-        refute klass.fields_to_clone.include?(:editors_note), "Editors note is cloned in a #{klass}"
+        refute klass.fields_to_clone.include?(:important_note), "Important note is cloned in a #{klass}"
       end
     end
   end

data/test/models/rendered_specialist_document_test.rb

@@ -0,0 +1,52 @@
+require "test_helper"
+require "fixtures/specialist_document_fixtures"
+
+class RenderedSpecialistDocumentTest < ActiveSupport::TestCase
+  include SpecialistDocumentFixtures
+
+  test "can assign all attributes" do
+    r = RenderedSpecialistDocument.new(basic_specialist_document_fields)
+    basic_specialist_document_fields.each do |k,v|
+      if (k =~ /date$/)
+        assert_equal Date.parse(v), r.send(k.to_sym)
+      else
+        assert_equal v, r.send(k.to_sym)
+      end
+    end
+  end
+
+  test "can persist" do
+    r = RenderedSpecialistDocument.new(basic_specialist_document_fields)
+    r.save!
+
+    assert_equal 1, RenderedSpecialistDocument.where(slug: r.slug).count
+  end
+
+  test "duplicate slugs disallowed" do
+    RenderedSpecialistDocument.create(slug: "my-slug")
+    second = RenderedSpecialistDocument.create(slug: "my-slug")
+
+    refute second.valid?
+    assert_equal 1, RenderedSpecialistDocument.count
+  end
+
+  test "has no govspeak fields" do
+    assert_equal [], RenderedSpecialistDocument::GOVSPEAK_FIELDS
+  end
+
+  test "can store headers hash" do
+    sample_headers = [
+      {
+        "text" => "Phase 1",
+        "level" => 2,
+        "id" => "phase-1",
+        "headers" => []
+      }
+    ]
+    sample_fields = basic_specialist_document_fields.merge(headers: sample_headers)
+    r = RenderedSpecialistDocument.create!(sample_fields)
+
+    found = RenderedSpecialistDocument.where(slug: r.slug).first
+    assert_equal sample_headers, found.headers
+  end
+end

data/test/models/specialist_document_edition_test.rb

@@ -1,22 +1,10 @@
 # encoding: UTF-8
 
 require "test_helper"
+require "fixtures/specialist_document_fixtures"
 
 class SpecialistDocumentEditionTest < ActiveSupport::TestCase
-  def basic_edition_fields
-    {
-      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",
-      body: "A body",
-      opened_date: '2012-04-21',
-      document_id: 'a-document-id',
-      market_sector: 'oil-and-gas',
-      case_type: 'some-case-type',
-      case_state: 'open'
-    }
-  end
+  include SpecialistDocumentFixtures
 
   setup do
     @original_asset_api_client = Attachable.asset_api_client
@@ -28,13 +16,13 @@ class SpecialistDocumentEditionTest < ActiveSupport::TestCase
   end
 
   should "have correct fields" do
-    edition = SpecialistDocumentEdition.new(basic_edition_fields)
+    edition = SpecialistDocumentEdition.new(basic_specialist_document_fields)
 
-    assert_equal basic_edition_fields[:title], edition.title
+    assert_equal basic_specialist_document_fields[:title], edition.title
   end
 
   should "be persistable" do
-    edition = SpecialistDocumentEdition.create!(basic_edition_fields)
+    edition = SpecialistDocumentEdition.create!(basic_specialist_document_fields)
 
     found = SpecialistDocumentEdition.where(slug: edition.slug).first
     assert_equal found.attributes, edition.attributes
@@ -56,7 +44,7 @@ class SpecialistDocumentEditionTest < ActiveSupport::TestCase
     should "persist attachment record when document saved" do
       Attachable.asset_api_client.stubs(:create_asset)
 
-      edition = SpecialistDocumentEdition.new(basic_edition_fields)
+      edition = SpecialistDocumentEdition.new(basic_specialist_document_fields)
       file = OpenStruct.new(original_filename: "document.pdf")
 
       edition.build_attachment(title: "baz", file: file)
@@ -69,7 +57,7 @@ class SpecialistDocumentEditionTest < ActiveSupport::TestCase
     end
 
     should "transmit attached file to asset manager when document saved" do
-      edition = SpecialistDocumentEdition.new(basic_edition_fields)
+      edition = SpecialistDocumentEdition.new(basic_specialist_document_fields)
       file = OpenStruct.new(original_filename: "document.pdf")
 
       success_response = stub("asset manager response", id: "/test-id")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 8.4.1
+  version: 8.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -375,6 +375,7 @@ files:
 - app/models/parted.rb
 - app/models/place_edition.rb
 - app/models/programme_edition.rb
+- app/models/rendered_specialist_document.rb
 - app/models/simple_smart_answer_edition.rb
 - app/models/simple_smart_answer_edition/node.rb
 - app/models/simple_smart_answer_edition/node/option.rb
@@ -403,6 +404,7 @@ files:
 - lib/govuk_content_models/version.rb
 - lib/mongoid/monkey_patches.rb
 - test/fixtures/contactotron_api_response.json
+- test/fixtures/specialist_document_fixtures.rb
 - test/fixtures/uploads/image.jpg
 - test/models/artefact_action_test.rb
 - test/models/artefact_external_link_test.rb
@@ -428,6 +430,7 @@ files:
 - test/models/local_service_test.rb
 - test/models/local_transaction_edition_test.rb
 - test/models/overview_dashboard_test.rb
+- test/models/rendered_specialist_document_test.rb
 - test/models/simple_smart_answer_edition_test.rb
 - test/models/simple_smart_answer_node_test.rb
 - test/models/simple_smart_answer_option_test.rb
@@ -460,7 +463,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 61628774300595589
+      hash: -2243778202903254649
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -469,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 61628774300595589
+      hash: -2243778202903254649
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -478,6 +481,7 @@ specification_version: 3
 summary: Shared models for Panopticon and Publisher, as a Rails Engine
 test_files:
 - test/fixtures/contactotron_api_response.json
+- test/fixtures/specialist_document_fixtures.rb
 - test/fixtures/uploads/image.jpg
 - test/models/artefact_action_test.rb
 - test/models/artefact_external_link_test.rb
@@ -503,6 +507,7 @@ test_files:
 - test/models/local_service_test.rb
 - test/models/local_transaction_edition_test.rb
 - test/models/overview_dashboard_test.rb
+- test/models/rendered_specialist_document_test.rb
 - test/models/simple_smart_answer_edition_test.rb
 - test/models/simple_smart_answer_node_test.rb
 - test/models/simple_smart_answer_option_test.rb