govuk_content_models 10.4.1 → 10.4.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 10.4.2
+
+*  Making Artefact.relatable_items a scope so that it can be chained.
+
 ## 10.4.1
 
 *  Fix tag validation; tags slugs may only contain `/` if they're a child tag.

data/app/models/artefact.rb

@@ -163,6 +163,11 @@ class Artefact
   validate :validate_prefixes_and_paths
   validate :format_of_new_need_ids, if: :need_ids_changed?
 
+  scope :relatable_items, proc {
+    where(:kind.ne => "completed_transaction", :state.ne => "archived")
+      .order_by([[:name, :asc]])
+  }
+
   def self.in_alphabetical_order
     order_by([[:name, :asc]])
   end
@@ -171,15 +176,6 @@ class Artefact
     where(slug: s).first
   end
 
-  def self.relatable_items
-    # Only retrieving the name field, because that's all we use in Panopticon's
-    # helper method (the only place we use this), and it means the index can
-    # cover the query entirely
-    self.in_alphabetical_order
-        .where(:kind.ne => "completed_transaction", :state.ne => "archived")
-        .only(:name)
-  end
-
   # The old-style section string identifier, of the form 'Crime:Prisons'
   def section
     return '' unless self.primary_section

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.4.1"
+  VERSION = "10.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 10.4.1
+  version: 10.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -465,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1806516958570881698
+      hash: 1886016262133551213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -474,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1806516958570881698
+      hash: 1886016262133551213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23