govuk_content_models 41.1.0 → 41.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcfb829a13e415c1340980483a7fdc28a46b852
-  data.tar.gz: d8a1ae1a225355001e6455992ca58d41d728dad8
+  metadata.gz: f62fa6f0be7b191abab1031c90c07477b6f441e9
+  data.tar.gz: 740a4a1599e10251153f14593c6030be11fafbb2
 SHA512:
-  metadata.gz: 84a2db1e3826a777476146dc6900127b9b8554c675024de35aeef93af1a9c1fa5ec193b3f584f5d76b01062f0f2838c2664af23d4cf0f5a764223d5aee6f6a57
-  data.tar.gz: 3676a0785f93ebcd0164a294d6a5a8dce86d803ec05530f2018ba090389683c6c2bf02fd93f1695aa5e012d86f236b915109238304bdcb37686a72fb6cb59ee8
+  metadata.gz: 83a2942d1809c38aeebc939ac2f216264f6379322b34443e6ebc487f4b80fb0de3b8d0ae5afd19d7fbbe3d4c3f7ef36cc0ea0625e7179e213befa083f64ddd3e
+  data.tar.gz: e4cb4108fbd8dc79627ea0916e7ed8e72ac55e2388c0c32a8a9ea5bd55d1d8ee51ae3614de2d83f7349516a4e16af250592eb67e55aa740d4e3b803ff06bec8c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 41.1.1
+
+- Use `require_dependency` to avoid warnings in publisher sidekiq in development mode
+
 ## 41.1.0
 
 - Adds 'skip review' Edition workflow processor

data/app/models/action.rb

@@ -1,4 +1,4 @@
-require "safe_html"
+require_dependency "safe_html"
 
 class Action
   include Mongoid::Document

data/app/models/artefact.rb

@@ -1,7 +1,7 @@
 require "plek"
 require "traits/taggable"
 require "artefact_action"  # Require this when running outside Rails
-require "safe_html"
+require_dependency "safe_html"
 
 class CannotEditSlugIfEverPublished < ActiveModel::Validator
   def validate(record)

data/app/models/artefact_action.rb

@@ -1,4 +1,4 @@
-require "safe_html"
+require_dependency "safe_html"
 
 class ArtefactAction
   include Mongoid::Document

data/app/models/curated_list.rb

@@ -1,5 +1,5 @@
 require "traits/taggable"
-require "safe_html"
+require_dependency "safe_html"
 
 class CuratedList
   include Mongoid::Document

data/app/models/edition.rb

@@ -1,4 +1,4 @@
-require "workflow"
+require_dependency "workflow"
 
 class Edition
   include Mongoid::Document

data/app/models/local_service.rb

@@ -1,5 +1,5 @@
 require "csv"
-require "safe_html"
+require_dependency "safe_html"
 
 class LocalService
   include Mongoid::Document

data/app/models/overview_dashboard.rb

@@ -1,4 +1,4 @@
-require "safe_html"
+require_dependency "safe_html"
 
 class OverviewDashboard
   include Mongoid::Document

data/app/models/part.rb

@@ -1,4 +1,4 @@
-require "safe_html"
+require_dependency "safe_html"
 
 class Part
   include Mongoid::Document

data/app/models/parted.rb

@@ -1,4 +1,4 @@
-require "part"
+require_dependency "part"
 
 module Parted
   def self.included(klass)

data/app/models/simple_smart_answer_edition.rb

@@ -1,6 +1,6 @@
 require "edition"
-require_relative 'simple_smart_answer_edition/node'
-require_relative 'simple_smart_answer_edition/node/option'
+require_dependency 'simple_smart_answer_edition/node'
+require_dependency 'simple_smart_answer_edition/node/option'
 
 class SimpleSmartAnswerEdition < Edition
   include Mongoid::Document

data/app/models/tag.rb

@@ -1,4 +1,4 @@
-require "safe_html"
+require_dependency "safe_html"
 require 'tag_id_validator'
 require 'state_machines-mongoid'
 

data/app/models/travel_advice_edition.rb

@@ -1,7 +1,7 @@
 require 'attachable'
 require 'parted'
 require 'state_machines-mongoid'
-require 'safe_html'
+require_dependency 'safe_html'
 
 class TravelAdviceEdition
   include Mongoid::Document

data/app/models/user.rb

@@ -1,7 +1,7 @@
 require "digest/md5"
 require "cgi"
 require "gds-sso/user"
-require "safe_html"
+require_dependency "safe_html"
 
 class User
   include Mongoid::Document

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 = "41.1.0"
+  VERSION = "41.1.1"
 end

data/test/test_helper.rb

@@ -3,6 +3,15 @@ ENV["RACK_ENV"] = "test"
 require "bundler/setup"
 
 require "active_support/test_case"
+
+# NOTE: this test_helper does not introduce enough of rails to make
+# require_dependency to be available, requiring "active_support/dependencies"
+# causes the tests to fail, so we introduce our own require_dependency
+# that simply passes through to require
+def require_dependency(*args)
+  require(*args)
+end
+
 require "shoulda/context"
 require "minitest/autorun"
 require "mocha/mini_test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 41.1.0
+  version: 41.1.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext