zen 0.1a → 0.2

data/lib/zen/package/categories/lib/categories/view/admin/categories/new.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/package/categories/lib/categories/view/admin/category-groups/edit.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/package/categories/lib/categories/view/admin/category-groups/form.xhtml

@@ -0,0 +1,31 @@
+#{
+form_for(
+  @category_group, :method => :post, :action => @form_save_url, 
+  :id => :category_group_form
+) do |f|
+
+  f.input_hidden(:id, @category_group.id)
+  f.input_hidden(:csrf_token, get_csrf_token)
+  
+  f.input_text(
+    lang('category_groups.labels.name'), 
+    :name, 
+    :placeholder => lang('category_groups.placeholders.name'), 
+    :required    => :required,
+    :maxlength   => 255
+  )
+
+  f.textarea(
+    lang('category_groups.labels.description'), 
+    :description, 
+    :rows => 8
+  )
+  
+  f.g.div(:class => "clearfix") do
+    f.g.div(:class => "button") do
+      f.g.input(:type => 'submit', :value => lang('category_groups.buttons.save'))
+    end
+  end
+
+end
+}

data/lib/zen/package/categories/lib/categories/view/admin/category-groups/index.xhtml

@@ -0,0 +1,85 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    <form method="post" action="#{@form_delete_url}">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        
+        <?r if @category_groups and !@category_groups.empty? ?>
+        
+        <table class="table">
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th>
+                        <input type="checkbox" />
+                    </th>
+                    <?r end ?>
+                    
+                    <th>#{lang('category_groups.labels.id')}</th>
+                    <th>#{lang('category_groups.labels.name')}</th>
+                    
+                    <?r if user_authorized?([:create]) ?>
+                    <th></th>
+                    <?r end ?>
+                </tr>
+            </thead>
+            <tbody>
+                <?r @category_groups.each do |group| ?>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <td>
+                        <input type="checkbox" name="category_group_ids[]" value="#{group.id}" />
+                    </td>
+                    <?r end ?>
+                    
+                    <td>#{group.id}</td>
+                    
+                    <?r if user_authorized?([:update]) ?>
+                    <td>
+                        #{anchor_to(
+                          group.name, 
+                          Categories::Controllers::CategoryGroups.r(:edit, group.id)
+                        )}
+                    </td>
+                    <?r else ?>
+                    <td>#{group.name}</td>
+                    <?r end ?>
+                    
+                    <?r if user_authorized?([:create]) ?>
+                    <td>
+                        #{anchor_to(
+                          lang('category_groups.labels.manage'), 
+                          Categories::Controllers::Categories.r(:index, group.id)
+                        )}
+                    </td>
+                    <?r end ?>
+                    
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+        
+        <?r else ?>
+        <p>#{lang('category_groups.messages.no_groups')}</p>
+        <?r end ?>
+        
+        <div class="clearfix">
+            <?r if user_authorized?([:create]) ?>
+            <div class="button">
+                #{anchor_to(
+                  lang('category_groups.buttons.new'), 
+                  Categories::Controllers::CategoryGroups.r(:new)
+                )}
+            </div>
+            <?r end ?>
+            
+            <?r if user_authorized?([:delete]) and @category_groups and !@category_groups.empty? ?>
+            <div class="button">
+                <input type="submit" value="#{lang('category_groups.buttons.delete')}" />
+            </div>
+            <?r end ?>
+        </div>
+    </form>
+</article>

data/lib/zen/package/categories/lib/categories/view/admin/category-groups/new.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/{packages → package}/categories/migrations/1295282303_create_schema.rb

@@ -16,7 +16,8 @@ Sequel.migration do
       String  :description,           :text => true
       String  :slug,                  :null => false,   :unique => true
       
-      foreign_key :category_group_id, :category_groups, :on_delete => :cascade, :on_update => :cascade, :key => :id
+      foreign_key :category_group_id, :category_groups, :on_delete => :cascade, 
+        :on_update => :cascade, :key => :id 
     end
     
     create_table :categories_section_entries do      
@@ -37,4 +38,4 @@ Sequel.migration do
     drop_table :category_groups
   end
 
-end
+end

data/lib/zen/{packages → package}/comments/lib/comments.rb

@@ -14,7 +14,7 @@ Zen::Package.add do |p|
   p.name        = 'Comments'
   p.author      = 'Yorick Peterse'
   p.url         = 'http://yorickpeterse.com/'
