blogaze 0.0.2 → 0.0.3

data/README.md

@@ -28,5 +28,4 @@ Todo
 
 Things that still need to be done.
 
-1. User manager
-2. Profile manager
+1. Profile manager

data/blogaze.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'maruku', ['~> 0.6.1']
   gem.add_dependency 'time-lord', ['~> 0.2.5']
   gem.add_dependency 'shebang', ['~> 0.1']
+  gem.add_dependency 'bcrypt-ruby', ['~> 3.0.1']
 end

data/lib/blogaze/bin/create.rb

@@ -52,7 +52,7 @@ module Blogaze
           puts
           puts "The default admin account is:"
           puts "  Username: admin"
-          puts "  Password: myadmin"
+          puts "  Password: admin"
           puts
         end
       end

data/lib/blogaze/bin/default.rb

@@ -21,9 +21,6 @@ module Blogaze
       #
       def initialize
         super
-        puts "Commands"
-        puts "  blogaze create [NAME] - Create a Blogaze installation in [NAME] directory."
-        puts
       end
 
       ##
@@ -33,6 +30,14 @@ module Blogaze
         help
       end
 
+      def help
+        puts @option_parser
+        puts
+        puts "Commands"
+        puts "  create [NAME]    Create a Blogaze installation in [NAME] directory."
+        puts
+      end
+
       protected
 
       ##

data/lib/blogaze/controllers/admin/init.rb

@@ -9,14 +9,14 @@
 module Blogaze
   module Controllers
     module Admin
-      class Controller < ::Blogaze::Controller
+      class Controller < ::Blogaze::Controllers::Controller
         layout 'admin'
         helper :blue_form
 
         def initialize
           super
 
-          if !@userinfo.respond_to?('group') or !@userinfo.group.is_admin
+          if !@userinfo.respond_to?('group') or @userinfo.group.is_admin != 1
             redirect '/login'
           end
         end

data/lib/blogaze/controllers/admin/pages.rb

@@ -16,6 +16,7 @@ module Blogaze
         # Page listing
         #
         def index
+          @title = "Pages - Admin - #{@settings[:title]}"
           @pages = ::Blogaze::Models::Page.order(:title.asc).all
           respond(view_file('admin/pages/index'))
         end

data/lib/blogaze/controllers/admin/users.rb

@@ -0,0 +1,69 @@
+#
+# Blogaze
+# Copyright (C) 2011-2013 Jack Polgar
+#
+# Blogaze is released under the BSD 3-clause license.
+# @license http://opensource.org/licenses/BSD-3-Clause
+#
+
+module Blogaze
+  module Controllers
+    module Admin
+      class Users < Controller
+        map '/admin/users'
+
+        before :edit, :save do
+          @title = "Edit User - Users - Admin - #{@settings[:title]}"
+          @groups = {}
+          ::Blogaze::Models::Group.all.each do |group|
+            @groups[group.id] = group.name
+          end
+        end
+
+        ##
+        # Lists users
+        #
+        def index
+          @title = "Users - Admin - #{@settings[:title]}"
+          @users = ::Blogaze::Models::User.all
+          respond(view_file('admin/users/index'))
+        end
+
+        ##
+        # Edit user form
+        #
+        def edit(id)
+          @user = ::Blogaze::Models::User[id]
+          respond(view_file('admin/users/edit'))
+        end
+
+        ##
+        # Save user
+        #
+        def save(id)
+          @user = ::Blogaze::Models::User[id]
+          @user.username = request[:username]
+          @user.email    = request[:email]
+          @user.group_id = request[:group_id]
+
+          if @user.valid?
+            @user.save
+            flash[:success] = "User saved successfully"
+            redirect Users.r('/')
+          end
+
+          respond(view_file('admin/users/edit'))
+        end
+
+        ##
+        # Delete user
+        #
+        def delete(id)
+          ::Blogaze::Models::User[id].delete
+          flash[:success] = "User deleted successfully"
+          redirect Users.r('/')
+        end
+      end # Users
+    end # Admin
+  end # Controllers
+end # Blogaze

data/lib/blogaze/controllers/init.rb

@@ -7,40 +7,46 @@
 #
 
 module Blogaze
-  class Controller < Ramaze::Controller
-    layout :default
-    helper :xhtml, :maruku, :blue_form, :formatting
-    engine :etanni
+  module Controllers
+    class Controller < Ramaze::Controller
+      layout :default
+      helper :xhtml, :maruku, :blue_form, :formatting
+      engine :etanni
 
-    def initialize
-      super
+      def initialize
+        super
 
-      # Get user info
-      if session[:logged_in]
-        @userinfo = ::Blogaze::Models::User[1]
-      end
+        # Get user info
+        if session[:logged_in]
+          @userinfo = ::Blogaze::Models::User[session[:user_id]]
+        end
 
-      # Get settings
-      get_settings
+        # Get settings
+        get_settings
 
-      Theme.use @settings[:theme]
-    end
+        # Set theme
+        Theme.use @settings[:theme]
+      end
 
