muck-users 3.1.8 → 3.1.9

data/VERSION

@@ -1 +1 @@
-3.1.8
+3.1.9

data/app/controllers/admin/muck/access_code_requests_controller.rb

@@ -11,15 +11,15 @@ class Admin::Muck::AccessCodeRequestsController < Admin::Muck::BaseController
   end
   
   def send_code
+    @expires_at = 1.year.from_now
     @access_code_request = AccessCodeRequest.find(params[:id])
     render :template => "admin/access_code_requests/send_code", :layout => false
   end
   
   def update
-    debugger
     @access_code_request = AccessCodeRequest.find(params[:id])
     if params[:send_access_code]
-      @success = @access_code_request.send_access_code(params[:subject], params[:message])
+      @success = @access_code_request.send_access_code(params[:subject], params[:message], params[:expires_at])
     else
       @success = @access_code_request.update_attributes(params[:access_code_request])
     end
@@ -31,7 +31,7 @@ class Admin::Muck::AccessCodeRequestsController < Admin::Muck::BaseController
     end
     
   rescue => ex
-    flash[:error] = ex
+    flash[:error] = ex.to_s
     output_admin_messages
   end
   

data/app/controllers/muck/user_sessions_controller.rb

@@ -35,21 +35,29 @@ class Muck::UserSessionsController < ApplicationController
     flash[:notice] = t('muck.users.login_out_success')
     respond_to do |format|
       format.html { redirect_to logout_complete_path }
+      format.json { render :json => { :logged_in => false, :message => t('muck.users.login_out_success') } }
     end
   end
   
+  def login_check
+    render :json => { :logged_in => logged_in? }
+  end
+  
   protected
   
     def after_create_response(success)
       if success
-        flash[:notice] = t('muck.users.login_success')
         respond_to do |format|
-          format.html { redirect_back_or_default user_path(@user_session.user) }
+          format.html do
+            flash[:notice] = t('muck.users.login_success')
+            redirect_back_or_default(user_path(@user_session.user))
+          end
+          format.json { render :json => { :logged_in => true, :message => t('muck.users.login_success'), :user => @user.to_json } }
         end
       else
-        flash[:notice] = t('muck.users.login_fail')
         respond_to do |format|
-          format.html { render :template => 'user_sessions/new' }
+          format.html { render :template => 'user_sessions/new', :notice => t('muck.users.login_fail') }
+          format.json { render :json => { :logged_in => false, :message => t('muck.users.login_fail') } }
         end
       end
     end

data/app/controllers/muck/users_controller.rb

@@ -10,9 +10,9 @@ class Muck::UsersController < ApplicationController
     @user ||= current_user
     if @user == current_user
       @page_title = @user.to_param
-      standard_response('show')
+      standard_response('show', true)
     else
-      redirect_to public_user_path(@user)
+      standard_response('show', false, public_user_path(@user))
     end
   end
   
@@ -35,15 +35,13 @@ class Muck::UsersController < ApplicationController
   def new
     @page_title = t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name)
     @user = User.new
-    standard_response('new')
+    standard_response('new', true)
   end
   
   def edit
     @page_title = t('muck.users.update_profile')
     @user = admin? ? User.find(params[:id]) : current_user
-    respond_to do |format|
-      format.html { render :template => 'users/edit' }
-    end
+    standard_response('edit', true)
   end
     
   def create
@@ -162,12 +160,20 @@ class Muck::UsersController < ApplicationController
       end
     end
   
-    def standard_response(template)
-      respond_to do |format|
-        format.html { render :template => "users/#{template}" }
-        format.xml { render :xml => @user }
-        format.json { render :json => { :success => true, :user => @user.as_json } }
-      end
+    def standard_response(template, success = true, failure_path = '')
+      if success
+        respond_to do |format|
+          format.html { render :template => "users/#{template}" }
+          format.xml { render :xml => @user }
+          format.json { render :json => { :success => true, :user => @user.as_json } }
+        end
+      else 
+        respond_to do |format|
+          format.html { redirect_to failure_path }
+          format.xml { render :xml => @user }
+          format.json { render :json => { :success => false } }
+        end
+      end  
     end
   
     def after_create_response(success, local_uri = '')

data/app/views/admin/access_code_requests/send_code.html.erb

