govuk_content_models 6.0.6 → 6.1.0

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## 6.1.0
+
+makes this gem compatible with gds-sso (9.2.0)
+by adding the organisation_slug to User.

data/app/models/user.rb

@@ -22,6 +22,7 @@ class User
   field "email",               type: String
   field "permissions",         type: Array
   field "remotely_signed_out", type: Boolean, default: false
+  field "organisation_slug",   type: String
   
   GOVSPEAK_FIELDS = []
 
@@ -33,12 +34,6 @@ class User
 
   validates_with SafeHtml
 
-  # GDS::SSO specifically looks for find_by_uid within warden
-  # when loading authentication user from session
-  def self.find_by_uid(uid)
-    where(uid: uid).first
-  end
-
   def to_s
     name || email || ""
   end

data/govuk_content_models.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "differ"
   gem.add_dependency "gds-api-adapters"
 
-  gem.add_dependency "gds-sso",          ">= 3.0.0", "< 4.0.0"
+  gem.add_dependency "gds-sso",          ">= 7.0.0", "< 10.0.0"
   gem.add_dependency "govspeak",         ">= 1.0.1", "< 2.0.0"
   # Mongoid 2.5.0 supports the newer 1.7.x and 1.8.x Mongo drivers
   gem.add_dependency "mongoid",          "~> 2.5"

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 = "6.0.6"
+  VERSION = "6.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -66,10 +66,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 7.0.0
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,10 +77,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 7.0.0
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: govspeak
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +337,7 @@ files:
 - .gitignore
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -453,7 +454,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2437937241290914475
+      hash: -3811890245827365006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -462,7 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2437937241290914475
+      hash: -3811890245827365006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23