-  p.version     = '0.1'
+  p.version     = '1.0'
   p.about       = "Allow users to post comments on any given section entry (as long as the section allows it)."
   p.identifier  = 'com.zen.comments'
   p.directory   = __DIR__('comments')

data/lib/zen/{packages → package}/comments/lib/comments/controller/comments.rb

@@ -1,4 +1,6 @@
+#:nodoc:
 module Comments
+  #:nodoc:
   module Controllers
     ##
     # Controller used for managing comments. Administrations can't actually
@@ -12,20 +14,22 @@ module Comments
     # @since   0.1
     #
     class Comments < Zen::Controllers::AdminController
+      include ::Comments::Models
+
       map '/admin/comments'
-      
       trait :extension_identifier => 'com.zen.comments'
       
-      include ::Comments::Models
-      
       before_all do
-        csrf_protection :save, :delete do
-          respond("The specified request can't be executed without a valid CSRF token", 401)
+        csrf_protection(:save, :delete) do
+          respond(lang('zen_general.errors.csrf'), 403)
         end
       end
       
       ##
-      # Constructor method that pre-loads several variables.
+      # Constructor method that pre-loads several variables and language files.
+      # The following language files are loaded:
+      #
+      # * comments
       # 
       # @author Yorick Peterse
       # @since  0.1
@@ -33,33 +37,35 @@ module Comments
       def initialize
         super
         
-        @form_save_url   = '/admin/comments/save'
-        @form_delete_url = '/admin/comments/delete'
-        @comments_lang   = Zen::Language.load 'comments'
+        @form_save_url   = Comments.r(:save)
+        @form_delete_url = Comments.r(:delete)
+        
+        Zen::Language.load('comments')
         
         # Set the page title
         if !action.method.nil?
-          method = action.method.to_sym
-
-          if @comments_lang.titles.key? method 
-            @page_title = @comments_lang.titles[method]
-          end
+          method      = action.method.to_s
+          @page_title = lang("comments.titles.#{method}") rescue nil
         end
       end
     
       ##
       # Shows an overview of all posted comments along with their status,
       # author and so on.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
       # 
       # @author Yorick Peterse
       # @since  0.1
       #
       def index
         if !user_authorized?([:read])
-          respond(@zen_general_lang.errors[:not_authorized], 403)
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
         
-        set_breadcrumbs @comments_lang.titles[:index]
+        set_breadcrumbs(lang('comments.titles.index'))
         
         @comments = Comment.all
       end
@@ -67,54 +73,73 @@ module Comments
       ##
       # Edits an existing comment based on the ID.
       #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * update
+      #
       # @author Yorick Peterse
       # @param  [Integer] id The ID of the comment to retrieve so that we can edit it.
       # @since  0.1
       #
       def edit id
         if !user_authorized?([:read, :update])
-          respond(@zen_general_lang.errors[:not_authorized], 403)
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
         
-        set_breadcrumbs anchor_to(@comments_lang.titles[:index], "admin/comments"), @page_title
-        
-        @comment = Comment[id]
+        set_breadcrumbs(
+          anchor_to(lang('comments.titles.index'), Comments.r(:index)), 
+          @page_title
+        )
+
+        if flash[:form_data]
+          @comment = flash[:form_data]
+        else
+          @comment = Comment[id.to_i]
+        end
       end
       
       ##
       # Saves a comment based on the current POST data. Note that this
       # method won't create a new comment as this can't be done using the backend.
       #
+      # This method requires the following permissions:
+      #
+      # * update
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
       def save
         if !user_authorized?([:update])
-          respond(@zen_general_lang.errors[:not_authorized], 403)
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
         
         # Copy the POST data so we can work with it without messing things up
-        post = request.params.dup
-       
-        # Remove all empty fields
-        post.each do |key, value|
-          post.delete(key) if value.empty?
-        end
-
-        @comment = Comment[post["id"]]
+        post     = request.params.dup
+        @comment = Comment[post['id'].to_i]
 
         begin
           @comment.update(post)
-          notification(:success, @comments_lang.titles[:index], @comments_lang.success[:save])
+          notification(
+            :success, 
+            lang('comments.titles.index'), 
+            lang('comments.success.save')
+          )
         rescue
-          notification(:error, @comments_lang.titles[:index], @comments_lang.errors[:save])
+          notification(
+            :error, 
+            lang('comments.titles.index'), 
+            lang('comments.errors.save')
+          )
           
           flash[:form_errors] = @comment.errors
+          flash[:form_data]   = @comment
         end
         
         # Redirect the user to the proper page.
         if @comment.id
