wheels 0.0.43 → 0.0.44

data/VERSION

@@ -1 +1 @@
-0.0.43
+0.0.44

data/app/controllers/users_controller.rb

@@ -14,20 +14,15 @@ class UsersController < InheritedResources::Base
   end
 
   def verify
-    respond_with @user do |format|
-      format.json {render :json=> @user.valid_password?(params[:password]).to_json}
+    respond_with resource do |format|
+      format.json {render :json=> resource.valid_password?(params[:password]).to_json}
     end
   end
 
   def resource
     @user ||= lambda{
       user = User.find(current_user)
-      user.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
+      user.extend(PasswordValidators)
       user
     }.call
   end

data/app/models/user.rb

@@ -8,6 +8,15 @@ class User < ActiveRecord::Base
 
   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)
   end

data/lib/wheels/password_validators.rb

@@ -0,0 +1,9 @@
+module PasswordValidators
+  def self.extended(base)
+    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
+

data/lib/wheels.rb

@@ -4,5 +4,6 @@ require 'wheels/action_controller_extensions.rb'
 require 'wheels/action_view_helper_extensions.rb'
 require 'wheels/flash_session_cookie_middleware.rb'
 require 'wheels/paperclip_interpolations.rb'
+require 'wheels/password_validators.rb'
 # require 'wheels/s3login_provider.rb'
 

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.43"
+  s.version = "0.0.44"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
@@ -214,6 +214,7 @@ Gem::Specification.new do |s|
      "lib/wheels/active_record_user_extensions.rb",
      "lib/wheels/flash_session_cookie_middleware.rb",
      "lib/wheels/paperclip_interpolations.rb",
+     "lib/wheels/password_validators.rb",
      "lib/wheels/routes.rb",
      "lib/wheels/s3login_provider.rb",
      "lib/wheels/user.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 43
-  version: 0.0.43
+  - 44
+  version: 0.0.44
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -237,6 +237,7 @@ files:
 - lib/wheels/active_record_user_extensions.rb
 - lib/wheels/flash_session_cookie_middleware.rb
 - lib/wheels/paperclip_interpolations.rb
+- lib/wheels/password_validators.rb
 - lib/wheels/routes.rb
 - lib/wheels/s3login_provider.rb
 - lib/wheels/user.rb