thoughtbot-clearance 0.2.5 → 0.2.6

data/lib/clearance/app/controllers/sessions_controller.rb

@@ -1,72 +1,77 @@
 module Clearance
-  module SessionsController
+  module App
+    module Controllers
+      module SessionsController
 
-    def self.included(base)
-      base.class_eval do
-        skip_before_filter :authenticate
-        protect_from_forgery :except => :create
-        filter_parameter_logging :password
+        def self.included(base)
+          base.class_eval do
+            skip_before_filter :authenticate
+            protect_from_forgery :except => :create
+            filter_parameter_logging :password
         
-        include InstanceMethods
+            include InstanceMethods
         
-      protected
-        include ProtectedInstanceMethods
-      end
-    end
+          protected
+            include ProtectedInstanceMethods
+          end
+        end
     
-    module InstanceMethods
-      def create
-        remember_me = params[:session][:remember_me] if params[:session]
-        login_via_password(params[:session][:email], params[:session][:password], remember_me)
-      end
+        module InstanceMethods
+          def create
+            remember_me = params[:session][:remember_me] if params[:session]
+            login_via_password(params[:session][:email], params[:session][:password], remember_me)
+          end
 
-      def destroy
-        forget(current_user)
-        reset_session
-        flash[:notice] = 'You have been logged out.'
-        redirect_to url_after_destroy
-      end
-    end
-
-    module ProtectedInstanceMethods
-      def login_via_password(email, password, remember_me)
-        user = user_model.authenticate(email, password)
-        if login(user)
-          create_session_for(user)
-          remember(user) if remember_me == '1'
-          login_successful
-        else
-          login_failure
+          def destroy
+            forget(current_user)
+            reset_session
+            flash[:notice] = 'You have been logged out.'
+            redirect_to url_after_destroy
+          end
         end
-      end
+
+        module ProtectedInstanceMethods
+          def login_via_password(email, password, remember_me)
+            user = user_model.authenticate(email, password)
+            if login(user)
+              create_session_for(user)
+              remember(user) if remember_me == '1'
+              login_successful
+            else
+              login_failure
+            end
+          end
       
-      def login_successful
-        flash[:notice] = 'Logged in successfully'
-        redirect_back_or url_after_create
-      end
+          def login_successful
+            flash[:notice] = 'Logged in successfully'
+            redirect_back_or url_after_create
+          end
 
-      def login_failure(message = "Bad email or password.")
-        flash.now[:notice] = message
-        render :action => :new
-      end
+          def login_failure(message = "Bad email or password.")
+            flash.now[:notice] = message
+            render :action => :new
+          end
       
-      def remember(user)
-        user.remember_me!
-        cookies[:auth_token] = { :value   => user.remember_token, 
-                                 :expires => user.remember_token_expires_at }
-      end
+          def remember(user)
+            user.remember_me!
+            cookies[:auth_token] = { :value   => user.remember_token, 
+                                     :expires => user.remember_token_expires_at }
+          end
 
-      def forget(user)
-        user.forget_me! if user
-        cookies.delete :auth_token
-      end
+          def forget(user)
+            user.forget_me! if user
+            cookies.delete :auth_token
+          end
 
-      def url_after_create
-        root_url
-      end
+          def url_after_create
+            root_url
+          end
 
-      def url_after_destroy
-        new_session_url
+          def url_after_destroy
+            new_session_url
+          end
+        end
+        
       end
     end
   end

data/lib/clearance/app/controllers/users_controller.rb

@@ -1,42 +1,46 @@
 module Clearance
-  module UsersController
+  module App
+    module Controllers
+      module UsersController
 
-    def self.included(base)
-      base.class_eval do
-        before_filter :redirect_to_root, :only => [:new, :create], :if => :logged_in?
+        def self.included(base)
+          base.class_eval do
+            before_filter :redirect_to_root, :only => [:new, :create], :if => :logged_in?
         
-        filter_parameter_logging :password
+            filter_parameter_logging :password
         
-        include InstanceMethods
+            include InstanceMethods
         
-      private
-        include PrivateInstanceMethods
-      end
-    end
+          private
+            include PrivateInstanceMethods
+          end
+        end
 
-    module InstanceMethods
-      def new
-        @user = user_model.new(params[:user])
-      end
+        module InstanceMethods
+          def new
+            @user = user_model.new(params[:user])
+          end
       
-      def create
-        @user = user_model.new params[:user]
-        if @user.save
-          UserMailer.deliver_confirmation @user
-          flash[:notice] = "You will receive an email within the next few minutes. It contains instructions to confirm your account."
-          redirect_to new_session_url
-        else
-          render :action => "new"
+          def create
+            @user = user_model.new params[:user]
+            if @user.save
+              UserMailer.deliver_confirmation @user
+              flash[:notice] = "You will receive an email within the next few minutes. It contains instructions for you to confirm your account."
+              redirect_to new_session_url
+            else
+              render :action => "new"
+            end
+          end
         end