@@ -4,16 +4,26 @@
   <%= muck_form_for @access_code_request, :url => admin_access_code_request_path(@access_code_request), :html => { :method => :put, :class => 'ajax' } do |f| -%>
     <p><%=translate('muck.users.send_access_code_instructions') %></p>
     <div class="form-row">
-      <label><%= translate('muck.users.access_code_subject')%></label>
-      <%= text_field_tag :subject -%>
+      <label><%= translate('muck.users.access_code_subject') %></label>
+      <%= text_field_tag :subject, params[:subject] -%>
     </div>
     <div class="form-row">
-      <label><%= translate('muck.users.access_code_message')%></label>
-      <%= text_area_tag :message -%>  
+      <label><%= translate('muck.users.access_code_message') %></label>
+      <%= text_area_tag :message, params[:message] -%>  
+    </div>
+    <div class="form-row">
+      <label><%= translate('muck.users.expiration_date') %></label>
+      <%= text_field_tag :expires_at, params[:expires_at] || @expires_at, :class => 'date_pick' -%>  
     </div>
     <div class="form-row">
       <%= f.submit translate('muck.users.send_access_code') %>
     </div>
     <%= hidden_field :send_access_code, true %>
   <% end -%>
-</div>
+</div>
+
+<script type="text/javascript" language="JavaScript">
+  jQuery(document).ready(function(){
+    jQuery('.date_pick').datepicker();
+  });
+</script>

data/config/routes.rb

@@ -18,6 +18,7 @@ Rails.application.routes.draw do
   match '/users/activation_complete/:id' => 'muck/users#welcome',                 :as => :activation_complete
   match '/signup_complete_activate/:id'  => 'muck/users#activation_instructions', :as => :signup_complete_activation_required
   match 'account'                        => 'muck/users#show',                    :as => :account
+  match 'current_user'                   => 'muck/users#show'
   
   # activations
   resources :activations, :controller => 'muck/activations'
@@ -38,12 +39,11 @@ Rails.application.routes.draw do
   match '/login'                     => 'muck/user_sessions#new',     :as => :login, :constraints => { :protocol => muck_routes_protocol }
   match '/logout'                    => 'muck/user_sessions#destroy', :as => :logout, :constraints => { :protocol => muck_routes_protocol }
   match '/signup_complete_login/:id' => 'muck/user_sessions#new',     :as => :signup_complete_login_required
+  match '/login'                     => 'muck/user_sessions#new',     :as => :logout_complete
+  match '/login_check'               => 'muck/user_sessions#login_check'
   
   # Access codes
   resources :access_code_requests, :controller => 'muck/access_code_requests'
-
-  # page a user is taken to when they log out
-  match '/login' => 'user_session#new', :as => :logout_complete
   
   # admin
   namespace :admin do

data/lib/muck-users/controllers/authentic_application.rb

@@ -36,7 +36,10 @@ module MuckUsers
         unless logged_in?
           store_location
           flash[:notice] = I18n.t('muck.users.login_requred')
-          redirect_to login_path
+          respond_to do |format|
+            format.html { redirect_to login_path }
+            format.json { render :json => { :success => false, :logged_in => false, :message => I18n.t('muck.users.login_requred') } }
+          end
         end
       end
 

data/lib/muck-users/models/access_code_request.rb

@@ -24,20 +24,21 @@ module MuckUsers
         end
         
         def mark_fullfilled(access_code_requests)
-          access_code_requests.each do |request|
-            request.update_attribute(:code_sent_at, DateTime.now)
+          access_code_requests.each do |r|
+            r.update_attribute(:code_sent_at, DateTime.now)
           end
         end
         
       end
 
-      def send_access_code(subject, message)
+      def send_access_code(subject, message, expires_at)
         access_code = AccessCode.create!(:unlimited => false,
                                          :use_limit => 1,
                                          :uses => 0,
-                                         :code => AccessCode.random_code)
+                                         :code => AccessCode.random_code,
+                                         :expires_at => expires_at)
         UserMailer.access_code(self.email, subject, message, access_code.code).deliver
-        success = AccessCodeRequest.mark_fullfilled(self)
+        success = AccessCodeRequest.mark_fullfilled([self])
       end
       
     end

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.8"
+  s.version = "3.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-03-01}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 1
-  - 8
-  version: 3.1.8
+  - 9
+  version: 3.1.9
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -07:00
+date: 2011-03-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency