govuk_content_models 25.0.0 → 26.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 26.0.0
+
+- Removes `Expectation` model and introduces `need_to_know` `String` field on
+  Transaction, LocalTransaction and Place editions to store the expectations
+  as a govspeak field.
+
 ## 25.0.0
 
 - Removes the `alternative_title` field from the `Edition` class.

data/app/models/local_transaction_edition.rb

@@ -1,20 +1,20 @@
-require "expectant"
 require "local_service"
 require "edition"
 
 class LocalTransactionEdition < Edition
-  include Expectant
+  field :lgsl_code, type: Integer
+  field :lgil_override, type: Integer
+  field :introduction, type: String
+  field :more_information, type: String
+  field :need_to_know, type: String
+  field :minutes_to_complete, type: String
+  field :uses_government_gateway, type: Boolean
 
-  field :lgsl_code,         type: Integer
-  field :lgil_override,     type: Integer
-  field :introduction,      type: String
-  field :more_information,  type: String
-
-  GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:introduction, :more_information]
+  GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:introduction, :more_information, :need_to_know]
 
   @fields_to_clone = [
     :lgsl_code, :introduction, :more_information,
-    :minutes_to_complete, :expectation_ids
+    :minutes_to_complete, :need_to_know
   ]
 
   validate :valid_lgsl_code

data/app/models/place_edition.rb

@@ -1,17 +1,16 @@
 require "edition"
-require "expectant"
 
 class PlaceEdition < Edition
-  include Expectant
+  field :introduction, type: String
+  field :more_information, type: String
+  field :need_to_know, type: String
+  field :place_type, type: String
+  field :minutes_to_complete, type: String
+  field :uses_government_gateway, type: Boolean
 
-  field :introduction,      type: String
-  field :more_information,  type: String
-  field :place_type,        type: String
+  GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:introduction, :more_information, :need_to_know]
 
-  GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:introduction, :more_information]
-
-  @fields_to_clone = [:introduction, :more_information, :place_type,
-                      :expectation_ids]
+  @fields_to_clone = [:introduction, :more_information, :place_type, :need_to_know]
 
   def whole_body
     self.introduction

data/app/models/transaction_edition.rb

@@ -1,22 +1,21 @@
 require "edition"
-require "expectant"
 
 class TransactionEdition < Edition
-
-  include Expectant
-
-  field :introduction,      type: String
-  field :will_continue_on,  type: String
-  field :link,              type: String
-  field :more_information,  type: String
+  field :introduction, type: String
+  field :will_continue_on, type: String
+  field :link, type: String
+  field :more_information, type: String
+  field :need_to_know, type: String
   field :alternate_methods, type: String
+  field :minutes_to_complete, type: String
+  field :uses_government_gateway, type: Boolean
 
-  GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:introduction, :more_information, :alternate_methods]
+  GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:introduction, :more_information, :alternate_methods, :need_to_know]
 
   @fields_to_clone = [:introduction, :will_continue_on, :link,
                       :more_information, :alternate_methods,
                       :minutes_to_complete, :uses_government_gateway,
-                      :expectation_ids]
+                      :need_to_know]
 
   def indexable_content
     "#{super} #{Govspeak::Document.new(introduction).to_text} #{Govspeak::Document.new(more_information).to_text}".strip

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -168,11 +168,13 @@ FactoryGirl.define do
     sequence(:lgsl_code) { |nlgsl| nlgsl }
     introduction { "Test introduction" }
     more_information { "This is more information" }
+    need_to_know "This service is only available in England and Wales"
   end
 
   factory :transaction_edition, :parent => :edition, :class => "TransactionEdition" do
     introduction { "Test introduction" }
     more_information { "This is more information" }
+    need_to_know "This service is only available in England and Wales"
     link "http://continue.com"
     will_continue_on "To be continued..."
     alternate_methods "Method A or Method B"
@@ -208,14 +210,11 @@ FactoryGirl.define do
     lgil_code 0
   end
 
-  factory :expectation do
-    sequence(:text) {|n| "You will need #{n} of these."}
-  end
-
   factory :place_edition do
     title "Far far away"
     introduction "Test introduction"
     more_information "More information"
+    need_to_know "This service is only available in England and Wales"
     place_type "Location location location"
   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 = "25.0.0"
+  VERSION = "26.0.0"
 end

data/test/models/workflow_test.rb

@@ -42,10 +42,8 @@ class WorkflowTest < ActiveSupport::TestCase
   def template_user_and_published_transaction
     user = User.create(name: "Ben")
     other_user = User.create(name: "James")
-    expectation = Expectation.create text:"Credit card required"
 
-    transaction = user.create_edition(:transaction, title: "My title", slug: "my-title", panopticon_id: @artefact.id)
-    transaction.expectation_ids = [expectation.id]
+    transaction = user.create_edition(:transaction, title: "My title", slug: "my-title", panopticon_id: @artefact.id, need_to_know: "Credit card required")
     transaction.save
 
     request_review(user, transaction)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 25.0.0
+  version: 26.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -348,8 +348,6 @@ files:
 - app/models/completed_transaction_edition.rb
 - app/models/curated_list.rb
 - app/models/edition.rb
-- app/models/expectant.rb
-- app/models/expectation.rb
 - app/models/guide_edition.rb
 - app/models/help_page_edition.rb
 - app/models/licence_edition.rb
@@ -476,7 +474,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -823528571067115172
+      hash: -3896108249963512199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -485,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -823528571067115172
+      hash: -3896108249963512199
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/app/models/expectant.rb

@@ -1,21 +0,0 @@
-module Expectant
-
-  module ClassMethods
-    def expectation_choices
-      Hash[Expectation.all.order_by(text: :asc).map {|e| [e.text, e._id.to_s] }]
-    end
-  end
-
-  extend ActiveSupport::Concern
-
-  included do
-    field :expectation_ids,         type: Array,   default: []
-    field :minutes_to_complete,     type: String
-    field :uses_government_gateway, type: Boolean
-  end
-
-  def expectations
-    Expectation.criteria.in(_id: self.expectation_ids)
-  end
-
-end

data/app/models/expectation.rb

@@ -1,12 +0,0 @@
-require "safe_html"
-
-class Expectation
-  include Mongoid::Document
-  cache
-
-  field :text,      type: String
-
-  GOVSPEAK_FIELDS = []
-
-  validates_with SafeHtml
-end