blogaze 0.0.3 → 0.1.0

data/lib/blogaze/controllers/users.rb

@@ -11,13 +11,21 @@ module Blogaze
     class Users < Controller
       map '/users'
 
+      ##
+      # Register form
+      #
       def new
         @title = "Register - #{@settings[:title]}"
         @user = ::Blogaze::Models::User.new
         respond(view_file('users/new'))
       end
 
+      ##
+      # Create user
+      #
       def create
+        return redirect('/') unless request.post?
+
         @title = "Register - #{@settings[:title]}"
         data = {
           :username => request[:username],
@@ -28,6 +36,7 @@ module Blogaze
 
         @user = ::Blogaze::Models::User.new(data)
 
+        # Check for errors
         if @user.valid?
           @user.save
           flash[:success] = "Account created, you may now login"
@@ -36,6 +45,37 @@ module Blogaze
           respond(view_file('users/new'))
         end
       end
+
+      ##
+      # "UserCP"
+      #
+      def profile
+        return respond(view_file('sessions/new')) unless session[:logged_in]
+        respond(view_file('users/profile'))
+      end
+
+      ##
+      # Save profile
+      #
+      def save
+        return redirect('/') unless request.post?
+
+        # Set email
+        @userinfo.email = request[:email]
+
+        # Changing password?
+        if not request[:new_password].empty?
+          @userinfo.change_password(request[:new_password])
+        end
+
+        # Check for errors
+        if @userinfo.valid?
+          @userinfo.save
+          redirect Users.r('/profile')
+        else
+          respond(view_file('users/profile'))
+        end
+      end
     end # Users
   end # Controllers
 end # Blogaze

data/lib/blogaze/models/user.rb

@@ -22,6 +22,13 @@ module Blogaze
         BCrypt::Password.new(self.password) == password
       end
 
+      ##
+      # Changes the users password.
+      #
+      def change_password(new_password)
+        self.password = BCrypt::Password.create(new_password)
+      end
+
       def validate
         super
 

data/lib/blogaze/routes.rb

@@ -23,6 +23,7 @@ module Blogaze
   ::Ramaze::Route['/logout'] = '/sessions/destroy'
   ::Ramaze::Route['/register'] = '/users/new'
   ::Ramaze::Route['/users/create'] = '/users/create'
+  ::Ramaze::Route['/profile'] = '/users/profile'
   ::Ramaze::Route[/\/sessions(.*)/] = '/sessions%s'
 
   # Page routes

data/lib/blogaze/themes/default/layouts/default.xhtml

@@ -23,6 +23,7 @@
             <?r if @userinfo.group.is_admin == 1 ?>
             <li><a href="/admin">Admin</a></li>
             <?r end ?>
+            <li><a href="/profile">Profile</a></li>
             <li><a href="/logout">Logout</a></li>
           <?r end ?>
           </ul>

data/lib/blogaze/themes/default/users/profile.xhtml

@@ -0,0 +1,21 @@
+<div id="page_content">
+  <h2 id="page-title">My Profile</h2>
+  <div class="content">
+    <?r if @userinfo.errors.count > 0 ?>
+      <div class="message error">
+        <?r @userinfo.errors.each do |k, v| ?>
+          #{k} #{v.first}<br />
+        <?r end ?>
+      </div>
+    <?r end ?>
+    <div class="profile-form tabular">
+    #{
+      form_for(@userinfo, :method => :post, :action => '/users/save') do |f|
+        f.input_text 'Email', :email
+        f.input_password 'New Password', :new_password
+        f.submit "Save", :class => "submit-btn"
+      end
+    }
+    </div>
+  </div>
+</div>

data/lib/blogaze/version.rb

@@ -7,5 +7,5 @@
 #
 
 module Blogaze
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogaze
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ramaze
@@ -175,6 +175,7 @@ files:
 - lib/blogaze/themes/default/posts/view.xhtml
 - lib/blogaze/themes/default/sessions/new.xhtml
 - lib/blogaze/themes/default/users/new.xhtml
+- lib/blogaze/themes/default/users/profile.xhtml
 - lib/blogaze/version.rb
 - proto/Rakefile
 - proto/app.rb