govuk_content_models 24.0.1 → 24.1.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 24.1.0
+
+* Use version numbers for picking current edition in 'Edition.find_and_identify'
+* Changed to depend on the latest major release of gds-sso [10.0.0]
+  which requires a `disabled` field to be defined on the `User` model.
+  This field mirrors the user state in Signon.
+
 ## 24.0.1
 
 * Corrected the request_type recorded in actions for a create_edition

data/app/models/edition.rb

@@ -214,7 +214,7 @@ class Edition
     elsif edition.present?
       scope.where(version_number: edition).first
     else
-      scope.where(state: "published").order_by(:created_at).last
+      scope.where(state: "published").order(version_number: "desc").first
     end
   end
 

data/app/models/user.rb

@@ -21,7 +21,10 @@ class User
   field "permissions",         type: Array
   field "remotely_signed_out", type: Boolean, default: false
   field "organisation_slug",   type: String
-  
+  field "disabled",            type: Boolean, default: false
+
+  index "disabled"
+
   GOVSPEAK_FIELDS = []
 
   # Setup accessible (or protected) attributes for your model
@@ -29,6 +32,8 @@ class User
   attr_accessible :email, :name, :uid, :permissions, as: :oauth
 
   scope :alphabetized, order_by(name: :asc)
+  scope :enabled, any_of({ :disabled.exists => false },
+                         { :disabled.in => [false, nil] })
 
   validates_with SafeHtml
 

data/govuk_content_models.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "bson_ext"
   gem.add_dependency "gds-api-adapters", ">= 10.9.0"
 
-  gem.add_dependency "gds-sso",          ">= 7.0.0", "< 10.0.0"
+  gem.add_dependency "gds-sso",          ">= 10.0.0"
   gem.add_dependency "govspeak",         "~> 3.1.0"
   # Mongoid 2.5.0 supports the newer 1.7.x and 1.8.x Mongo drivers
   gem.add_dependency "mongoid",          "~> 2.5"
@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "factory_girl", "3.3.0"
   gem.add_development_dependency "gem_publisher", "1.2.0"
   gem.add_development_dependency "mocha", "0.13.3"
-  gem.add_development_dependency "multi_json", "1.3.7" # Pinned to allow dependency resolution
+  gem.add_development_dependency "multi_json"
   gem.add_development_dependency "rake", "0.9.2.2"
   gem.add_development_dependency "webmock", "1.8.7"
   gem.add_development_dependency "shoulda-context", "1.0.0"

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -15,6 +15,10 @@ FactoryGirl.define do
     end
   end
 
+  factory :disabled_user, parent: :user do
+    disabled true
+  end
+
   factory :tag do
     sequence(:tag_id) { |n| "crime-and-justice-#{n}" }
     sequence(:title) { |n| "The title #{n}" }

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 = "24.0.1"
+  VERSION = "24.1.0"
 end

data/test/models/user_test.rb

@@ -20,6 +20,17 @@ class UserTest < ActiveSupport::TestCase
     assert_equal "", user.to_s
   end
 
+  test "should return enabled users" do
+    disabled = FactoryGirl.create(:user, disabled: true)
+
+    FactoryGirl.create(:user).unset(:disabled)
+    FactoryGirl.create(:user, disabled: false)
+    FactoryGirl.create(:user, disabled: nil)
+
+    assert_equal 3, User.enabled.count
+    refute User.enabled.include? disabled
+  end
+
   test "should create new user with oauth params" do
     auth_hash = {
       "uid" => "1234abcd",
@@ -30,7 +41,8 @@ class UserTest < ActiveSupport::TestCase
       },
       "extra" => {
         "user" => {
-          "permissions" => ["signin"]
+          "permissions" => ["signin"],
+          "disabled" => false,
         }
       }
     }
@@ -39,6 +51,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal "user@example.com", user.email
     assert_equal "Luther Blisset", user.name
     assert_equal(["signin"], user.permissions)
+    refute user.disabled?
   end
 
   test "should find and update the user with oauth params" do
@@ -53,7 +66,8 @@ class UserTest < ActiveSupport::TestCase
       },
       "extra" => {
         "user" => {
-          "permissions" => []
+          "permissions" => [],
+          "disabled" => true
         }
       }
     }
@@ -62,6 +76,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal "new@m.com", user.email
     assert_equal "New", user.name
     assert_equal([], user.permissions)
+    assert user.disabled?
   end
 
   test "should create insecure gravatar URL" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 24.0.1
+  version: 24.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -49,9 +49,6 @@ dependencies:
     none: false
     requirements:
     - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 7.0.0
-    - - <
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :runtime
@@ -60,9 +57,6 @@ dependencies:
     none: false
     requirements:
     - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 7.0.0
-    - - <
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
@@ -198,17 +192,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -482,7 +476,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3709571854150724441
+      hash: -4065501124018437060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -491,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3709571854150724441
+      hash: -4065501124018437060
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23