janus 0.6.0 → 0.7.0

data/lib/generators/templates/model.erb

@@ -0,0 +1,8 @@
+class <%= class_name %> < ActiveRecord::Base
+  include Janus::Models::Base
+  include Janus::Models::DatabaseAuthenticatable
+  include Janus::Models::Confirmable
+  include Janus::Models::Rememberable
+  # include Janus::Models::RemoteAuthenticatable
+  # include Janus::Models::Trackable
+end

data/lib/generators/templates/passwords/edit.html.erb

@@ -0,0 +1,21 @@
+<h1><%%= t 'janus.passwords.edit.change_password' %></h1>
+
+<%%= form_for @<%= singular_name %>, :url => <%= singular_name %>_password_path, :method => :put do |f| %>
+  <%%= janus_error_messages %>
+
+  <%%= f.hidden_field :reset_password_token %>
+
+  <div class="field">
+    <%%= f.label :password %>
+    <%%= f.password_field :password %>
+  </div>
+
+  <div class="field">
+    <%%= f.label :password_confirmation %>
+    <%%= f.password_field :password_confirmation %>
+  </div>
+
+  <div class="actions">
+    <%%= f.submit t('janus.passwords.edit.change_password_btn') %>
+  </div>
+<%% end %>

data/lib/generators/templates/passwords/new.html.erb

@@ -0,0 +1,16 @@
+<h1><%%= t 'janus.passwords.new.forgot_password' %></h1>
+
+<%%= form_for @<%= singular_name %>, :url => <%= singular_name %>_password_path, :method => :post do |f| %>
+  <%%= janus_error_messages %>
+
+  <%% <%= class_name %>.authentication_keys.each do |key| %>
+    <div class="field">
+      <%%= f.label key %>
+      <%%= f.text_field key %>
+    </div>
+  <%% end %>
+
+  <div class="actions">
+    <%%= f.submit t('janus.passwords.new.send_instructions_btn') %>
+  </div>
+<%% end %>

data/lib/generators/templates/passwords_controller.erb

@@ -0,0 +1,3 @@
+class <%= class_name.pluralize %>::PasswordsController < Janus::PasswordsController
+  respond_to :html
+end

data/lib/generators/templates/registrations/edit.html.erb

@@ -0,0 +1,31 @@
+<h1><%%= t 'janus.registrations.edit.my_account' %></h1>
+
+<%%= form_for @<%= singular_name %>, :url => <%= singular_name %>_registration_path, :method => :put do |f| %>
+  <%%= janus_error_messages %>
+
+  <%% <%= class_name %>.authentication_keys.each do |key| %>
+    <div class="field">
+      <%%= f.label key %>
+      <%%= f.text_field key %>
+    </div>
+  <%% end %>
+
+  <div class="field">
+    <%%= f.label :current_password %>
+    <%%= f.password_field :current_password %>
+  </div>
+
+  <div class="field">
+    <%%= f.label :password %>
+    <%%= f.password_field :password %>
+  </div>
+
+  <div class="field">
+    <%%= f.label :password_confirmation %>
+    <%%= f.password_field :password_confirmation %>
+  </div>
+
+  <div class="actions">
+    <%%= f.submit t('janus.registrations.edit.save_changes_btn') %>
+  </div>
+<%% end %>

data/lib/generators/templates/registrations/new.html.erb

@@ -0,0 +1,26 @@
+<h1><%%= t 'janus.registrations.new.sign_up' %></h1>
+
+<%%= form_for @<%= singular_name %>, :url => <%= singular_name %>_registration_path do |f| %>
+  <%%= janus_error_messages %>
+
+  <%% <%= class_name %>.authentication_keys.each do |key| %>
+    <div class="field">
+      <%%= f.label key %>
+      <%%= f.text_field key %>
+    </div>
+  <%% end %>
+
+  <div class="field">
+    <%%= f.label :password %>
+    <%%= f.password_field :password %>
+  </div>
+
+  <div class="field">
+    <%%= f.label :password_confirmation %>
+    <%%= f.password_field :password_confirmation %>
+  </div>
+
+  <div class="actions">
+    <%%= f.submit t('janus.registrations.new.sign_up_btn') %>
+  </div>
+<%% end %>

