govuk_content_models 14.0.0 → 14.0.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 14.0.1
+* Valdations for Business support scheme dates.
+
 ## 14.0.0
 * Remove `Attachment` model.
 

data/app/models/business_support_edition.rb

@@ -32,6 +32,7 @@ class BusinessSupportEdition < Edition
 
   GOVSPEAK_FIELDS = Edition::GOVSPEAK_FIELDS + [:body, :eligibility, :evaluation, :additional_information]
 
+  validate :scheme_dates
   validate :min_must_be_less_than_max
   validates_format_of :continuation_link, :with => URI::regexp(%w(http https)), :allow_blank => true
 
@@ -70,4 +71,13 @@ class BusinessSupportEdition < Edition
     end
     criteria
   end
+
+  def scheme_dates
+    errors.add(:start_date, "year must be 4 digits") if start_date.present? && start_date.year.to_s.length != 4
+    errors.add(:end_date, "year must be 4 digits") if end_date.present? && end_date.year.to_s.length != 4
+
+    if start_date.present? && end_date.present? && start_date > end_date
+      errors.add(:start_date, "can't be later than end date")
+    end
+  end
 end

data/app/models/edition.rb

@@ -286,4 +286,5 @@ class Edition
       actions.select { |a| a.request_type == 'publish' }.last.diff # diff with previous published version
     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 = "14.0.0"
+  VERSION = "14.0.1"
 end

data/test/models/business_support_edition_test.rb

@@ -217,4 +217,23 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
       assert_empty editions
     end
   end
+
+  context "scheme dates" do
+    should "should have year with 4 digits length" do
+      invalid_edition = FactoryGirl.build(:business_support_edition, start_date: Date.new(99, 12, 31), end_date: Date.new(99, 12, 31))
+
+      refute invalid_edition.valid?
+
+      edition_errors = invalid_edition.errors.full_messages
+      assert_includes edition_errors, "Start date year must be 4 digits"
+      assert_includes edition_errors, "End date year must be 4 digits"
+    end
+
+    should "have start date earlier than end date" do
+      invalid_edition = FactoryGirl.build(:business_support_edition, start_date: 1.week.ago, end_date: 2.weeks.ago)
+
+      refute invalid_edition.valid?
+      assert_includes invalid_edition.errors.full_messages, "Start date can't be later than end date"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 14.0.0
+  version: 14.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -466,7 +466,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4433079101509813617
+      hash: 2796015811550823768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4433079101509813617
+      hash: 2796015811550823768
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23