-    def view_file(path)
-      path = path.to_s if not path.is_a?(String)
-      view_path = File.join(Theme.current.templates, "#{path}.xhtml")
-      layout_path = File.join(Theme.current.templates + "/layouts/#{ancestral_trait[:layout]}.xhtml")
-      return render_file(layout_path, :content => render_file(view_path))
-    end
+      ##
+      # Renders the view with the set layout
+      #
+      def view_file(path)
+        path = path.to_s if not path.is_a?(String)
+        view_path = File.join(Theme.current.templates, "#{path}.xhtml")
+        layout_path = File.join(Theme.current.templates + "/layouts/#{ancestral_trait[:layout]}.xhtml")
+        return render_file(layout_path, :content => render_file(view_path))
+      end
 
-    def get_settings
-      @settings = {}
-      Blogaze.database[:settings].all.each do |setting|
-        @settings[setting[:setting].to_sym] = setting[:value]
+      def get_settings
+        @settings = {}
+        Blogaze.database[:settings].all.each do |setting|
+          @settings[setting[:setting].to_sym] = setting[:value]
+        end
       end
-    end
-  end
-end
+    end # Controller
+  end # Controllers
+end # Blogaze
 
 # Here go your requires for subclasses of Controller:
 Dir.glob(File.dirname(__FILE__) + '/*.rb').each do |controller|

data/lib/blogaze/controllers/sessions.rb

@@ -24,9 +24,9 @@ module Blogaze
       #
       def create
         @title = "Login - #{@settings[:title]}"
-        @get_user = ::Blogaze::Models::User[:username => request[:username]]
+        @get_user = ::Blogaze::Models::User.where(:username => request[:username]).first
 
-        if @get_user.respond_to?('password') and @get_user.password == Digest::SHA1.hexdigest(request[:password])
+        if @get_user and @get_user.check_password(request[:password])
           session[:logged_in] = true
           session[:user_id] = @get_user.id
           redirect Ramaze.options.prefix

data/lib/blogaze/models/user.rb

@@ -14,6 +14,14 @@ module Blogaze
       one_to_many :post
       many_to_one :group
 
+      ##
+      # Check if the users password matches
+      # the supplied password.
+      #
+      def check_password(password)
+        BCrypt::Password.new(self.password) == password
+      end
+
       def validate
         super
 
@@ -32,7 +40,7 @@ module Blogaze
       end
 
       def before_create
-        self.password = Digest::SHA1.hexdigest(self.password)
+        self.password = BCrypt::Password.create(self.password)
         self.group_id = 3
       end
 

data/lib/blogaze/tasks/db.rake

@@ -33,7 +33,7 @@ namespace :db do
 
     # Admin user
     puts "Creating admin user"
-    Blogaze.database[:users].insert(:username => 'Admin', :password => 'bc750014cb3cf5a86b4851b9ca33027537b3fb85', :email => 'admin@example.com', :group_id => '1')
+    Blogaze.database[:users].insert(:username => 'Admin', :password => '$2a$10$pWIXaTMi8eK5NPqRm2xpROEiTlFxj0H72Ebb5MaPK3OnAQqcWgfPe', :email => 'admin@example.com', :group_id => '1')
 
     # First post
     Blogaze.database[:posts].insert(:title => 'Welcome', :slug => 'welcome', :body => '**Welcome** to _Blogaze!_', :published_at => Time.now.to_i, :created_at => Time.now.to_i, :user_id => 1)

data/{proto → lib/blogaze}/themes/default/admin/index.xhtml

@@ -7,6 +7,7 @@
       <li>#{a 'Manage Posts', Blogaze::Controllers::Admin::Posts.r('/')}</li>
       <li>#{a 'Manage Comments', Blogaze::Controllers::Admin::Comments.r('/')}</li>
       <li>#{a 'Manage Pages', Blogaze::Controllers::Admin::Pages.r('/')}</li>
+      <li>#{a 'Manage Users', Blogaze::Controllers::Admin::Users.r('/')}</li>
     </ul>
   </div>
 </div>

data/lib/blogaze/themes/default/admin/users/edit.xhtml

@@ -0,0 +1,22 @@
+<div id="page_content">
+  <h2 id="page-title">Edit User</h2>
+  <div class="content">
+    <?r if @user.errors.count > 0 ?>
+      <div class="message error">
+        <?r @user.errors.each do |k, v| ?>
+          #{k} #{v.first}<br />
+        <?r end ?>
+      </div>
+    <?r end ?>
+    <div class="edit-user-form tabular">
+       #{
+        form_for(@user, :method => :post, :action => '/admin/users/save/' + @user.id.to_s) do |f|
+          f.input_text 'Username', :username
+          f.input_text 'Email', :email
+          f.select 'Group', :group_id, :values => @groups, :size => 1, :selected => @user.group_id.to_i
+          f.submit "Save", :class => "submit-btn"
+        end
+      }
+    </div>
+  </div>
+</div>

data/lib/blogaze/themes/default/admin/users/index.xhtml