data/lib/generators/templates/registrations_controller.erb

@@ -0,0 +1,17 @@
+class <%= class_name.pluralize %>::RegistrationsController < Janus::RegistrationsController
+  respond_to :html
+
+  # def after_sign_up_url(<%= singular_name %>)
+  #   profile_url(<%= singular_name %>)
+  # end
+
+  def <%= singular_name %>_params
+    if params.respond_to?(:permit)
+      # Rails 4 (or Rails 3 + strong_parameters)
+      params.require(:<%= singular_name %>).permit(:email, :current_password, :password, :password_confirmation)
+    else
+      # Rails 3
+      params[:<%= singular_name %>].slice(:email, :current_password, :password, :password_confirmation)
+    end
+  end
+end

data/lib/generators/templates/sessions/new.html.erb

@@ -0,0 +1,30 @@
+<h1><%%= t 'janus.sessions.new.sign_in' %></h1>
+
+<%%= form_for @<%= singular_name %>, :url => <%= singular_name %>_session_path, :method => :post do |f| %>
+  <%%= hidden_field_tag :return_to, params[:return_to] if params[:return_to] %>
+
+  <%%= janus_error_messages %>
+
+  <%% <%= class_name %>.authentication_keys.each do |key| %>
+    <div class="field">
+      <%%= f.label key %>
+      <%%= f.text_field key %>
+    </div>
+  <%% end %>
+
+  <div class="field">
+    <%%= f.label :password %>
+    <%%= f.password_field :password %>
+  </div>
+
+  <%% if @<%= singular_name %>.respond_to?(:remember_me!) %>
+    <div class="field">
+      <%%= check_box_tag :remember_me, '1' %>
+      <%%= label_tag :remember_me, <%= class_name %>.human_attribute_name(:remember_me) %>
+    </div>
+  <%% end %>
+
+  <div class="actions">
+    <%%= f.submit t('janus.sessions.new.sign_in_btn') %>
+  </div>
+<%% end %>

data/lib/generators/templates/sessions_controller.erb

@@ -0,0 +1,11 @@
+class <%= class_name.pluralize %>::SessionsController < Janus::SessionsController
+  respond_to :html
+
+  # def after_sign_in_url(<%= singular_name %>)
+  #   profile_url(<%= singular_name %>)
+  # end
+
+  # def valid_remote_host?(host)
+  #   ['www.example.com', 'test.host'].include?(host)
+  # end
+end

data/lib/janus.rb

@@ -3,6 +3,7 @@ require 'janus/config'
 require 'janus/hooks'
 require 'janus/strategies'
 require 'janus/manager'
+require 'janus/rails' if defined?(Rails)
 
 autoload :JanusHelper, 'janus/helper'
 

data/lib/janus/config.rb

@@ -3,26 +3,32 @@ require 'active_support/time'
 module Janus
   module Config
     mattr_accessor :contact_email
-    
+
     # DatabaseAuthenticatable
     mattr_accessor :authentication_keys, :encryptor, :stretches, :pepper, :scrypt_options
     self.authentication_keys = [ :email ]
+
     self.encryptor = :bcrypt
+#    self.encryptor = :scrypt
+
+    # bcrypt config
     self.stretches = 10
     self.pepper = nil
+
+    # scrypt config
     self.scrypt_options = { :max_time => 0.25 }
-    
+
     # Confirmable
     mattr_accessor :confirmation_key #,reconfirmable
     self.confirmation_key = :confirm_token
 #    self.reconfirmable = true
