zen 0.4 → 0.4.1

data/lib/zen/package/categories/lib/categories/controller/category_groups.rb

@@ -53,11 +53,32 @@ module Categories
     #
     # In this form you can set the following fields:
     #
-    # * **Name**: the name of the category group. It can be any name in any
-    #   format as long as it's not longer than 255 characters.
-    # * **Description**: the description of the category group. While not
-    #   required it can be used to make it easier to remember that purpose a
-    #   category group has.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Name</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>
+    #                 The name of the category group, the length of this name
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Description</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>A short description of the category group.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # ## Used Permissions
     #

data/lib/zen/package/categories/lib/categories/helper/category.rb

@@ -20,11 +20,14 @@ module Ramaze
       # @return [Categories::Model::CategoryGroup]
       #
       def validate_category_group(category_group_id)
+        unless category_group_id =~ /\d+/
+          redirect_invalid_group
+        end
+
         group = ::Categories::Model::CategoryGroup[category_group_id]
 
         if group.nil?
-          message(:error, lang('category_groups.errors.invalid_group'))
-          redirect(::Categories::Controller::CategoryGroups.r(:index))
+          redirect_invalid_group
         else
           return group
         end
@@ -43,13 +46,14 @@ module Ramaze
       # @return [Categories::Model::Category]
       #
       def validate_category(category_id, category_group_id)
+        unless category_id =~ /\d+/
+          redirect_invalid_category(category_group_id)
+        end
+
         category = ::Categories::Model::Category[category_id]
 
         if category.nil?
-          message(:error, lang('categories.errors.invalid_category'))
-          redirect(
-            ::Categories::Controller::Categories.r(:index, category_group_id)
-          )
+          redirect_invalid_category(category_group_id)
         else
           return category
         end
@@ -78,6 +82,33 @@ module Ramaze
 
         return parent_categories
       end
+
+      ##
+      # Redirects the user to the category groups overview and shows a message
+      # about an invalid group being specified.
+      #
+      # @since 03-04-2012
+      #
+      def redirect_invalid_group
+        message(:error, lang('category_groups.errors.invalid_group'))
+        redirect(::Categories::Controller::CategoryGroups.r(:index))
+      end
+
+      ##
+      # Redirects the user to the overview of the categories of a given group
+      # and shows a message informing the user that the specified category was
+      # invalid.
+      #
+      # @since 03-04-2012
+      # @param [Fixnum] category_group_id The ID of the category group that the
+      #  category belongs to.
+      #
+      def redirect_invalid_category(category_group_id)
+        message(:error, lang('categories.errors.invalid_category'))
+        redirect(
+          ::Categories::Controller::Categories.r(:index, category_group_id)
+        )
+      end
     end # Category
   end # Helper
 end # Ramaze

data/lib/zen/package/categories/lib/categories/helper/category_frontend.rb

@@ -9,7 +9,7 @@ module Ramaze
     module CategoryFrontend
       ##
       # Gets a number of categories and optionally paginates them. Keep in mind
-      # that this method will either return a dataset or an instance of
+      # that this method will either return a data set or an instance of
       # ``Ramaze::Helper::Paginate::Paginator``.
       #
       # When paginating the results and no custom ``:var`` or ``:limit`` options
@@ -66,7 +66,7 @@ module Ramaze
           query = query.filter(:category_groups__id => group)
         end
 
-        # Paginate the results or return the dataset directly.
+        # Paginate the results or return the data set directly.
         if options[:paginate] == true and respond_to?(:paginate)
           return paginate(
             query,

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

@@ -9,43 +9,40 @@
           :method              => :post,
           :action              => Categories::Controller::Categories.r(:save),
           :id                  => :category_form,
-          :'data-autosave-url' => Categories::Controller::Categories \
-            .r(:autosave)
+          :'data-autosave-url' => Categories::Controller::Categories.r(:autosave)
         ) do |f|
           f.input_hidden(:category_group_id, @category_group_id)
           f.input_hidden(:id               , @category.id)
           f.input_hidden(:csrf_token       , get_csrf_token)
 
-          f.g.div(:id => 'general') do
-            f.input_text(
-              lang('categories.labels.name'),
-              :name,
-              :title => lang('categories.descriptions.name'),
-              :required    => :required,
-              :maxlength   => 255
-            )
+          f.input_text(
+            lang('categories.labels.name'),
+            :name,
+            :title => lang('categories.descriptions.name'),
+            :required    => :required,
+            :maxlength   => 255
+          )
 
-            f.input_text(
-              lang('categories.labels.slug'),
-              :slug,
-              :title => lang('categories.descriptions.slug'),
-              :maxlength   => 255
-            )
+          f.input_text(
+            lang('categories.labels.slug'),
+            :slug,
+            :title => lang('categories.descriptions.slug'),
+            :maxlength   => 255
+          )
 
-            f.select(
-              lang('categories.labels.parent'),
-              :parent_id,
-              :values   => parent_categories(@category.id, @category_group_id),
-              :size     => 1,
-              :selected => @category.parent_id
-            )
+          f.select(
+            lang('categories.labels.parent'),
+            :parent_id,
+            :values   => parent_categories(@category.id, @category_group_id),
+            :size     => 1,
+            :selected => @category.parent_id
+          )
 
-            f.textarea(
-              lang('categories.labels.description'),
-              :description,
-              :rows => 8
-            )
-          end
+          f.textarea(
+            lang('categories.labels.description'),
+            :description,
+            :rows => 8
+          )
 
           f.g.input(
             :type  => 'submit',

data/lib/zen/package/comments/lib/comments.rb

@@ -31,7 +31,15 @@ Settings::Setting.add do |setting|
   setting.group       = 'security'
   setting.type        = 'select'
   setting.default     = 'defensio'
-  setting.values      = lambda { Comments::AntiSpam::REGISTERED }
+  setting.values      = lambda do
+    regged = {}
+
+    Comments::AntiSpam::REGISTERED.each do |name, translation|
+      regged[name] = lang(translation)
+    end
+
+    return regged
+  end
 end
 
 Settings::Setting.add do |setting|

data/lib/zen/package/comments/lib/comments/anti_spam.rb

@@ -60,7 +60,7 @@ module Comments
     # Array containing the method names of the various supported engines and
     # their labels to display in the admin interface.
     REGISTERED = {
-      :defensio => lang('comments.labels.defensio')
+      :defensio => 'comments.labels.defensio'
     }
 
     class << self

data/lib/zen/package/comments/lib/comments/controller/comments.rb

@@ -53,20 +53,65 @@ module Comments
     #
     # When editing a comment you can specify/update the following fields:
     #
-    # * **Name**: the name of the author. This field can only be changed if the
-    #   comment was posted by somebody that wasn't logged in.
-    # * **Website**: the website of the author that posted the comment.
-    # * **Email**: the Email address of the author. If the comment was posted by
-    #   a user that wasn't logged in then this field is required.
-    # * **Status**: the status of a comment, can be "Open", "Closed" or "Spam".
-    #   If the status is something other than "Open" it will be hidden when the
-    #   comments plugin is used.
-    # * **Comment** (required): the actual comment. Based on a section's
-    #   settings these are formatted using Markdown, Textile or any of the other
-    #   available markup processors.
-    #
-    # Note that if a comment was posted by a user that was logged in you won't
-    # be able to change the name of the author.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Name</td>
+    #             <td>
+    #                 Only when the comment was submitted by a non logged in
+    #                 user.
+    #             </td>
+    #             <td>255</td>
+    #             <td>
+    #                 The name of the author of the comment. This field can only
+    #                 be edited if the comment was submitted by a user that
+    #                 wasn't logged in.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Website</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>The website of the comment author.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Email</td>
+    #             <td>
+    #                 Only if the comment was submitted by a user that wasn't
+    #                 logged in.
+    #             </td>
+    #             <td>255</td>
+    #             <td>
+    #                 The Email address of the comment author. Like the name
+    #                 field this field can only be edited if the comment was
+    #                 submitted by a user that wasn't logged in.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Status</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>
+    #                 The status of the comment. If a comment is created and no
+    #                 status is specified the status will be set to "closed".
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Comment</td>
+    #             <td>Yes</td>
+    #             <td>Unlimited</td>
+    #             <td>The actual comment.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # ## Used Permissions
     #

data/lib/zen/package/comments/lib/comments/controller/comments_form.rb

@@ -7,16 +7,54 @@ module Comments
     # you and thus you'll have to do this yourself. When creating such a form
     # you must add the following fields to it:
     #
-    # * **section_entry** (required): an ID of a section entry where the
-    #   comments belong to.
-    # * **user_id**: the ID of the currently logged in user (if any). If this ID
-    #   isn't specified the "name" and "Email" fields are required.
-    # * **comment**: the text of the comment.
-    # * **name**: the name of the author, required when the "user_id" field is
-    #   empty.
-    # * **website**: the website of the user, if any.
-    # * **email**: the Email address of the user, required if the "user_id"
-    #   field is empty.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>section_entry</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>The ID of the section entry the comment belongs to.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>user_id</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>A short description of the category group.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>comment</td>
+    #             <td>Yes</td>
+    #             <td>Unlimited</td>
+    #             <td>The text of the comment.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>name</td>
+    #             <td>Only when the user isn't logged in.</td>
+    #             <td>255</td>
+    #             <td>The name of the comment author.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>website</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>The website of the comment author.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>email</td>
+    #             <td>Only when the user isn't logged in.</td>
+    #             <td>255</td>
+    #             <td>The Email address of the user.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # An example of such a form looks like the code below. Note that this block
     # of code should be wrapped in a ``#{}`` tag.
@@ -161,7 +199,7 @@ module Comments
           url   = post['website']
         end
 
-        # Require anti-spam validation?
+        # Require anti spam validation?
         if get_setting(:enable_antispam).true?
           engine = get_setting(:anti_spam_system).value
           spam   = ::Comments::AntiSpam.validate(

data/lib/zen/package/comments/lib/comments/helper/comment.rb

@@ -18,15 +18,27 @@ module Ramaze
       # @return [Comments::Model::Comment]
       #
       def validate_comment(comment_id)
+        redirect_invalid_comment unless comment_id =~ /\d+/
+
         comment = ::Comments::Model::Comment[comment_id]
 
         if comment.nil?
-          message(:error, lang('comments.errors.invalid_comment'))
-          redirect(::Comments::Controller::Comments.r(:index))
+          redirect_invalid_comment
         else
           return comment
         end
       end
+
+      ##
+      # Redirects the user to the comments overview and shows a message
+      # informing the user that the comment he/she tried to access was invalid.
+      #
+      # @since 05-04-2012
+      #
+      def redirect_invalid_comment
+        message(:error, lang('comments.errors.invalid_comment'))
+        redirect(::Comments::Controller::Comments.r(:index))
+      end
     end # Comment
   end # Helper
 end # Ramaze

data/lib/zen/package/comments/lib/comments/view/admin/comments/form.xhtml

@@ -6,9 +6,9 @@
     <div class="body">
         #{form_for(
             @comment,
-            :method => :post,
-            :action => Comments::Controller::Comments.r(:save),
-            :id     => :comment_form,
+            :method              => :post,
+            :action              => Comments::Controller::Comments.r(:save),
+            :id                  => :comment_form,
             :'data-autosave-url' => Comments::Controller::Comments.r(:autosave)
           ) do |f|
             f.input_hidden(:csrf_token, get_csrf_token)

data/lib/zen/package/comments/migrations/1308774099_comment_status.rb

@@ -59,7 +59,7 @@ Sequel.migration do
 
     # Put the old statuses back in place
     comments.each do |comment|
-      Zen.database.filter(:id => comment[:id]) \
+      Zen.database[:comments].filter(:id => comment[:id]) \
         .update(:status => statuses[comment[:comment_status_id]])
     end
 

data/lib/zen/package/custom_fields/lib/custom_fields/blue_form_parameters.rb

@@ -109,6 +109,10 @@ module CustomFields
           params.last[:class] = type.html_class
         end
 
+        if field.required
+          params.last[:required] = :required
+        end
+
         return params
       end
 
@@ -181,6 +185,10 @@ module CustomFields
           end
         end
 
+        if field.required
+          params.last[:required] = :required
+        end
+
         return params
       end
 
@@ -232,6 +240,10 @@ module CustomFields
           end
         end
 
+        if field.required
+          params.last[:required] = :required
+        end
+
         return params
       end