muck-users 0.3.9 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

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

@@ -16,7 +16,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
         @users = User.find(:all)
         headers["Content-Type"] = 'text/csv'
         headers["Content-Disposition"] = "attachment; filename=\"users.csv\"" 
-        render :layout => false 
+        render :template => 'admin/users/index', :layout => false 
       end
     end
   end

data/app/controllers/muck/user_sessions_controller.rb

@@ -26,7 +26,23 @@ class Muck::UserSessionsController < ApplicationController
     @title = t('muck.users.sign_in_title')
     @user_session = UserSession.new(params[:user_session])
     @user_session.save do |result|
-      if result
+      after_create_response(result)
+    end
+  end
+  
+  def destroy
+    @title = t('muck.users.sign_out_title')
+    current_user_session.destroy
+    flash[:notice] = t('muck.users.login_out_success')
+    respond_to do |format|
+      format.html { redirect_to logout_complete_path }
+    end
+  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) }
@@ -38,14 +54,12 @@ class Muck::UserSessionsController < ApplicationController
         end
       end
     end
-  end
   
-  def destroy
-    @title = t('muck.users.sign_out_title')
-    current_user_session.destroy
-    flash[:notice] = t('muck.users.login_out_success')
-    respond_to do |format|
-      format.html { redirect_to logout_complete_path }
+    # override redirect by adding :redirect_to as a hidden field in your form or as a url param
+    def after_destroy_response
+      respond_to do |format|
+        format.html { redirect_to logout_complete_path }
+      end
     end
-  end
+  
 end

data/app/controllers/muck/users_controller.rb

@@ -146,6 +146,7 @@ class Muck::UsersController < ApplicationController
       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
     end
   
@@ -154,11 +155,13 @@ class Muck::UsersController < ApplicationController
         respond_to do |format|
           format.html { redirect_to local_uri }
           format.xml { render :xml => @user, :status => :created, :location => user_url(@user) }
+          format.json { render :json => { :success => true, :user => @user.as_json } }
         end
       else
         respond_to do |format|
           format.html { render :template => "users/new" }
           format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
+          format.json { render :json => { :success => false, :user => @user.as_json } }
         end
       end
     end
@@ -265,6 +268,7 @@ class Muck::UsersController < ApplicationController
         respond_to do |format|
           format.html { render :template => 'users/edit' }
           format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
+          format.json { render :json => { :success => success, :user => @user.as_json, :errors => @user.errors.as_json } }
         end
       end
     end
@@ -279,15 +283,16 @@ class Muck::UsersController < ApplicationController
           end
         end
         format.xml { head :ok }
+        format.json { render :json => { :success => true } }
       end
     end
   
     def permission_denied
       flash[:notice] = t('muck.users.permission_denied')
       respond_to do |format|
-        format.html do
-          redirect_to user_path(current_user)
-        end
+        format.html { redirect_to user_path(current_user) }
+        format.xml { render :xml => t('muck.users.permission_denied'), :status => :unprocessable_entity }
+        format.json { render :json => { :message => t('muck.users.permission_denied') } }
       end
     end
 

data/app/views/admin/users/index.csv.erb

@@ -0,0 +1,7 @@
+login,email,first_name,last_name,login_count,last_login_at,created_at
+<% @users.each do |user|
+  fields = [user.login, user.email, user.first_name, user.last_name, 
+            user.login_count, user.last_login_at, user.created_at
+           ] -%>
+<%= fields.map {|value| "\"#{value}\""}.join(",") %>
+<% end -%>

data/app/views/admin/users/index.html.erb

@@ -1,4 +1,5 @@
 <div>
   <h2><%= t('muck.users.admin_users_title') %></h2>
+  <%= link_to 'Download Users', admin_users_path(:format => 'csv')%>
   <%= render :partial => 'admin/users/table' -%>
 </div>

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-03-05}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
      "app/views/admin/users/edit.html.erb",
      "app/views/admin/users/inactive.html.erb",
      "app/views/admin/users/inactive_emails.html.erb",
+     "app/views/admin/users/index.csv.erb",
      "app/views/admin/users/index.html.erb",
      "app/views/admin/users/permissions.html.erb",
      "app/views/admin/users/row.js.erb",
@@ -1316,7 +1317,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-users}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Easy to use user engine for Rails}
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",

data/test/rails_root/test/functional/admin/users_controller_test.rb

@@ -26,11 +26,20 @@ class Admin::Muck::UsersControllerTest < ActionController::TestCase
     end
     
     context "GET index" do
-      setup do
-        get :index
+      context "html" do
+        setup do
+          get :index
+        end
+        should_respond_with :success
+        should_render_template :index
+      end
+      context "csv" do
+        setup do
+          get :index, :format => 'csv'
+        end
+        should_respond_with :success
+        should_render_template :index
       end
