govuk_content_models 8.8.0 → 8.9.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.9.0
+
+* Add label fields to RenderedSpecialistDocument
+
 ## 8.8.0
 
 * Add two new formats from Whitehall; Notice and Decision.

data/app/models/rendered_specialist_document.rb

@@ -2,17 +2,22 @@ class RenderedSpecialistDocument
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  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
+  field :document_id,            type: String
+  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_type_label,        type: String
+  field :case_state,             type: String
+  field :case_state_label,       type: String
+  field :market_sector,          type: String
+  field :market_sector_label,    type: String
+  field :outcome_type,           type: String
+  field :outcome_type_label,     type: String
+  field :headers,                type: Array
 
   index "slug", unique: true
 

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.8.0"
+  VERSION = "8.9.0"
 end

data/test/models/rendered_specialist_document_test.rb

@@ -4,19 +4,46 @@ 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|
+  def label_fields
+    {
+      case_type_label: "Some case type",
+      case_state_label: "Open",
+      market_sector_label: "Oil and gas",
+      outcome_type_label: "Referred"
+    }
+  end
+
+  def rendered_specialist_document_attributes
+    basic_specialist_document_fields
+      .reject { |k,v| k == :state }
+      .merge(label_fields)
+  end
+
+  test "can instantiate with basic attributes" do
+    r = RenderedSpecialistDocument.new(rendered_specialist_document_attributes)
+    rendered_specialist_document_attributes.each do |k,v|
+      if (k =~ /date$/)
+        assert_equal Date.parse(v), r.public_send(k.to_sym)
+      else
+        assert_equal v, r.public_send(k.to_sym)
+      end
+    end
+  end
+
+  test "can assign basic attributes" do
+    r = RenderedSpecialistDocument.new
+    rendered_specialist_document_attributes.each do |k,v|
+      r.public_send(:"#{k}=", v)
       if (k =~ /date$/)
-        assert_equal Date.parse(v), r.send(k.to_sym)
+        assert_equal Date.parse(v), r.public_send(k.to_sym)
       else
-        assert_equal v, r.send(k.to_sym)
+        assert_equal v, r.public_send(k.to_sym)
       end
     end
   end
 
   test "can persist" do
-    r = RenderedSpecialistDocument.new(basic_specialist_document_fields)
+    r = RenderedSpecialistDocument.new(rendered_specialist_document_attributes)
     r.save!
 
     assert_equal 1, RenderedSpecialistDocument.where(slug: r.slug).count
@@ -43,7 +70,7 @@ class RenderedSpecialistDocumentTest < ActiveSupport::TestCase
         "headers" => []
       }
     ]
-    sample_fields = basic_specialist_document_fields.merge(headers: sample_headers)
+    sample_fields = rendered_specialist_document_attributes.merge(headers: sample_headers)
     r = RenderedSpecialistDocument.create!(sample_fields)
 
     found = RenderedSpecialistDocument.where(slug: r.slug).first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 8.8.0
+  version: 8.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -463,7 +463,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3706575865868018469
+      hash: 4213322720212660807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3706575865868018469
+      hash: 4213322720212660807
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23