wheels 0.0.41 → 0.0.42

data/VERSION

@@ -1 +1 @@
-0.0.41
+0.0.42

data/app/controllers/users_controller.rb

@@ -1,4 +1,36 @@
 class UsersController < InheritedResources::Base
+  respond_to :html, :js, :only=>[:edit, :show, :update]
+  respond_to :json, :only=>[:verify_password]
 
+  before_filter :authenticate_user!, :resource
+
+  def edit
+    resource.old_password
+    respond_with(resource)
+  end
+
+  def update
+    update!(:notice=>"Your password has been updated.") {root_url}
+  end
+
+  def verify
+    respond_with @user do |format|
+      format.json {render :json=> @user.valid_password?(params[:password]).to_json}
+    end
+  end
+
+  def resource
+    a = ValidatorCallbacks.new
+    @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
+    }.call
+  end
 end
 

data/app/models/blog.rb

@@ -3,7 +3,6 @@ class Blog < ActiveRecord::Base
   belongs_to :user
   validates_presence_of :user_id, :title
   acts_as_linkable :parent=>:user, :name=>:title
-
   has_many :images
   cattr_reader :per_page
   @@per_page = 5

data/app/models/user.rb

@@ -6,6 +6,8 @@ class User < ActiveRecord::Base
   has_many :galleries, :dependent => :destroy
   has_many :access_control_entries, :dependent=>:destroy
 
+  validates :email, :presence => true
+
   def self.nobody
     User.new(:role=>Role.nobody)
   end

data/lib/wheels/routes.rb

@@ -1,37 +1,43 @@
 module ActionDispatch::Routing
   class Mapper
     def wheels_resources
-      resources :galleries do
-        resources :images
+      scope      "/admin" do
+        resources :access_control_entries
       end
-      resource :profile
-      resources :blogs, :path=>"blog"
 
-      devise_for :users
-
-      resources :users do
-        resource :profile
-        resources :galleries
-        resources :blogs, :path=>"blog"
-      end
+      resources :blogs, :path=>"blog"
 
-      resources :layouts
       resources :forums do
         resources :discussions do
           resources :forum_messages
         end
       end
 
+      resources :galleries do
+        resources :images
+      end
+
+      resources :layouts
+
       resources :pages do
         resources :attachments
         resources :children, :controller=>"pages", :as => "children"
       end
 
-      scope "/admin" do
-        resources :access_control_entries
-        resources :users
+      resource  :profile
+
+      devise_for :users
+      resources :users do
+        resources :blogs, :path=>"blog"
+        resources :galleries
+        resource  :profile
+        member do
+          get :verify
+        end
       end
 
+      match "change_password" => "users#edit"
+      match "verify_password" => "users#verify", :format=>:json
     end
   end
 end

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.41"
+  s.version = "0.0.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-08-25}
+  s.date = %q{2010-09-01}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 77
   prerelease: false
   segments: 
   - 0
   - 0
-  - 41
-  version: 0.0.41
+  - 42
+  version: 0.0.42
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -312,7 +310,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -321,7 +318,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"