muck-users 0.3.14 → 0.3.15

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/app/controllers/muck/users_controller.rb

@@ -51,6 +51,7 @@ class Muck::UsersController < ApplicationController
     @page_title = t('muck.users.register_account', :application_name => GlobalConfig.application_name)
     cookies.delete :auth_token
     @user = User.new(params[:user])
+    @user.terms_of_service = true if params[:user][:terms_of_service] # This value is not mass updatable and must be set manually.
     check_access_code
     check_recaptcha
     success, path = setup_user

data/lib/active_record/acts/muck_user.rb

@@ -44,6 +44,11 @@ module ActiveRecord
           extend ActiveRecord::Acts::MuckUser::SingletonMethods
           
         end
+        
+        def validates_terms_of_service
+          validate_on_create :accepts_terms_of_service?
+        end
+
       end
 
       # class methods
@@ -198,6 +203,12 @@ module ActiveRecord
           CGI::escapeHTML(self.login)
         end
         
+        def accepts_terms_of_service?
+          if !self.terms_of_service
+            errors.add_to_base(I18n.translate('muck.users.terms_of_service_required'))
+          end
+        end
+        
       end 
     end
   end

data/locales/en.yml

@@ -77,6 +77,7 @@ en:
       cannot_deactivate_yourself: You cannot deactivate yourself!
       bulk_access_codes_description: This will generate a unique, single use access code for each of the emails provided.
       add: Add
+      terms_of_service_required: You must accept the terms of service.
       admin: 
         activate_all_inactive_users_confirm: Are you sure you want to activate all inactive users in the system?  This cannot be undone!
         activate_all_inactive_users: Activate All Inactive Users

data/muck-users.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]

data/test/rails_root/app/models/user.rb

@@ -35,6 +35,7 @@ class User < ActiveRecord::Base
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
   acts_as_muck_user
+  validates_terms_of_service
 
   # these are just for testing
   def creator_id

data/test/rails_root/test/unit/user_test.rb

@@ -118,6 +118,16 @@ class UserTest < ActiveSupport::TestCase
     end
   end
   
+  context "terms of service set to false" do
+    setup do
+      @user = Factory.build(:user, :terms_of_service => false)
+    end
+    should "not create the user" do
+      assert !@user.valid?
+      assert @user.errors.full_messages.include?(I18n.translate('muck.users.terms_of_service_required'))      
+    end
+  end
+  
   context "a user" do
     should "have full name" do
       assert_difference 'User.count' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 3
-  - 14
-  version: 0.3.14
+  - 15
+  version: 0.3.15
 platform: ruby
 authors: 
 - Justin Ball