blogaze 0.0.1 → 0.0.2

data/lib/blogaze/{model → models}/tags_relationship.rb

@@ -7,7 +7,9 @@
 #
 
 module Blogaze
-  class TagsRelationship < Sequel::Model
-    many_to_one :tag
-  end
-end
+  module Models
+    class TagsRelationship < Sequel::Model
+      many_to_one :tag
+    end # TagsRelationship
+  end # Models
+end # Blogaze

data/lib/blogaze/models/user.rb

@@ -0,0 +1,43 @@
+#
+# 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 Models
+    class User < Sequel::Model
+      plugin :validation_helpers
+
+      one_to_many :post
+      many_to_one :group
+
+      def validate
+        super
+
+        # Username
+        validates_unique :username
+        validates_min_length 4, :username, :message => 'must be at least 4 characters' if new?
+        validates_presence :username, :message => 'can\'t be empty'
+
+        # Password
+        validates_presence :password, :message => 'cant be blank'
+        validates_min_length 6, :password, :message => 'must be at least 6 characters'
+
+        # Email
+        validates_unique :email
+        validates_format /(.*)@(.*)\.(.*)/, :email, :message => 'is not a valid email'
+      end
+
+      def before_create
+        self.password = Digest::SHA1.hexdigest(self.password)
+        self.group_id = 3
+      end
+
+      def before_save
+      end
+    end # User
+  end # Models
+end # Blogaze

data/lib/blogaze/routes.rb

@@ -14,6 +14,10 @@ module Blogaze
   ::Ramaze::Route[/^\/[0-9]+\/[0-9]+\/([\w\.\-]+)$/] = '/posts/view/%s'
   ::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'
+
   # User routes
   ::Ramaze::Route['/login'] = '/sessions/new'
   ::Ramaze::Route['/logout'] = '/sessions/destroy'

data/lib/blogaze/theme.rb

@@ -11,8 +11,12 @@ module Blogaze
     attr_accessor :name
     attr_accessor :templates
 
+    # Registered themes
     REGISTERED = {}
 
+    ##
+    # Sets the themes name as a symbol
+    #
     def name=(name)
       @name = name.to_sym
     end
@@ -20,24 +24,37 @@ module Blogaze
     class << self
       attr_accessor :current
 
+      ##
+      # Adds a new theme
+      #
       def add
         theme = self.new
         yield theme
         REGISTERED[theme.name] = theme
       end
 
+      ##
+      # Returns the with matching the supplied name.
+      #
       def [](name)
         name = name.to_sym
         raise("Invalid theme #{name}") unless REGISTERED.key?(name)
         return REGISTERED[name]
       end
 
+      ##
+      # Sets the supplied name as the
+      # current theme to be used.
+      #
       def use(name)
         name = name.to_sym
         raise("Unable to use theme #{name}: not registered") unless REGISTERED.key?(name)
         @current = REGISTERED[name]
       end
 
+      ##
+      # Returns the registered themes.
+      #
       def registered
         REGISTERED.to_a
       end

data/lib/blogaze/version.rb

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

data/proto/public/css/master.less