@@ -0,0 +1,19 @@
+<div id="page_content">
+  <h2 id="page-title">Users</h2>
+  <table class="list">
+    <thead>
+      <tr>
+        <th>Username</th>
+        <th class="actions">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+    <?r @users.each do |user| ?>
+      <tr>
+        <td>#{a user.username, :edit, user.id}</td>
+        <td>#{a 'Edit', :edit, user.id}, #{a 'Delete', :delete, user.id}</td>
+      </tr>
+    <?r end ?>
+    </tbody>
+  </table>
+</div>

data/{proto → lib/blogaze}/themes/default/layouts/default.xhtml

@@ -20,7 +20,7 @@
           <li><a href="/#{page.slug}">#{page.title}</a></li>
           <?r end ?>
           <?r if session[:logged_in] ?>
-            <?r if @userinfo.group.is_admin ?>
+            <?r if @userinfo.group.is_admin == 1 ?>
             <li><a href="/admin">Admin</a></li>
             <?r end ?>
             <li><a href="/logout">Logout</a></li>

data/lib/blogaze/version.rb

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

data/lib/blogaze.rb

@@ -10,6 +10,7 @@ require 'ramaze'
 require 'sequel'
 require 'sequel/extensions/inflector'
 require 'time-lord'
+require 'bcrypt'
 require "blogaze/version"
 require "blogaze/theme"
 
@@ -32,6 +33,7 @@ module Blogaze
 
     # Loads routes and controllers
     def start
+      require 'blogaze/themes/default'
       require 'blogaze/routes'
       require 'blogaze/controllers/init'
     end

data/proto/app.rb

@@ -10,6 +10,5 @@ require 'blogaze'
 
 require __DIR__('config/config')
 require __DIR__('config/database')
-require __DIR__('themes/default')
 
 Blogaze.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogaze
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ramaze
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 description: Blogaze is a simple blog powered by Ramaze and Sequel.
 email:
 - nrx@nirix.net
@@ -115,6 +131,7 @@ files:
 - lib/blogaze/controllers/admin/pages.rb
 - lib/blogaze/controllers/admin/posts.rb
 - lib/blogaze/controllers/admin/settings.rb
+- lib/blogaze/controllers/admin/users.rb
 - lib/blogaze/controllers/init.rb
 - lib/blogaze/controllers/main_controller.rb
 - lib/blogaze/controllers/pages.rb
@@ -138,6 +155,26 @@ files:
 - lib/blogaze/tasks.rb
 - lib/blogaze/tasks/db.rake
 - lib/blogaze/theme.rb
+- lib/blogaze/themes/default.rb
+- lib/blogaze/themes/default/admin/comments/index.xhtml
+- lib/blogaze/themes/default/admin/index.xhtml
+- lib/blogaze/themes/default/admin/pages/edit.xhtml
+- lib/blogaze/themes/default/admin/pages/index.xhtml
+- lib/blogaze/themes/default/admin/pages/new.xhtml
+- lib/blogaze/themes/default/admin/posts/edit.xhtml
+- lib/blogaze/themes/default/admin/posts/index.xhtml
+- lib/blogaze/themes/default/admin/posts/new.xhtml
+- lib/blogaze/themes/default/admin/settings/index.xhtml
+- lib/blogaze/themes/default/admin/users/edit.xhtml
+- lib/blogaze/themes/default/admin/users/index.xhtml
+- lib/blogaze/themes/default/index.xhtml
+- lib/blogaze/themes/default/layouts/admin.xhtml
+- lib/blogaze/themes/default/layouts/default.xhtml
+- lib/blogaze/themes/default/pages/notfound.xhtml
+- lib/blogaze/themes/default/pages/page.xhtml
+- lib/blogaze/themes/default/posts/view.xhtml
+- lib/blogaze/themes/default/sessions/new.xhtml
+- lib/blogaze/themes/default/users/new.xhtml
 - lib/blogaze/version.rb
 - proto/Rakefile
 - proto/app.rb
@@ -151,24 +188,6 @@ files:
 - proto/public/js/jquery.js
 - proto/public/js/less.js
 - proto/start.rb
-- proto/themes/default.rb
-- proto/themes/default/admin/comments/index.xhtml
-- proto/themes/default/admin/index.xhtml
-- proto/themes/default/admin/pages/edit.xhtml
-- proto/themes/default/admin/pages/index.xhtml
-- proto/themes/default/admin/pages/new.xhtml
-- proto/themes/default/admin/posts/edit.xhtml
-- proto/themes/default/admin/posts/index.xhtml
-- proto/themes/default/admin/posts/new.xhtml
-- proto/themes/default/admin/settings/index.xhtml
-- proto/themes/default/index.xhtml
-- proto/themes/default/layouts/admin.xhtml
-- proto/themes/default/layouts/default.xhtml
-- proto/themes/default/pages/notfound.xhtml
-- proto/themes/default/pages/page.xhtml
-- proto/themes/default/posts/view.xhtml
-- proto/themes/default/sessions/new.xhtml
-- proto/themes/default/users/new.xhtml
 homepage: http://blogaze.org
 licenses: []
 post_install_message: