blogaze 0.1.0 → 0.2.0

data/README.md

@@ -3,11 +3,6 @@ Blogaze
 
 Simple blog powered by the Ramaze framework.
 
-WARNING
--------
-
-Blogaze is currently in development, use at your own risk.
-
 Setup
 ------
 
@@ -22,10 +17,3 @@ Or install from the repository
 Create a new installation
 
     blogaze create my_blog
-
-Todo
-------
-
-Things that still need to be done.
-
-1. Profile manager

data/lib/blogaze.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 require 'ramaze'
@@ -19,19 +19,29 @@ module Blogaze
     attr_accessor :root
     attr_accessor :database
 
+    ##
     # Sets root and pushes it to Ramaze roots
+    #
+    # @param [String] path Path to Blogaze root
+    #
     def root=(path)
       @root = path
       Ramaze.options.roots.push(path) if !Ramze.options.roots.include(path)
     end
 
+    ##
     # Sets database and loads models
+    #
+    # @param [Object] database Database connection
+    #
     def database=(database)
       @database = database
       require 'blogaze/models/init'
     end
 
+    ##
     # Loads routes and controllers
+    #
     def start
       require 'blogaze/themes/default'
       require 'blogaze/routes'
@@ -42,6 +52,9 @@ end
 
 # wat
 class Fixnum
+  ##
+  # Shortcut for Time.at(...).ago_in_words
+  #
   def ago_in_words
     Time.at(self).ago_in_words
   end

data/lib/blogaze/bin/create.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze

data/lib/blogaze/bin/default.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -30,6 +30,9 @@ module Blogaze
         help
       end
 
+      ##
+      # Help message
+      #
       def help
         puts @option_parser
         puts

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -16,6 +16,7 @@ module Blogaze
         # List comments
         #
         def index
+          title "Comments"
           @comments = ::Blogaze::Models::Comment.all
           respond(view_file('admin/comments/index'))
         end
@@ -23,6 +24,8 @@ module Blogaze
         ##
         # Approve comment
         #
+        # @param [Integer] comment_id
+        #
         def approve(comment_id)
           ::Blogaze::Models::Comment[comment_id].update(:in_moderation => 0).save
           flash[:success] = "Comment approved"
@@ -32,6 +35,8 @@ module Blogaze
         ##
         # Delete comment
         #
+        # @param [Integer] comment_id
+        #
         def delete(comment_id)
           ::Blogaze::Models::Comment[comment_id].delete
           flash[:success] = "Comment deleted"

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -16,7 +16,6 @@ module Blogaze
         # Admin index
         #
         def index
-          @title = "Admin - #{@settings[:title]}"
           respond(view_file('admin/index'))
         end
       end # Dashboard

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -16,6 +16,10 @@ module Blogaze
         def initialize
           super
 
+          # Set AdminCP title
+          title "Admin"
+
+          # Make sure the user is logged in and has permission
           if !@userinfo.respond_to?('group') or @userinfo.group.is_admin != 1
             redirect '/login'
           end

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -12,11 +12,17 @@ module Blogaze
       class Pages < Controller
         map '/admin/pages'
 
+        def initialize
+          super
+
+          # Set title
+          title "Pages"
+        end
+
         ##
         # Page listing
         #
         def index
-          @title = "Pages - Admin - #{@settings[:title]}"
           @pages = ::Blogaze::Models::Page.order(:title.asc).all
           respond(view_file('admin/pages/index'))
         end
@@ -25,7 +31,7 @@ module Blogaze
         # New page form
         #
         def new
-          @title = "New Page - Pages - Admin - #{@settings[:title]}"
+          title "New Page"
           @page = ::Blogaze::Models::Page.new
           respond(view_file('admin/pages/new'))
         end
@@ -34,7 +40,7 @@ module Blogaze
         # Create page
         #
         def create