-    
+
     # Rememberable
     mattr_accessor :remember_for, :extend_remember_period #, :remember_across_browsers
     self.remember_for = 1.year
     self.extend_remember_period = false
 #    self.remember_across_browsers = false
-    
+
     # RemoteAuthenticatable
     mattr_accessor :remote_authentication_key
     self.remote_authentication_key = :remote_token

data/lib/janus/controllers/confirmations_controller.rb

@@ -7,10 +7,10 @@ class Janus::ConfirmationsController < ApplicationController
 
   def show
     self.resource = resource_class.find_for_confirmation(params[resource_class.confirmation_key])
-    
+
     if resource
       resource.confirm!
-      
+
       respond_to do |format|
         format.html { redirect_to root_url, :notice => t('flash.janus.confirmations.edit.confirmed') }
         format.any  { head :ok }
@@ -22,7 +22,7 @@ class Janus::ConfirmationsController < ApplicationController
           resource.errors.add(:base, :invalid_token)
           render 'new'
         end
-        
+
         format.any { head :bad_request }
       end
     end
@@ -35,10 +35,10 @@ class Janus::ConfirmationsController < ApplicationController
 
   def create
     self.resource = resource_class.find_for_database_authentication(params[resource_name])
-    
+
     if resource
       JanusMailer.confirmation_instructions(resource).deliver
-      
+
       respond_to do |format|
         format.html { redirect_to root_url, :notice => t('flash.janus.confirmations.create.email_sent') }
         format.any  { head :ok }
@@ -50,7 +50,7 @@ class Janus::ConfirmationsController < ApplicationController
           resource.errors.add(:base, :not_found)
           render 'new'
         end
-        
+
         format.any { head :not_found }
       end
     end

data/lib/janus/controllers/helpers.rb

@@ -47,19 +47,19 @@ module Janus
         scopes.each do |scope|
           class_eval <<-EOV
             helper_method :#{scope}_signed_in?, :current_#{scope}, :#{scope}_session