@@ -33,35 +33,35 @@ body {
   color: #fff;
   padding: 8px;
   height: 36px;
-  
+
   a {
     color: #fff;
     text-decoration: none;
   }
-  
+
   h1 {
     font-weight: bold;
     color: #fff;
     margin: 0;
     float: left;
   }
-  
+
   nav {
     margin-top: 7px;
     font-size: 15px;
     float: right;
-    
+
     ul, li {
       margin: 0;
       padding: 0;
       list-style: none;
       display: inline;
     }
-    
+
     li {
       margin: 0 2px;
     }
-    
+
     a:hover {
       text-decoration: underline;
     }
@@ -69,6 +69,10 @@ body {
 }
 
 /* ==========# Posts and Content #==========*/
+h2 {
+  margin: 0;
+}
+
 .content, .post-body {
   padding: 5px;
 }
@@ -93,7 +97,7 @@ body {
   margin: 0;
   line-height: 1;
   font-size: 18px;
-  
+
   a {
     color: #fff;
     text-decoration: none;
@@ -114,11 +118,11 @@ body {
 
 .pager_nav {
   height: 18px;
-  
+
   .prev {
     float: left;
   }
-  
+
   .next {
     float: right;
   }
@@ -128,7 +132,7 @@ body {
   h3 {
     margin-bottom: 4px;
   }
-  
+
   h4 {
     font-size: 14px;
   }
@@ -166,7 +170,7 @@ body {
     text-align: left;
     width: 0;
   }
-  
+
   input[type=checkbox] {
     margin-top: 10px;
   }
@@ -185,4 +189,4 @@ body {
 
 table.list {
   margin-bottom: 0;
-}
+}

data/proto/themes/default/admin/index.xhtml

@@ -3,10 +3,10 @@
   <div class="content">
     What would you like to do today?
     <ul>
-      <li>#{a 'Change Settings', Blogaze::Admin::Settings.r('/')}</li>
-      <li>#{a 'Manage Posts', Blogaze::Admin::Posts.r('/')}</li>
-      <li>#{a 'Manage Comments', Blogaze::Admin::Comments.r('/')}</li>
-      <li>#{a 'Manage Pages', Blogaze::Admin::Pages.r('/')}</li>
+      <li>#{a 'Change Settings', Blogaze::Controllers::Admin::Settings.r('/')}</li>
+      <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>
     </ul>
   </div>
 </div>

data/proto/themes/default/admin/settings/index.xhtml

@@ -1,7 +1,7 @@
 <div id="page_content">
   <h2 id="page-title">Settings</h2>
   <div class="content">
-    <form action="#{Blogaze::Admin::Settings.r('save')}" method="post" class="tabular">
+    <form action="#{Blogaze::Controllers::Admin::Settings.r('save')}" method="post" class="tabular">
       <p>
         <label>Blog Title</label>
         <input type="text" name="settings[title]" value="#{@settings[:title]}">

data/proto/themes/default/index.xhtml

@@ -1,7 +1,10 @@
+<?r if @tag ?>
+<h2>Posts tagged #{@tag.name}</h2>
+<?r end ?>
 <?r @posts.each do |post| ?>
 <article class="post">
     <header>
-      <h2 class="title">#{a post.title, '/' + Time.at(post.created_at).year.to_s + '/' + Time.at(post.created_at).month.to_s + '/' + post.slug}</h2>
+      <h3 class="title"><a href="#{post.href}">#{post.title}</a></h3>
     </header>
     <div class="post-body">
       <?r if post.body == post.body_partial ?>
@@ -15,11 +18,11 @@
       <?r if post.tags.count > 0 ?>
       <div class="tags">
         <?r post.tags.each do |tag| ?>
-        #{a tag.name, tag.href}
+        <a href="#{tag.href}">#{tag.name}</a>
         <?r end ?>
       </div>
       <?r end ?>
-      By #{post.user.username}, <abbr title="#{Time.at(post.published_at)}">#{post.published_at.ago_in_words}</abbr>, <a href="#{post.href}#comments">#{post.comment.count} comments</a>
+      By #{post.user.username}, <abbr title="#{Time.at(post.published_at)}">#{post.published_at.ago_in_words}</abbr>, <a href="#{post.href}#comments">#{post.comments.count} comments</a>
     </footer>
 </article>
 <?r end ?>

data/proto/themes/default/layouts/admin.xhtml

@@ -13,10 +13,10 @@
   <body>
     <div id="wrapper">
       <header id="header">
-        <h1>#{a 'AdminCP', Blogaze::Admin::Dashboard.r('/')}</h1>
+        <h1>#{a 'AdminCP', Blogaze::Controllers::Admin::Dashboard.r('/')}</h1>
         <nav>
           <ul>
-            <li>#{a 'View Site', Blogaze::MainController.r('/')}</li>
+            <li>#{a 'View Site', Blogaze::Controllers::MainController.r('/')}</li>
             <li><a href="/logout">Logout</a></li>
           </ul>
         </nav>

data/proto/themes/default/layouts/default.xhtml

@@ -16,7 +16,7 @@
         <h1><a href="/">#{@settings[:title]}</a></h1>
         <nav>
           <ul>
-          <?r ::Blogaze::Page.filter(:on_menu => 1).all.each do |page| ?>
+          <?r ::Blogaze::Models::Page.filter(:on_menu => 1).all.each do |page| ?>
           <li><a href="/#{page.slug}">#{page.title}</a></li>
           <?r end ?>
           <?r if session[:logged_in] ?>

data/proto/themes/default/posts/view.xhtml

@@ -9,17 +9,17 @@
       <?r if @post.tags.count > 0 ?>
       <div class="tags">
         <?r @post.tags.each do |tag| ?>
-        #{a tag.name, tag.href}
+        <a href="#{tag.href}">#{tag.name}</a>
         <?r end ?>
       </div>
       <?r end ?>
-      By #{@post.user.username}, <abbr title="#{Time.at(@post.published_at)}">#{@post.published_at.ago_in_words}</abbr>, #{@post.comment.count} comments
+      By #{@post.user.username}, <abbr title="#{Time.at(@post.published_at)}">#{@post.published_at.ago_in_words}</abbr>, #{@post.comments.count} comments
     </footer>
 </article>
 
 <section id="comments">
   <h3><a name="comments" class="no-href">Comments</a></h3>
-  <?r @post.comment.each do |comment| ?>
+  <?r @post.comments.each do |comment| ?>
   <div class="comment">
     <h4>#{comment.author}, #{comment.created_at.ago_in_words}</h4>
     <div class="content">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogaze
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: shebang
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Blogaze is a simple blog powered by Ramaze and Sequel.
 email:
 - nrx@nirix.net
@@ -93,31 +109,31 @@ files:
 - lib/blogaze.rb
 - lib/blogaze/bin/create.rb
 - lib/blogaze/bin/default.rb
-- lib/blogaze/controller/admin/comments.rb
-- lib/blogaze/controller/admin/init.rb
-- lib/blogaze/controller/admin/main.rb
-- lib/blogaze/controller/admin/pages.rb
-- lib/blogaze/controller/admin/posts.rb
-- lib/blogaze/controller/admin/settings.rb
-- lib/blogaze/controller/init.rb
-- lib/blogaze/controller/main.rb
-- lib/blogaze/controller/pages.rb
-- lib/blogaze/controller/posts.rb
-- lib/blogaze/controller/sessions.rb
-- lib/blogaze/controller/users.rb
+- lib/blogaze/controllers/admin/comments.rb
+- lib/blogaze/controllers/admin/dashboard.rb
+- lib/blogaze/controllers/admin/init.rb
+- lib/blogaze/controllers/admin/pages.rb
+- lib/blogaze/controllers/admin/posts.rb
+- lib/blogaze/controllers/admin/settings.rb
+- lib/blogaze/controllers/init.rb
+- lib/blogaze/controllers/main_controller.rb
+- lib/blogaze/controllers/pages.rb
+- lib/blogaze/controllers/posts.rb
+- lib/blogaze/controllers/sessions.rb
+- lib/blogaze/controllers/users.rb
 - lib/blogaze/db/migration/001_start.rb
 - lib/blogaze/db/migration/002_pages.rb
 - lib/blogaze/db/migration/003_pages_on_menu.rb
 - lib/blogaze/db/migration/004_comments.rb
 - lib/blogaze/db/migration/005_tags.rb
-- lib/blogaze/model/comment.rb
-- lib/blogaze/model/group.rb
-- lib/blogaze/model/init.rb
-- lib/blogaze/model/page.rb
-- lib/blogaze/model/post.rb
-- lib/blogaze/model/tag.rb
-- lib/blogaze/model/tags_relationship.rb
-- lib/blogaze/model/user.rb
+- lib/blogaze/models/comment.rb
+- lib/blogaze/models/group.rb
+- lib/blogaze/models/init.rb
+- lib/blogaze/models/page.rb
+- lib/blogaze/models/post.rb
+- lib/blogaze/models/tag.rb
+- lib/blogaze/models/tags_relationship.rb
+- lib/blogaze/models/user.rb
 - lib/blogaze/routes.rb
 - lib/blogaze/tasks.rb
 - lib/blogaze/tasks/db.rake

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

@@ -1,32 +0,0 @@
-#
-# 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 Admin
-    class Comments < Controller
-      map '/admin/comments'
-
-      def index
-        @comments = Comment.all
-        respond(view_file('admin/comments/index'))
-      end
-
-      def approve(comment_id)
-        Comment[comment_id].update(:in_moderation => 0).save
-        flash[:success] = "Comment approved"
-        redirect r('/')
-      end
-
-      def delete(comment_id)
-        Comment[comment_id].delete
-        flash[:success] = "Comment deleted"
-        redirect r('/')
-      end
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-#
-# 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 Admin
-    class Controller < ::Blogaze::Controller
-      layout 'admin'
-      helper :blue_form
-
-      def initialize
-        super
-
-        if !@userinfo.respond_to?('group') or !@userinfo.group.is_admin
-          redirect '/login'
-        end
-      end
-    end
-  end
-
-  Dir.glob(File.dirname(__FILE__) + '/*.rb').each do |controller|
-    require(controller)
-  end
-end