-          @title = "New Page - Pages - Admin - #{@settings[:title]}"
+          title "New Page"
           data = {
             :title => request[:title],
             :slug => request[:slug],
@@ -56,8 +62,10 @@ module Blogaze
         ##
         # Edit page
         #
+        # @param [Integer] page_id
+        #
         def edit(page_id)
-          @title = "Edit Page - Pages - Admin - #{@settings[:title]}"
+          title "Edit Page"
           @page = ::Blogaze::Models::Page[page_id]
           respond(view_file('admin/pages/edit'))
         end
@@ -65,8 +73,10 @@ module Blogaze
         ##
         # Save page
         #
+        # @param [Integer] page_id
+        #
         def save(page_id)
-          @title = "Edit Page - Pages - Admin - #{@settings[:title]}"
+          title "Edit Page"
           @page = ::Blogaze::Models::Page[page_id]
           @page.title = request[:title]
           @page.slug = request[:slug]
@@ -85,6 +95,8 @@ module Blogaze
         ##
         # Delete page
         #
+        # @param [Integer] page_id
+        #
         def delete(page_id)
           P::Blogaze::Models::age[page_id].delete
           flash[:success] = "Page deleted successfully"

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -12,20 +12,32 @@ module Blogaze
       class Posts < Controller
         map '/admin/posts'
 
+        def initialize
+          super
+
+          # Set title
+          title "Posts"
+        end
+
+        # Make sure the user has permission to create posts
         before :new, :create do
+          title "New Post"
           if !@userinfo.group.create_posts
             flash[:error] = "You don't have permission to do that."
             redirect '/login'
           end
         end
 
+        # Make sure the user has permission to edit posts
         before :edit, :save do
+          title "Edit Page"
           if !@userinfo.group.edit_posts
             flash[:error] = "You don't have permission to do that."
             redirect '/login'
           end
         end
 
+        # Make sure the user has permission to delete posts
         before :delete do
           if !@userinfo.group.delete_posts
             flash[:error] = "You don't have permission to do that."
@@ -37,7 +49,6 @@ module Blogaze
         # Post listing
         #
         def index
-          @title = "Posts - Admin - #{@settings[:title]}"
           @posts = ::Blogaze::Models::Post.order(:id.desc).all
           respond(view_file('admin/posts/index'))
         end
@@ -46,7 +57,6 @@ module Blogaze
         # New post form
         #
         def new
-          @title = "New Post - Posts - Admin - #{@settings[:title]}"
           @post = ::Blogaze::Models::Post.new
           respond(view_file('admin/posts/new'))
         end
@@ -55,7 +65,6 @@ module Blogaze
         # Create post
         #
         def create
-          @title = "New Post - Posts - Admin - #{@settings[:title]}"
           data = {
             :title => request[:title],
             :body => request[:body],
@@ -77,8 +86,9 @@ module Blogaze
         ##
         # Edit post
         #
+        # @param [Integer] post_id
+        #
         def edit(post_id)
-          @title = "Edit Post - Posts - Admin - #{@settings[:title]}"
           @post = ::Blogaze::Models::Post[post_id]
 
           post_tags = []
@@ -93,8 +103,9 @@ module Blogaze
         ##
         # Save post
         #
+        # @param [Integer] post_id
+        #
         def save(post_id)
-          @title = "Edit Post - Posts - Admin - #{@settings[:title]}"
           @post = ::Blogaze::Models::Post[post_id]
           @post.title = request[:title]
           @post.body = request[:body]
@@ -112,6 +123,8 @@ module Blogaze
         ##
         # Delete post
         #
+        # @param [Integer] post_id
+        #
         def delete(post_id)
           post = ::Blogaze::Models::Post[post_id]
           post.delete

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -16,6 +16,9 @@ module Blogaze
         # Settings form
         #
         def index
+          # Set title
+          title "Settings"
+
           # Get themes
           @themes = []
 

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

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -13,18 +13,22 @@ module Blogaze
         map '/admin/users'
 
         before :edit, :save do
-          @title = "Edit User - Users - Admin - #{@settings[:title]}"
+          title "Edit User"
           @groups = {}
           ::Blogaze::Models::Group.all.each do |group|
             @groups[group.id] = group.name
           end
         end
 
+        def initialize
+          super
+          title "Users"
+        end
+
         ##
         # Lists users
         #
         def index
-          @title = "Users - Admin - #{@settings[:title]}"
           @users = ::Blogaze::Models::User.all
           respond(view_file('admin/users/index'))
         end
@@ -32,20 +36,25 @@ module Blogaze
         ##
         # Edit user form
         #
-        def edit(id)
-          @user = ::Blogaze::Models::User[id]
+        # @param [Integer] user_id
+        #
+        def edit(user_id)
+          @user = ::Blogaze::Models::User[user_id]
           respond(view_file('admin/users/edit'))
         end
 
         ##
         # Save user
         #
-        def save(id)
-          @user = ::Blogaze::Models::User[id]
+        # @param [Integer] user_id
+        #
+        def save(user_id)
+          @user = ::Blogaze::Models::User[user_id]
           @user.username = request[:username]
           @user.email    = request[:email]
           @user.group_id = request[:group_id]
 
+          # Validate data
           if @user.valid?
             @user.save
             flash[:success] = "User saved successfully"
@@ -58,8 +67,10 @@ module Blogaze
         ##
         # Delete user
         #
-        def delete(id)
-          ::Blogaze::Models::User[id].delete
+        # @param [Integer] user_id
+        #
+        def delete(user_id)
+          ::Blogaze::Models::User[user_id].delete
           flash[:success] = "User deleted successfully"
           redirect Users.r('/')
         end

data/lib/blogaze/controllers/init.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -13,6 +13,10 @@ module Blogaze
       helper :xhtml, :maruku, :blue_form, :formatting
       engine :etanni
 
+      ##
+      # Sherlock: Initializer
+      # Watson: No shit, Sherlock.
+      #
       def initialize
         super
 
@@ -26,11 +30,25 @@ module Blogaze
 
         # Set theme
         Theme.use @settings[:theme]
+
+        # Page title
+        @title = [@settings[:title]]
+      end
+
+      ##
+      # Adds the passed title to be added to the page title.
+      #
+      # @param [String] title
+      #
+      def title(title)
+        @title.push title
       end
 
       ##
       # Renders the view with the set layout
       #
+      # @param [String] path Path to view
+      #
       def view_file(path)
         path = path.to_s if not path.is_a?(String)
         view_path = File.join(Theme.current.templates, "#{path}.xhtml")
@@ -38,6 +56,9 @@ module Blogaze
         return render_file(layout_path, :content => render_file(view_path))
       end
 
+      ##
+      # Load settings from the database.
+      #
       def get_settings
         @settings = {}
         Blogaze.database[:settings].all.each do |setting|

data/lib/blogaze/controllers/main_controller.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -19,9 +19,7 @@ module Blogaze
         # Check if we should change the title to include
         # what page we're on.
         if page.to_i > 1
-          @title = "Page #{page} - #{@settings[:title]}"
-        else
-          @title = @settings[:title]
+          title "Page #{page}"
         end
 
         # Get the data and paginate it.

data/lib/blogaze/controllers/pages.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -14,23 +14,25 @@ module Blogaze
       ##
       # View page
       #
+      # @param [String] slug Page slug
+      #
       def view(slug = nil)
-        if slug == nil
-          slug = request.env["REQUEST_PATH"]
-        end
+        slug = request.env["REQUEST_PATH"] if slug.nil?
 
         # Chomp chomp chomp, let's trim any unwanted
         # forward slashes from the begning and end of the url.
         slug = slug.chomp("/").reverse.chomp("/").reverse
 
+        # Get page
         @page = ::Blogaze::Models::Page[:slug => slug]
 
         # Check if the page exists, if not render the
         # not found page.
-        if !@page.respond_to?('title')
+        if @page.nil?
+          title "Not Found"
           respond(view_file('pages/notfound'))
         else
-          @title = "#{@page.title} - #{@settings[:title]}"
+          title @page.title
           respond(view_file('pages/page'))
         end
       end

data/lib/blogaze/controllers/posts.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -15,12 +15,14 @@ module Blogaze
       ##
       # View post
       #
+      # @param [String] slug Post slug
+      #
       def view(slug)
         @post = ::Blogaze::Models::Post.filter(:slug => slug).first
         return respond(view_file('pages/notfound')) if @post.nil?
 
         # Set title
-        @title = @post.title + ' - ' + @settings[:title]
+        title @post.title
 
         # Instead of a controller just for comment creation
         # let's just put it here, that way we can display
@@ -48,10 +50,16 @@ module Blogaze
       ##
       # Lists posts belonging to the tag.
       #
+      # @param [String]  slug Tag slug
+      # @param [Integer] page Page number
+      #
       def tag(slug, page = 1)
         @tag = ::Blogaze::Models::Tag[:slug => slug]
         return respond(view_file('pages/notfound')) if @tag.nil?
 
+        # Set title
+        title "Posts tagged #{@tag.name}"
+
         # Get relationships with posts and put the post IDs
         # into an array for use when selecting posts to be
         # paginated.

data/lib/blogaze/controllers/sessions.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -15,7 +15,7 @@ module Blogaze
       # Login page
       #
       def new
-        @title = "Login - #{@settings[:title]}"
+        title "Login"
         respond(view_file('sessions/new'))
       end
 
@@ -23,7 +23,7 @@ module Blogaze
       # Create session
       #
       def create
-        @title = "Login - #{@settings[:title]}"
+        title "Login"
         @get_user = ::Blogaze::Models::User.where(:username => request[:username]).first
 
         if @get_user and @get_user.check_password(request[:password])

data/lib/blogaze/controllers/users.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -15,7 +15,7 @@ module Blogaze
       # Register form
       #
       def new
-        @title = "Register - #{@settings[:title]}"
+        title "Register"
         @user = ::Blogaze::Models::User.new
         respond(view_file('users/new'))
       end
@@ -26,7 +26,7 @@ module Blogaze
       def create
         return redirect('/') unless request.post?
 
-        @title = "Register - #{@settings[:title]}"
+        title "Register"
         data = {
           :username => request[:username],
           :password => request[:password],
@@ -51,6 +51,7 @@ module Blogaze
       #
       def profile
         return respond(view_file('sessions/new')) unless session[:logged_in]
+        title "Profile"
         respond(view_file('users/profile'))
       end
 
@@ -60,6 +61,9 @@ module Blogaze
       def save
         return redirect('/') unless request.post?
 
+        # Set title
+        title "Profile"
+
         # Set email
         @userinfo.email = request[:email]
 

data/lib/blogaze/models/comment.rb

@@ -3,16 +3,22 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # Post comments model
+    #
     class Comment < Sequel::Model
       plugin :validation_helpers
 
       many_to_one :post
 
+      ##
+      # Validations
+      #
       def validate
         validates_presence [:post_id, :author, :body]
         validates_integer :post_id

data/lib/blogaze/models/group.rb

@@ -3,11 +3,14 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # User group model
+    #
     class Group < Sequel::Model
       one_to_many :user
     end # Group

data/lib/blogaze/models/init.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 Sequel.extension :pagination

data/lib/blogaze/models/page.rb

@@ -3,14 +3,20 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # Custom page model
+    #
     class Page < Sequel::Model
       plugin :validation_helpers
 
+      ##
+      # Validations
+      #
       def validate
         validates_presence [:title, :slug, :body]
       end

data/lib/blogaze/models/post.rb

@@ -3,11 +3,14 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # Post model
+    #
     class Post < Sequel::Model
       attr_accessor :post_tags
       plugin :validation_helpers
@@ -20,6 +23,8 @@ module Blogaze
       ##
       # Returns the URI to the post.
       #
+      # @return [String]
+      #
       def href
         return '/' + Time.at(self.published_at).year.to_s + '/' + Time.at(self.published_at).month.to_s + '/' + self.slug
       end
@@ -27,6 +32,8 @@ module Blogaze
       ##
       # Returns an array of the posts tags.
       #
+      # @return [Array]
+      #
       def tags
         tags = []
         relationships = ::Blogaze::Models::TagsRelationship.where(:object_id => self.id, :object_type => 'post')
@@ -40,11 +47,16 @@ module Blogaze
       ##
       # Returns the partial body of the post.
       #
+      # @return [String]
+      #
       def body_partial
         body = self.body.split('<!-- MORE -->')
         return body[0]
       end
 
+      ##
+      # Validations
+      #
       def validate
         validates_presence [:title, :body, :user_id]
         validates_integer :user_id
@@ -69,6 +81,10 @@ module Blogaze
 
       private
 
+      ##
+      # Creates, updates and removes tags
+      # from the post.
+      #
       def process_tags
         # Names of tags, obviously
         tag_names = []

data/lib/blogaze/models/tag.rb

@@ -3,16 +3,21 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # Tags model
+    #
     class Tag < Sequel::Model
       ##
       # Returns the URI to the page
       # listing posts belonging to the tag.
       #
+      # @return [String]
+      #
       def href
         "/tags/#{slug}"
       end

data/lib/blogaze/models/tags_relationship.rb

@@ -3,11 +3,14 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # Tag relationships model
+    #
     class TagsRelationship < Sequel::Model
       many_to_one :tag
     end # TagsRelationship

data/lib/blogaze/models/user.rb

@@ -3,11 +3,14 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
   module Models
+    ##
+    # User model
+    #
     class User < Sequel::Model
       plugin :validation_helpers
 
@@ -18,6 +21,8 @@ module Blogaze
       # Check if the users password matches
       # the supplied password.
       #
+      # @param [String] password
+      #
       def check_password(password)
         BCrypt::Password.new(self.password) == password
       end
@@ -25,10 +30,15 @@ module Blogaze
       ##
       # Changes the users password.
       #
+      # @param [String] new_password
+      #
       def change_password(new_password)
         self.password = BCrypt::Password.create(new_password)
       end
 
+      ##
+      # Validations
+      #
       def validate
         super
 
@@ -50,9 +60,6 @@ module Blogaze
         self.password = BCrypt::Password.create(self.password)
         self.group_id = 3
       end
-
-      def before_save
-      end
     end # User
   end # Models
 end # Blogaze

data/lib/blogaze/routes.rb

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
@@ -12,11 +12,11 @@ module Blogaze
 
   # Post routes
   ::Ramaze::Route[/^\/[0-9]+\/[0-9]+\/([\w\.\-]+)$/] = '/posts/view/%s'
-  ::Ramaze::Route[/\/page\/([0-9]+)/] = '/%d'
+  ::Ramaze::Route[/^\/page\/([0-9]+)$/] = '/%d'
 
   # Tag routes
   ::Ramaze::Route[/^\/tags\/([\w]+)$/] = '/posts/tag/%s'
-  #::Ramaze::Route[/^\/tags\/([\w]+)\/page\/([0-9]+)$/] = '/posts/tag/%s/%d'
+  ::Ramaze::Route[/^\/tags\/([\w]+)\/page\/([0-9]+)$/] = '/posts/tag/%s/%d'
 
   # User routes
   ::Ramaze::Route['/login'] = '/sessions/new'

data/lib/blogaze/tasks/db.rake

@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 Sequel.extension(:migration)

data/lib/blogaze/theme.rb

@@ -3,10 +3,13 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
+  ##
+  # Theme class
+  #
   class Theme
     attr_accessor :name
     attr_accessor :templates
@@ -17,6 +20,8 @@ module Blogaze
     ##
     # Sets the themes name as a symbol
     #
+    # @param [String] name Themes name
+    #
     def name=(name)
       @name = name.to_sym
     end
@@ -27,6 +32,8 @@ module Blogaze
       ##
       # Adds a new theme
       #
+      # @yield theme
+      #
       def add
         theme = self.new
         yield theme
@@ -34,7 +41,9 @@ module Blogaze
       end
 
       ##
-      # Returns the with matching the supplied name.
+      # Returns the theme matching the supplied name.
+      #
+      # @param [String] name Themes name
       #
       def [](name)
         name = name.to_sym
@@ -46,6 +55,8 @@ module Blogaze
       # Sets the supplied name as the
       # current theme to be used.
       #
+      # @param [String] name Themes name
+      #
       def use(name)
         name = name.to_sym
         raise("Unable to use theme #{name}: not registered") unless REGISTERED.key?(name)
@@ -55,6 +66,8 @@ module Blogaze
       ##
       # Returns the registered themes.
       #
+      # @return [Array]
+      #
       def registered
         REGISTERED.to_a
       end

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

@@ -8,7 +8,7 @@
         <?r end ?>
       </div>
     <?r end ?>
-    <div class="new-post-form tabular">
+    <div class="new-page-form tabular">
        #{
         form_for(@page, :method => :post, :action => '/admin/pages/save/' + @page.id.to_s) do |f|
           f.input_text 'Title', :title
@@ -27,4 +27,4 @@
       }
     </div>
   </div>
-</div>
+</div>

data/lib/blogaze/themes/default/admin/pages/new.xhtml

@@ -8,7 +8,7 @@
         <?r end ?>
       </div>
     <?r end ?>
-    <div class="new-post-form tabular">
+    <div class="new-page-form tabular">
        #{
         form_for(@page, :method => :post, :action => '/admin/pages/create') do |f|
           f.input_text 'Title', :title
@@ -23,4 +23,4 @@
       }
     </div>
   </div>
-</div>
+</div>

data/lib/blogaze/themes/default/admin/posts/new.xhtml

@@ -8,7 +8,7 @@
         <?r end ?>
       </div>
     <?r end ?>
-    <div class="new-post-form tabular">
+    <div class="edit-post-form tabular">
       #{
         form_for(@post, :method => :post, :action => '/admin/posts/create') do |f|
           f.input_text 'Title', :title

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

@@ -8,7 +8,7 @@
         <?r end ?>
       </div>
     <?r end ?>
-    <div class="edit-user-form tabular">
+    <div class="centered-form tabular">
        #{
         form_for(@user, :method => :post, :action => '/admin/users/save/' + @user.id.to_s) do |f|
           f.input_text 'Username', :username

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

@@ -29,10 +29,10 @@
 <?r if @posts.page_count > 1 ?>
 <div class="pager_nav">
   <?r if @posts.prev_page ?>
-  <a href="/page/#{@posts.prev_page}" class="prev">&lt; Previous</a>
+  <a href="#{!@tag.nil? ? "/tags/#{@tag.slug}" :''}/page/#{@posts.prev_page}" class="prev">&lt; Previous</a>
   <?r end ?>
   <?r if @posts.next_page ?>
-  <a href="/page/#{@posts.next_page}" class="next">Next &gt; </a>
+  <a href="#{!@tag.nil? ? "/tags/#{@tag.slug}" :''}/page/#{@posts.next_page}" class="next">Next &gt; </a>
   <?r end ?>
 </div>
 <?r end ?>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>#{@title}</title>
+    <title>#{@title.reverse.join(" - ")}</title>
     <link href="#{Ramaze.options.prefix}css/master.less" rel="stylesheet/less" type="text/css">
     <link href="/css/print.css" media="print" rel="stylesheet" type="text/css" />
     <!--[if lt IE 8]>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>#{@title}</title>
+    <title>#{@title.reverse.join(" - ")}</title>
     <link href="#{Ramaze.options.prefix}css/master.less" rel="stylesheet/less" type="text/css">
     <link href="/css/print.css" media="print" rel="stylesheet" type="text/css" />
     <!--[if lt IE 8]>

data/lib/blogaze/themes/default/sessions/new.xhtml

@@ -6,7 +6,7 @@
       Invalid username and/or password.
     </div>
     <?r end ?>
-    <div class="login-form tabular">
+    <div class="centered-form tabular">
       <form action="#{Ramaze.options.prefix}sessions/create" method="post">
         <p>
           <label for="username">Username</label>
@@ -22,4 +22,4 @@
       </form>
     </div>
   </div>
-</div>
+</div>

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

@@ -8,7 +8,7 @@
         <?r end ?>
       </div>
     <?r end ?>
-    <div class="register-form tabular">
+    <div class="centered-form tabular">
     #{
       form_for(@user, :method => :post, :action => '/users/create') do |f|
         f.input_text 'Username', :username
@@ -19,4 +19,4 @@
     }
     </div>
   </div>
-</div>
+</div>

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

@@ -8,7 +8,7 @@
         <?r end ?>
       </div>
     <?r end ?>
-    <div class="profile-form tabular">
+    <div class="centered-form tabular">
     #{
       form_for(@userinfo, :method => :post, :action => '/users/save') do |f|
         f.input_text 'Email', :email

data/lib/blogaze/version.rb

@@ -3,9 +3,9 @@
 # Copyright (C) 2011-2013 Jack Polgar
 #
 # Blogaze is released under the BSD 3-clause license.
-# @license http://opensource.org/licenses/BSD-3-Clause
+# http://opensource.org/licenses/BSD-3-Clause
 #
 
 module Blogaze
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/proto/public/css/master.less

@@ -176,7 +176,7 @@ h2 {
   }
 }
 
-.login-form, .register-form {
+.centered-form {
   width: 400px;
   margin: 0 auto;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogaze
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -214,3 +214,4 @@ signing_key:
 specification_version: 3
 summary: Blogaze is a simple blog.
 test_files: []
+has_rdoc: