govuk_content_models 10.5.0 → 11.0.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 11.0.0
+
+*  Remove fact check logic from the `Edition` model, since it only belongs in
+   Publisher.
+
 ## 10.5.0
 
 *  Add Corporate information pages to Whitehall formats.

data/app/models/edition.rb

@@ -1,5 +1,4 @@
 require "workflow"
-require "fact_check_address"
 
 class Edition
   include Mongoid::Document
@@ -106,10 +105,6 @@ class Edition
     PublicationMetadata.new self
   end
 
-  def fact_check_email_address
-    FactCheckAddress.new.for_edition(self)
-  end
-
   def get_next_version_number
     latest_version = series.order(version_number: "desc").first.version_number
     latest_version + 1

data/app/models/specialist_document_edition.rb

@@ -1,4 +1,3 @@
-require "fact_check_address"
 require "state_machine"
 
 class SpecialistDocumentEdition

data/app/models/workflow_actor.rb

@@ -89,8 +89,6 @@ module WorkflowActor
     return false if details[:email_addresses].blank?
 
     details[:comment] ||= "Fact check requested"
-    details[:comment] += "\n\nResponses should be sent to: " +
-                         edition.fact_check_email_address
 
     take_action(edition, __method__, details)
   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 = "10.5.0"
+  VERSION = "11.0.0"
 end

data/test/models/workflow_test.rb

@@ -181,7 +181,7 @@ class WorkflowTest < ActiveSupport::TestCase
     user.receive_fact_check(edition, {comment: "Text.<l>content that the SafeHtml validator would catch</l>"})
     user.send_fact_check(edition,{comment: "Out of office reply triggered receive_fact_check", email_addresses: "test@test.com"})
 
-    assert(edition.actions.last.comment.include? "Out of office reply triggered receive_fact_check\n\nResponses should be sent to:")
+    assert(edition.actions.last.comment.include? "Out of office reply triggered receive_fact_check")
   end
 
   test "when processing fact check, an edition can request for amendments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 10.5.0
+  version: 11.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -397,7 +397,6 @@ files:
 - govuk_content_models.gemspec
 - jenkins.sh
 - jenkins_branches.sh
-- lib/fact_check_address.rb
 - lib/govuk_content_models.rb
 - lib/govuk_content_models/require_all.rb
 - lib/govuk_content_models/test_helpers/factories.rb
@@ -424,7 +423,6 @@ files:
 - test/models/curated_list_test.rb
 - test/models/edition_scheduled_for_publishing_test.rb
 - test/models/edition_test.rb
-- test/models/fact_check_address_test.rb
 - test/models/help_page_edition_test.rb
 - test/models/licence_edition_test.rb
 - test/models/local_authority_test.rb
@@ -465,7 +463,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2310864041385376147
+      hash: -2782953638830349202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -474,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2310864041385376147
+      hash: -2782953638830349202
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -502,7 +500,6 @@ test_files:
 - test/models/curated_list_test.rb
 - test/models/edition_scheduled_for_publishing_test.rb
 - test/models/edition_test.rb
-- test/models/fact_check_address_test.rb
 - test/models/help_page_edition_test.rb
 - test/models/licence_edition_test.rb
 - test/models/local_authority_test.rb

data/lib/fact_check_address.rb

@@ -1,36 +0,0 @@
-require "plek"
-
-class FactCheckAddress
-  DOMAIN = "alphagov.co.uk"
-
-  def for_edition(edition)
-    "#{prefix}#{edition.id}@#{DOMAIN}"
-  end
-
-  def valid_address?(address)
-    regexp.match(address)
-  end
-
-  def edition_id_from_address(address)
-    match = valid_address?(address)
-    match && match[1]
-  end
-
-  private
-  def regexp
-    /#{Regexp.escape(prefix)}(.+?)@#{DOMAIN}/
-  end
-
-  def prefix
-    "factcheck+#{environment}-"
-  end
-
-  # Fact check email addresses are environment dependent. This is
-  # a bad thing, but changing it would be very disruptive. Since
-  # Plek no longer gives us access to the environment we have to rely
-  # on the fact that the environment is included in the public domain
-  # name for an app.
-  def environment
-    Plek.current.find('publisher').split('.')[1]
-  end
-end

data/test/models/fact_check_address_test.rb

@@ -1,36 +0,0 @@
-require "test_helper"
-require "fact_check_address"
-
-class FactCheckAddressTest < ActiveSupport::TestCase
-
-  setup do
-    dummy_plek = mock do
-      stubs(:find).with("publisher").returns("publisher.wibble.alphagov.co.uk")
-    end
-    Plek.stubs(:current).returns(dummy_plek)
-  end
-
-  test "can tell if an address is valid" do
-    service = FactCheckAddress.new
-    address = service.for_edition(Edition.new)
-    assert service.valid_address?(address), "Address should be valid but isn't"
-  end
-
-  test "can tell if an address is invalid" do
-    service = FactCheckAddress.new
-    address = "factcheck+notwibble-abde@alphagov.co.uk"
-    refute service.valid_address?(address), "Address should be invalid but isn't"
-  end
-
-  test "can extract edition ID from an address" do
-    service = FactCheckAddress.new
-    address = "factcheck+wibble-abde@alphagov.co.uk"
-    assert_equal "abde", service.edition_id_from_address(address)
-  end
-
-  test "can generate an address from an edition" do
-    service = FactCheckAddress.new
-    e = Edition.new
-    assert_match /#{e.id}/, service.for_edition(e)
-  end
-end