-          redirect "/admin/comments/edit/#{@comment.id}"
+          redirect(Comments.r(:edit, @comment.id))
         else
           redirect_referrer
         end
@@ -124,29 +149,44 @@ module Comments
       # Deletes a number of comments based on the comment IDs specified
       # in the POST array "comment_ids".
       #
+      # This method requires the following permissions:
+      #
+      # * delete
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
       def delete
         if !user_authorized?([:delete])
-          respond(@zen_general_lang.errors[:not_authorized], 403)
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
         
         # Obviously we'll require some IDs
-        if !request.params["comment_ids"] or request.params["comment_ids"].empty?
-          notification(:error, @comments_lang.titles[:index], @comments_lang.errors[:no_delete])
+        if !request.params['comment_ids'] or request.params['comment_ids'].empty?
+          notification(
+            :error, 
+            lang('comments.titles.index'),
+            lang('comments.errors.no_delete')
+          )
+
           redirect_referrer
         end
         
         # Delete each section
-        request.params["comment_ids"].each do |id|
-          @comment = Comment[id]
-          
+        request.params['comment_ids'].each do |id|
           begin
-            @comment.delete
-            notification(:success, @comments_lang.titles[:index], @comments_lang.success[:delete] % id)
+            Comment[id.to_i].destroy
+            notification(
+              :success, 
+              lang('comments.titles.index'), 
+              lang('comments.success.delete')
+            )
           rescue
-            notification(:error, @comments_lang.titles[:index], @comments_lang.errors[:delete] % id)
+            notification(
+              :error, 
+              lang('comments.titles.index'), 
+              lang('comments.errors.delete') % id
+            )
           end
         end
         

data/lib/zen/{packages → package}/comments/lib/comments/controller/comments_form.rb

@@ -1,4 +1,6 @@
+#:nodoc:
 module Comments
+  #:nodoc:
   module Controllers
     ##
     # Frontend controller for the comments system used for saving user-submitted comments.
@@ -15,8 +17,8 @@ module Comments
       trait :extension_identifier => 'com.zen.comments'
       
       before_all do
-        csrf_protection :save do
-          respond(@zen_general_lang.errors[:csrf], 401)
+        csrf_protection(:save) do
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
       end
       
@@ -28,7 +30,7 @@ module Comments
       # @since  0.1
       #
       def save
-        comments_lang = Zen::Language.load('comments')
+        Zen::Language.load('comments')
 
         comment = Comment.new
         post    = request.params.dup
@@ -56,7 +58,7 @@ module Comments
         
         # Validate the section entry
         if entry.nil?
-          flash[:error] = comments_lang.errors[:invalid_entry]
+          flash[:error] = lang('comments.errors.invalid_entry')
           redirect_referrer
         end
         
@@ -64,13 +66,13 @@ module Comments
         
         # Comments allowed?
         if section.comment_allow == false
-          flash[:error] = comments_lang.errors[:comments_not_allowed]
+          flash[:error] = lang('comments.errors.comments_not_allowed')
           redirect_referrer
         end
         
         # Comments require an account?
         if section.comment_require_account == true and session[:user].nil?
-          flash[:error] = comments_lang.errors[:comments_require_account]
+          flash[:error] = lang('comments.errors.comments_require_account')
           redirect_referrer
         end
         
@@ -85,19 +87,19 @@ module Comments
           api_key = session[:settings][:defensio_key]
           
           if api_key.nil?
-            flash[:error] = comments_lang.errors[:no_api_key]
+            flash[:error] = lang('comments.errors.no_api_key')
             redirect_referrer
           end
           
           defensio         = ::Defensio.new(api_key)
           status, response = defensio.post_document(
             :content       => post['comment'],
-            :platform      => "zen",
-            :type          => "comment"
+            :platform      => 'zen',
+            :type          => 'comment'
           )
           
           if status != 200
-            flash[:error] = comments_lang.errors[:defensio_status]
+            flash[:error] = lang('comments.errors.defensio_status')
             redirect_referrer
           end
           
@@ -120,12 +122,12 @@ module Comments
           comment.save
           
           if section.comment_moderate == true
-            flash[:success] = comments_lang.success[:moderate]
+            flash[:success] = lang('comments.success.moderate')
           else
-            flash[:success] = comments_lang.success[:new]
+            flash[:success] = lang('comments.success.new')
           end
         rescue
-          flash[:error]   = comments_lang.errors[:new]
+          flash[:error]     = lang('comments.errors.new')
         end
         
         redirect_referrer