-      should_respond_with :success
-      should_render_template :index
     end
 
     context "GET inactive" do

data/test/rails_root/test/functional/users_controller_test.rb

@@ -18,17 +18,48 @@ class Muck::UsersControllerTest < ActionController::TestCase
         GlobalConfig.automatically_login_after_account_create = true
       end
       context "on POST to :create" do
-        setup do
-          post_create_user
-        end
-        should_redirect_to("sign up complete path") { signup_complete_path(assigns(:user)) }
-        should "activate user" do
-          assert assigns(:user).active? == true, "user was not activated"
+        context "html" do
+          setup do
+            post_create_user
+          end
+          should_redirect_to("sign up complete path") { signup_complete_path(assigns(:user)) }
+          should "activate user" do
+            assert assigns(:user).active? == true, "user was not activated"
+          end
+          should "be logged in" do
+            user_session = UserSession.find
+            assert user_session, "user is not logged in"
+          end
         end
-        should "be logged in" do
-          user_session = UserSession.find
-          assert user_session, "user is not logged in"
+        context "json" do
+          setup do
+            post_create_user_json
+          end
+          should "return json" do
+            user = JSON.parse(@response.body)
+            assert_equal true, user['success']
+            assert_equal "testguy", user['user']['login']
+          end
+          should "activate user" do
+            assert assigns(:user).active? == true, "user was not activated"
+          end
+          should "be logged in" do
+            user_session = UserSession.find
+            assert user_session, "user is not logged in"
+          end
         end
+        context "xml" do
+          setup do
+            post_create_user_xml
+          end
+          should "activate user" do
+            assert assigns(:user).active? == true, "user was not activated"
+          end
+          should "be logged in" do
+            user_session = UserSession.find
+            assert user_session, "user is not logged in"
+          end
+        end        
       end
       context "on POST to :create with bad login (space in login name)" do
         setup do
@@ -335,24 +366,34 @@ class Muck::UsersControllerTest < ActionController::TestCase
   def put_update_user(user, options = {})
     put :update,
       :id => user.id, 
-      :user => { :login => 'testguy', 
-        :email => rand(1000).to_s + 'testguy@example.com', 
-        :password => 'testpasswrod', 
-        :password_confirmation => 'testpasswrod', 
-        :first_name => 'Ed',
-        :last_name => 'Decker',
-        :terms_of_service => true }.merge(options)
+      :user => user_params(options)
   end
 
   def post_create_user(options = {})
     post :create, 
-      :user => { :login => 'testguy', 
-        :email => rand(1000).to_s + 'testguy@example.com', 
-        :password => 'testpasswrod', 
-        :password_confirmation => 'testpasswrod', 
-        :first_name => 'Ed',
-        :last_name => 'Decker',
-        :terms_of_service => true }.merge(options)
+      :user => user_params(options)
   end
 
+  def post_create_user_json(options = {})
+    post :create, 
+      :user => user_params(options),
+      :format => 'json'
+  end
+  
+  def post_create_user_xml(options = {})
+    post :create, 
+      :user => user_params(options),
+      :format => 'xml'
+  end
+  
+  def user_params(options = {})
+    { :login => 'testguy', 
+      :email => rand(1000).to_s + 'testguy@example.com', 
+      :password => 'testpasswrod', 
+      :password_confirmation => 'testpasswrod', 
+      :first_name => 'Ed',
+      :last_name => 'Decker',
+      :terms_of_service => true }.merge(options)
+  end
+  
 end

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

@@ -52,7 +52,7 @@ class UserTest < ActiveSupport::TestCase
     
     should_not_allow_mass_assignment_of :crypted_password, :password_salt, :persistence_token, :single_access_token, :perishable_token, :login_count,
                    :failed_login_count, :last_request_at, :last_login_at, :current_login_at, :current_login_ip, :last_login_ip, 
-                   :terms_of_service, :time_zone, :disabled_at, :activated_at, :created_at, :updated_at
+                   :time_zone, :disabled_at, :activated_at, :created_at, :updated_at
                    
     context "named scopes" do
       setup do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,59 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -07:00
+date: 2010-03-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: authlogic
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: searchlogic
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bcrypt-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: muck-engine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: friendly_id
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: Easily add user signup, login and other features to your application
 email: justin@tatemae.com
 executables: []
@@ -122,6 +137,7 @@ files:
 - app/views/admin/users/edit.html.erb
 - app/views/admin/users/inactive.html.erb
 - app/views/admin/users/inactive_emails.html.erb
+- app/views/admin/users/index.csv.erb
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/permissions.html.erb
 - app/views/admin/users/row.js.erb
@@ -1380,18 +1396,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: muck-users
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Easy to use user engine for Rails