-      end
-    end
 
-    module PrivateInstanceMethods
+        module PrivateInstanceMethods
+
+          def url_after_create
+            new_session_url
+          end
+        end
 
-      def url_after_create
-        new_session_url
       end
     end
-
   end
 end

data/lib/clearance/app/models/user.rb

@@ -1,84 +1,86 @@
 module Clearance
-  module Models
-    module User
+  module App
+    module Models
+      module User
     
-      def self.included(base)
-        base.class_eval do
+        def self.included(base)
+          base.class_eval do
         
-          attr_accessible :email, :password, :password_confirmation
-          attr_accessor :password, :password_confirmation
+            attr_accessible :email, :password, :password_confirmation
+            attr_accessor :password, :password_confirmation
 
-          validates_presence_of     :email
-          validates_presence_of     :password, :if => :password_required?
-          validates_confirmation_of :password, :if => :password_required?
-          validates_uniqueness_of   :email
+            validates_presence_of     :email
+            validates_presence_of     :password, :if => :password_required?
+            validates_confirmation_of :password, :if => :password_required?
+            validates_uniqueness_of   :email
 
-          before_save :initialize_salt, :encrypt_password
+            before_save :initialize_salt, :encrypt_password
         
-          extend ClassMethods
-          include InstanceMethods
+            extend ClassMethods
+            include InstanceMethods
         
-        protected
+          protected
 
-          include ProtectedInstanceMethods
+            include ProtectedInstanceMethods
         
+          end
         end
-      end
     
-      module ClassMethods
-        def authenticate(email, password)
-          user = find_by_email email
-          user && user.authenticated?(password) ? user : nil
+        module ClassMethods
+          def authenticate(email, password)
+            user = find_by_email email
+            user && user.authenticated?(password) ? user : nil
+          end
         end
-      end
     
-      module InstanceMethods
-        def authenticated?(password)
-          crypted_password == encrypt(password)
-        end
+        module InstanceMethods
+          def authenticated?(password)
+            crypted_password == encrypt(password)
+          end
 
-        def encrypt(password)
-          Digest::SHA1.hexdigest "--#{salt}--#{password}--"
-        end
+          def encrypt(password)
+            Digest::SHA1.hexdigest "--#{salt}--#{password}--"
+          end
 
-        def remember_token?
-          remember_token_expires_at && Time.now.utc < remember_token_expires_at
-        end
+          def remember_token?
+            remember_token_expires_at && Time.now.utc < remember_token_expires_at
+          end
 
-        def remember_me!
-          remember_me_until 2.weeks.from_now.utc
-        end
+          def remember_me!
+            remember_me_until 2.weeks.from_now.utc
+          end
 
-        def remember_me_until(time)
-          self.update_attribute :remember_token_expires_at, time
-          self.update_attribute :remember_token, encrypt("#{email}--#{remember_token_expires_at}")
-        end
+          def remember_me_until(time)
+            self.update_attribute :remember_token_expires_at, time
+            self.update_attribute :remember_token, encrypt("#{email}--#{remember_token_expires_at}")
+          end
 
-        def forget_me!
-          self.update_attribute :remember_token_expires_at, nil
-          self.update_attribute :remember_token, nil
-        end
+          def forget_me!
+            self.update_attribute :remember_token_expires_at, nil
+            self.update_attribute :remember_token, nil
+          end
         
-        def confirm!
-          update_attribute :confirmed, true
+          def confirm!
+            self.update_attribute :confirmed, true
+          end
         end
-      end
     
-      module ProtectedInstanceMethods
-        def initialize_salt
-          self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-        end
+        module ProtectedInstanceMethods
+          def initialize_salt
+            self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
+          end
 
-        def encrypt_password
-          return if password.blank?
-          self.crypted_password = encrypt(password)
-        end
+          def encrypt_password
+            return if password.blank?
+            self.crypted_password = encrypt(password)
+          end
 
-        def password_required?
-          crypted_password.blank? || !password.blank?
+          def password_required?
+            crypted_password.blank? || !password.blank?
+          end
         end
-      end
   
+      end
     end
   end
 end

data/lib/clearance/app/models/user_mailer.rb

@@ -1,29 +1,32 @@
 module Clearance
-  module Mailers
-    module User
+  module App
+    module Models
+      module UserMailer
     
-      def self.included(base)
-        base.class_eval do
+        def self.included(base)
+          base.class_eval do
         
-          include InstanceMethods
+            include InstanceMethods
         
+          end
         end
-      end
     
-      module InstanceMethods
-        def change_password(user)
-          from       "donotreply@example.com"
-          recipients user.email
-          subject    "[YOUR APP] Request to change your password"
-          body       :user => user
-        end
+        module InstanceMethods
+          def change_password(user)
+            from       "donotreply@example.com"
+            recipients user.email
+            subject    "[YOUR APP] Request to change your password"
+            body       :user => user
+          end
         
