wheels 0.0.44 → 0.0.45

data/VERSION

@@ -1 +1 @@
-0.0.44
+0.0.45

data/app/controllers/users_controller.rb

@@ -5,7 +5,6 @@ class UsersController < InheritedResources::Base
   before_filter :authenticate_user!, :resource
 
   def edit
-    resource.old_password
     respond_with(resource)
   end
 
@@ -20,11 +19,7 @@ class UsersController < InheritedResources::Base
   end
 
   def resource
-    @user ||= lambda{
-      user = User.find(current_user)
-      user.extend(PasswordValidators)
-      user
-    }.call
+    @user ||= FullyValidatedUser.find(current_user)
   end
 end
 

data/app/models/user.rb

@@ -6,16 +6,6 @@ class User < ActiveRecord::Base
   has_many :galleries, :dependent => :destroy
   has_many :access_control_entries, :dependent=>:destroy
 
-  validates :email, :presence => true
-
-  def validates_password
-    class_eval do
-      attr_accessor :old_password
-      validates :old_password, :presence=>true  , :password=>true
-      validates :password, :presence=>true      , :length=>{:minimum=>6}
-      validates :password_confirmation, :equal_to=>{:other=>:password}
-    end
-  end
 
   def self.nobody
     User.new(:role=>Role.nobody)
@@ -60,3 +50,11 @@ class User < ActiveRecord::Base
 
 end
 
+class FullyValidatedUser < User
+  attr_accessor :old_password
+  validates :email, :presence => true, :email => true
+  validates :old_password, :presence=>true  , :password=>true
+  validates :password, :presence=>true      , :length=>{:minimum=>6}
+  validates :password_confirmation, :equal_to=>{:other=>:password}
+end
+

data/lib/wheels/password_validators.rb

@@ -1,5 +1,5 @@
 module PasswordValidators
-  def self.extended(base)
+  def self.included(base)
     attr_accessor :old_password
     validates :old_password, :presence=>true  , :password=>true
     validates :password, :presence=>true      , :length=>{:minimum=>6}

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.44"
+  s.version = "0.0.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 44
-  version: 0.0.44
+  - 45
+  version: 0.0.45
 platform: ruby
 authors: 
 - Tyler Gannon