-            
+
             def authenticate_#{scope}!
               janus.authenticate!(:#{scope})
             end
-            
+
             def current_#{scope}
               @current_#{scope} ||= janus.authenticate(:#{scope})
             end
-            
+
             def #{scope}_signed_in?
               janus.authenticate?(:#{scope})
             end
-            
+
             def #{scope}_session
               janus.session(:#{scope}) if #{scope}_signed_in?
             end

data/lib/janus/controllers/passwords_controller.rb

@@ -12,11 +12,11 @@ class Janus::PasswordsController < ApplicationController
 
   def create
     self.resource = resource_class.find_for_database_authentication(params[resource_name])
-    
+
     if resource
       resource.generate_reset_password_token!
       JanusMailer.reset_password_instructions(resource).deliver
-      
+
       respond_to do |format|
         format.html { redirect_to root_url, :notice => t('flash.janus.passwords.create.email_sent') }
         format.any  { head :ok }
@@ -40,7 +40,7 @@ class Janus::PasswordsController < ApplicationController
 
   def update
     self.resource = resource_class.find_for_password_reset(params[resource_name][:reset_password_token])
-    
+
     if resource
       if resource.reset_password!(params[resource_name])
         respond_to do |format|

data/lib/janus/controllers/registrations_controller.rb

@@ -17,33 +17,29 @@ class Janus::RegistrationsController < ApplicationController
   end
 
   def create
-    self.resource = resource_class.new(params[resource_name])
-    
+    self.resource = resource_class.new(send("#{janus_scope}_params"))
+
     if resource.save
       janus.login(resource, :scope => janus_scope, :rememberable => true)
       JanusMailer.confirmation_instructions(resource).deliver if resource.respond_to?(:confirm!)
     else
       resource.clean_up_passwords
     end
-    
+
     respond_with(resource, :location => after_sign_up_url(resource))
   end
 
   def update
-    params[resource_name].each do |key, value|
-      params[resource_name].delete(key) if value.blank? && [:password, :password_confirmation].include?(key.to_sym)
-    end
-    
     self.resource = send("current_#{janus_scope}")
     resource.current_password = ""
-    resource.clean_up_passwords unless resource.update_attributes(params[resource_name])
+    resource.clean_up_passwords unless resource.update_attributes(resource_params)
     respond_with(resource, :location => after_sign_up_url(resource))
   end
 
   def destroy
     self.resource = send("current_#{janus_scope}")
     janus.unset_user(janus_scope) if resource.destroy
-    
+
     respond_with(resource) do |format|
       format.html { redirect_to root_url }
     end
@@ -52,4 +48,11 @@ class Janus::RegistrationsController < ApplicationController
   def after_sign_up_url(user)
     user
   end
+
+  def resource_params
+    keys = %w{current_password password password_confirmation}
+    send("#{janus_scope}_params").reject do |key, value|
+      value.blank? and keys.include?(key)
+    end
+  end
 end

data/lib/janus/controllers/sessions_controller.rb

@@ -17,7 +17,7 @@ class Janus::SessionsController < ApplicationController
 
   def new
     params[:return_to] ||= request.env["HTTP_REFERER"]
-    
+
     if signed_in?(janus_scope)
       redirect_after_sign_in(send("current_#{janus_scope}"))
     else
@@ -28,10 +28,10 @@ class Janus::SessionsController < ApplicationController
 
   def create
     self.resource = resource_class.find_for_database_authentication(params[resource_name])
-    
+
     if resource && resource.valid_password?(params[resource_name][:password])
       janus.login(resource, :scope => janus_scope, :rememberable => params[:remember_me])
-      
+
       respond_to do |format|
         format.html { redirect_after_sign_in(resource) }
         format.any  { head :ok }
@@ -39,7 +39,7 @@ class Janus::SessionsController < ApplicationController
     else
       respond_to do |format|
         format.html do
-          self.resource ||= resource_class.new(params[resource_name])
+          self.resource ||= resource_class.new(resource_params)
           resource.clean_up_passwords
           resource.errors.add(:base, :not_found)
           render "new", :status => :unauthorized
@@ -51,7 +51,7 @@ class Janus::SessionsController < ApplicationController
 
   def destroy
     janus.logout(janus_scope)
-    
+
     respond_to do |format|
       format.html { redirect_to after_sign_out_url(janus_scope) }
       format.any  { head :ok }
@@ -119,13 +119,21 @@ class Janus::SessionsController < ApplicationController
             query = return_to.query_values || {}
             return_to.query_values = query.merge(user.class.remote_authentication_key => user.generate_remote_token!)
           end
-          
+
           redirect_to return_to.to_s
           return
         end
       end
     end
-    
+
     redirect_to after_sign_in_url(user)
   end
+
+  def resource_params
+    if params.respond_to?(:permit)
+      params.require(janus_scope).permit(*resource_class.authentication_keys)
+    else
+      params[janus_scope].slice(*resource_class.authentication_keys)
+    end
+  end
 end

data/lib/janus/helper.rb

@@ -1,7 +1,7 @@
 module JanusHelper
   def janus_error_messages
     return "" if resource.errors.empty?
-    
+
     content_tag :div, :id => 'error_explanation' do
       content_tag :ul do
         resource.errors.full_messages.map { |message| content_tag :li, message }.join.html_safe

data/lib/janus/hooks.rb

@@ -5,19 +5,19 @@ module Janus
     # Hooks allow you the react at the different steps of a user session.
     # All callbacks will receive the same arguments: +user+, +manager+ and
     # +options+.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Janus::Manager.after_login do |user, manager, options|
     #     session = manager.session(options[:scope])
-    #     
+    #
     #     # write some great code here
     #   end
-    # 
+    #
     # Options:
-    # 
+    #
     # - +:scope+
-    # 
+    #
     module ClassMethods
       # Executed after a strategy succeeds to authenticate a user.
       def after_authenticate(&block)