-        def confirmation(user)
-          recipients user.email
-          from "donotreply@example.com"
-          subject 'Account Confirmation'
-          body :user => user
+          def confirmation(user)
+            recipients user.email
+            from "donotreply@example.com"
+            subject 'Account Confirmation'
+            body :user => user
+          end
         end
+        
       end
     end
   end

data/lib/clearance/test/test_helper.rb

@@ -1,88 +1,90 @@
 module Clearance 
-  module TestHelper
+  module Test
+    module TestHelper
     
-    def self.included(base)
-      base.class_eval do
-        include InstanceMethods
-        extend ClassMethods
+      def self.included(base)
+        base.class_eval do
+          include InstanceMethods
+          extend ClassMethods
+        end
       end
-    end
 
-    module InstanceMethods
-      def login_as(user = nil)
-        user ||= Factory(:user)
-        @request.session[:user_id] = user.id
-        return user
-      end
+      module InstanceMethods
+        def login_as(user = nil)
+          user ||= Factory(:user)
+          @request.session[:user_id] = user.id
+          return user
+        end
 
-      def logout 
-        @request.session[:user_id] = nil
+        def logout 
+          @request.session[:user_id] = nil
+        end
       end
-    end
     
-    module ClassMethods
-      def should_deny_access_on(command, opts = {})
-        opts[:redirect] ||= "root_url"
+      module ClassMethods
+        def should_deny_access_on(command, opts = {})
+          opts[:redirect] ||= "root_url"
 
-        context "on #{command}" do
-          setup { eval command }
-          should_redirect_to opts[:redirect]
-          if opts[:flash]
-            should_set_the_flash_to opts[:flash]
-          else
-            should_not_set_the_flash
+          context "on #{command}" do
+            setup { eval command }
+            should_redirect_to opts[:redirect]
+            if opts[:flash]
+              should_set_the_flash_to opts[:flash]
+            else
+              should_not_set_the_flash
+            end
           end
         end
-      end
       
-      # should_have_form :action => 'admin_users_path',
-      #   :method => :get, 
-      #   :fields => { 'email' => :text }
-      # TODO: http_method should be pulled out
-      def should_have_form(opts)
-        model = self.name.gsub(/ControllerTest$/, '').singularize.downcase
-        model = model[model.rindex('::')+2..model.size] if model.include?('::')
-        http_method, hidden_http_method = form_http_method opts[:method]
-        should "have a #{model} form" do
-          assert_select "form[action=?][method=#{http_method}]", eval(opts[:action]) do
-            if hidden_http_method
-              assert_select "input[type=hidden][name=_method][value=#{hidden_http_method}]"
-            end
-            opts[:fields].each do |attribute, type|
-              attribute = attribute.is_a?(Symbol) ? "#{model}[#{attribute.to_s}]" : attribute
-              assert_select "input[type=#{type.to_s}][name=?]", attribute
+        # should_have_form :action => 'admin_users_path',
+        #   :method => :get, 
+        #   :fields => { 'email' => :text }
+        # TODO: http_method should be pulled out
+        def should_have_form(opts)
+          model = self.name.gsub(/ControllerTest$/, '').singularize.downcase
+          model = model[model.rindex('::')+2..model.size] if model.include?('::')
+          http_method, hidden_http_method = form_http_method opts[:method]
+          should "have a #{model} form" do
+            assert_select "form[action=?][method=#{http_method}]", eval(opts[:action]) do
+              if hidden_http_method
+                assert_select "input[type=hidden][name=_method][value=#{hidden_http_method}]"
+              end
+              opts[:fields].each do |attribute, type|
+                attribute = attribute.is_a?(Symbol) ? "#{model}[#{attribute.to_s}]" : attribute
+                assert_select "input[type=#{type.to_s}][name=?]", attribute
+              end
+              assert_select "input[type=submit]"
             end
-            assert_select "input[type=submit]"
           end
         end
-      end
       
-      def form_http_method(http_method)
-        http_method = http_method.nil? ? 'post' : http_method.to_s
-        if http_method == "post" || http_method == "get"
-          return http_method, nil
-        else
-          return "post", http_method
+        def form_http_method(http_method)
+          http_method = http_method.nil? ? 'post' : http_method.to_s
+          if http_method == "post" || http_method == "get"
+            return http_method, nil
+          else
+            return "post", http_method
+          end
         end
-      end
       
-      def logged_in_user_context(&blk)
-        context "A logged in user" do
-          setup do
-            @user = Factory :user
-            login_as @user
+        def logged_in_user_context(&blk)
+          context "A logged in user" do
+            setup do
+              @user = Factory :user
+              login_as @user
+            end
+            merge_block(&blk)
           end
-          merge_block(&blk)
         end
-      end
       
-      def public_context(&blk)
-        context "The public" do
-          setup { logout }
-          merge_block(&blk)
+        def public_context(&blk)
+          context "The public" do
+            setup { logout }
+            merge_block(&blk)
+          end
         end
       end
-    end
-  
+ 
+    end 
   end
 end