rules_engine_users 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rules_engine/controller_users.rb

@@ -2,7 +2,7 @@ module RulesEngine
   module ControllerUsers
     ######### Requires the following paths
     ######### root_path
-
+    
     USER_ACCESS_LEVEL = [
         ["Administrator",       User::ACCESS_LEVEL_ADMIN],
         ["Account Disabled",    User::ACCESS_LEVEL_DISABLED]
@@ -11,7 +11,7 @@ module RulesEngine
     # Inclusion hook to make #current_user #logged_in? and #logged_in_as_admin?
     # available as ActionView helper methods.
     def self.included(base)
-      base.send :helper_method, :current_user, :logged_in?, :logged_in_as_admin?, :logged_in_disabled?, :user_access_level, :user_access_levels
+      base.send :helper_method, :current_user, :logged_in?, :logged_in_as_admin?, :logged_in_disabled?, :user_access_level, :user_access_levels, :can_signup?
       base.send :before_filter, :set_timezone
   
       base.class_eval do
@@ -70,6 +70,10 @@ module RulesEngine
       Time.zone = logged_in? ? current_user.time_zone : "Eastern Time (US & Canada)"
     end      
 
+    def can_signup?
+      ActionController::Base.can_signup?
+    end            
+
     module ClassMethods
       def define_access_level name, access_level
         (class << self; self end).instance_eval do
@@ -97,6 +101,14 @@ module RulesEngine
         
         self.send :helper_method, "#{name}?"
       end
+      
+      def can_signup=(can_signup)
+        @can_signup = can_signup
+      end
+
+      def can_signup?
+        @can_signup || false
+      end            
     end  
 
     protected

data/rails_generators/templates/app/controllers/users_controller.rb

@@ -59,10 +59,22 @@ class UsersController < ApplicationController
   end
 
   def signup_form
-    @user = User.new(:time_zone => 'Eastern Time (US & Canada)', :access_level => UsersController.traveller_access_level)
+    if can_signup?
+      @user = User.new(:time_zone => 'Eastern Time (US & Canada)', :access_level => UsersController.rules_engine_reader_access_level)
     
-    if logged_in?
-      flash[:success] = "User already logged in"
+      if logged_in?
+        flash[:success] = "User already logged in"
+        respond_to do |format|
+          format.html do
+            redirect_to(root_path)      
+          end  
+          format.js do
+            render :inline => "window.location.href = '#{root_path}';"
+          end
+        end
+      end  
+    else
+      flash[:error] = "Signup not supported"
       respond_to do |format|
         format.html do
           redirect_to(root_path)      
@@ -70,14 +82,28 @@ class UsersController < ApplicationController
         format.js do
           render :inline => "window.location.href = '#{root_path}';"
         end
-      end
-    end  
+      end  
+    end
   end
   
   def signup
-    @user = User.new(params[:user].merge(:access_level => UsersController.traveller_access_level))    
-    if @user.save
-      flash[:success] = "A welcome email has been sent to confirm login details"
+    if can_signup?
+      @user = User.new(params[:user].merge(:access_level => UsersController.rules_engine_reader_access_level))    
+      if @user.save
+        flash[:success] = "A welcome email has been sent to confirm login details"
+        respond_to do |format|
+          format.html do
+            redirect_to(root_path)      
+          end  
+          format.js do
+            render :inline => "window.location.href = '#{root_path}';"
+          end
+        end
+      else
+        render :action => 'signup_form'
+      end
+    else
+      flash[:error] = "Signup not supported"
       respond_to do |format|
         format.html do
           redirect_to(root_path)      
@@ -85,9 +111,7 @@ class UsersController < ApplicationController
         format.js do
           render :inline => "window.location.href = '#{root_path}';"
         end
-      end
-    else
-      render :action => 'signup_form'
+      end  
     end
   end
 

data/rails_generators/templates/app/views/users/_login_form.html.erb

@@ -10,7 +10,9 @@
   
       <div class="span-8">
 				<div class="float-left">
-					<%= re_button_link_blue("Signup ?", user_signup_path, :class => "fancybox-link") %>
+					<% if can_signup? %>	
+						<%= re_button_link_blue("Signup ?", user_signup_path, :class => "fancybox-link") %>
+					<% end %>	
 					<%= re_button_link_blue("Forgot Password ?", user_pswd_forgot_path, :class => "fancybox-link") %>
 				</div>	
       </div>

data/rails_generators/templates/config/initializers/rules_engine_users.rb

@@ -2,3 +2,5 @@ ActionController::Base.define_access_level(:rules_engine_editor,   10)
 ActionController::Base.define_access_level(:rules_engine_reader,   5)
 # ActionController::Base.define_access_level(:more_access,   7)
 # ActionController::Base.define_access_level(:less_access,   3)
+
+ActionController::Base.can_signup = false

data/rails_generators/templates/doc/README.rules_engine_users

@@ -76,8 +76,8 @@ ActionController::Routing::Routes.draw do |map|
   map.with_options :controller => 'users', :path_prefix => '/user', :name_prefix => 'user_' do |user|
     user.login  '/',                  :action => 'login_form',       :conditions => { :method => :get }
     user.login  '/',                  :action => 'login',            :conditions => { :method => :post }
-    user.signup '/signup',            :action => 'signup_form',      :conditions => { :method => :get }
-    user.signup '/signup',            :action => 'signup',           :conditions => { :method => :post }
+    # user.signup '/signup',            :action => 'signup_form',      :conditions => { :method => :get }
+    # user.signup '/signup',            :action => 'signup',           :conditions => { :method => :post }
     user.logout '/logout',            :action => 'logout'
     user.pswd_forgot '/pswd_forgot',  :action => 'pswd_forgot_form', :conditions => { :method => :get }
     user.pswd_forgot '/pswd_forgot',  :action => 'pswd_forgot',      :conditions => { :method => :post }

data/rails_generators/templates/spec/controllers/users_controller_spec.rb

@@ -153,32 +153,48 @@ describe UsersController do
   describe "GET signup_form" do
     it "should render the 'signup_form' template" do
       get :signup_form
-      response.should render_template(:signup_form)
+      if controller.can_signup?
+        response.should render_template(:signup_form)
+      else  
+        response.should redirect_to(root_path)
+      end  
     end
 
     it "should render 'signup_form' template for JAVASCRIPT" do
-      xhr :get, :signup_form
-      response.should render_template(:signup_form)
+      if controller.can_signup?
+        xhr :get, :signup_form
+        if controller.can_signup?
+          response.should render_template(:signup_form)
+        else
+          response.body.should == "window.location.href = '#{root_path}';"
+        end  
+      end  
     end
-    
+  
     describe "already logged in" do
       before(:each) do
         controller.stub!(:logged_in?).and_return(true)
       end
 
       it "should set a success message if already lodded in" do
-        get :signup_form
-        flash[:success].should_not be_blank
+        if controller.can_signup?
+          get :signup_form
+          flash[:success].should_not be_blank
+        end  
       end
 
       it "should redirect to the root_path" do
-        get :signup_form
-        response.should redirect_to(root_path)
+        if controller.can_signup?
+          get :signup_form
+          response.should redirect_to(root_path)
+        end  
       end
-      
+    
       it "should redirect to the root_path JAVASCRIPT" do
-        xhr :get, :signup_form
-        response.body.should == "window.location.href = '#{root_path}';"
+        if controller.can_signup?
+          xhr :get, :signup_form
+          response.body.should == "window.location.href = '#{root_path}';"
+        end  
       end
     end
   end    

data/spec/rules_engine/controller_users_spec.rb

@@ -224,7 +224,7 @@ describe "ControllerUsers", :type => :controller  do
     
     describe "_access_level" do
       it "should return the access level" do
-        ActionController::Base.reporter_access_level.should == 200
+        MockControllerUsersController.reporter_access_level.should == 200
       end
     end    
     
@@ -316,6 +316,15 @@ describe "ControllerUsers", :type => :controller  do
       end
     end
     
+    describe "can_signup?" do
+      it "should be able to set the value" do
+        ActionController::Base.can_signup = true
+        controller.should be_can_signup
+        ActionController::Base.can_signup = false
+        controller.should_not be_can_signup      
+      end
+    end
+    
     describe "user time zone" do
       it "Set the time zone to the user's timezone" do
         controller.stub!(:current_user).and_return(@current_user)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rules_engine_users
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chris Douglas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +10:00
+date: 2010-09-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency