muck-users 0.2.18 → 0.2.19

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/lib/action_controller/authentic_application.rb

@@ -145,7 +145,7 @@ module ActionController
         end
       end
 
-      def permission_denied      
+      def permission_denied
         respond_to do |format|
           format.html do
             domain_name = GlobalConfig.application_url
@@ -214,6 +214,27 @@ module ActionController
       #   end
       # end
 
+      # Used to get a user based on parameters
+      def get_user
+        return nil if !logged_in?
+        if is_admin?
+          @user ||= User.find(params[:user_id]) rescue nil
+          @user ||= User.find(params[:id]) rescue nil
+          @user ||= current_user
+        else
+          @user = current_user
+        end
+      end
+      
+      # Try to get a user.  If no user is found then call permission_denied
+      def get_user_deny
+        @user = get_user
+        if !@user
+          flash[:notice] = "There was a problem finding your user information.  Please try again."
+          permission_denied 
+        end
+      end
+      
     end
   end
 end

data/muck-users.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-16}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -925,3 +925,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<friendly_id>, [">= 0"])
   end
 end
+

data/test/rails_root/app/models/user.rb

@@ -1,3 +1,32 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                  :integer         not null, primary key
+#  login               :string(255)
+#  email               :string(255)
+#  first_name          :string(255)
+#  last_name           :string(255)
+#  crypted_password    :string(255)
+#  password_salt       :string(255)
+#  persistence_token   :string(255)
+#  single_access_token :string(255)
+#  perishable_token    :string(255)
+#  login_count         :integer         default(0), not null
+#  failed_login_count  :integer         default(0), not null
+#  last_request_at     :datetime
+#  last_login_at       :datetime
+#  current_login_at    :datetime
+#  current_login_ip    :string(255)
+#  last_login_ip       :string(255)
+#  terms_of_service    :boolean         not null
+#  time_zone           :string(255)     default("UTC")
+#  disabled_at         :datetime
+#  activated_at        :datetime
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
 class User < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt

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

@@ -1,3 +1,32 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                  :integer         not null, primary key
+#  login               :string(255)
+#  email               :string(255)
+#  first_name          :string(255)
+#  last_name           :string(255)
+#  crypted_password    :string(255)
+#  password_salt       :string(255)
+#  persistence_token   :string(255)
+#  single_access_token :string(255)
+#  perishable_token    :string(255)
+#  login_count         :integer         default(0), not null
+#  failed_login_count  :integer         default(0), not null
+#  last_request_at     :datetime
+#  last_login_at       :datetime
+#  current_login_at    :datetime
+#  current_login_ip    :string(255)
+#  last_login_ip       :string(255)
+#  terms_of_service    :boolean         not null
+#  time_zone           :string(255)     default("UTC")
+#  disabled_at         :datetime
+#  activated_at        :datetime
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 class UserTest < ActiveSupport::TestCase
@@ -6,10 +35,8 @@ class UserTest < ActiveSupport::TestCase
     should_have_many :permissions
     should_have_many :roles
     
-    should_have_named_scope :by_newest
-    should_have_named_scope :active
-    should_have_named_scope :inactive
-    should_have_named_scope :recent
+    should_scope_by_newest
+    should_scope_recent
     
     should_ensure_length_in_range :email, 6..100 #, :short_message => 'does not look like a valid email address.', :long_message => 'does not look like a valid email address.'
     should_allow_values_for :email, 'a@x.com', 'de.veloper@example.com'
@@ -22,6 +49,29 @@ 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
+                   
+    context "named scopes" do
+      setup do
+        @active_user = Factory(:user, :activated_at => DateTime.now)
+        @inactive_user = Factory(:user, :activated_at => nil)
+      end
+      context "active" do
+        should "find active user" do
+          assert User.active.include?(@active_user)
+        end
+        should "not find inactive user" do
+          assert !User.active.include?(@inactive_user)
+        end
+      end
+      context "inactive" do
+        should "find inactive user" do
+          assert User.inactive.include?(@inactive_user)
+        end
+        should "not find active user" do
+          assert !User.inactive.include?(@active_user)
+        end
+      end
+    end
   end
 
   context "search" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -07:00
+date: 2009-12-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency