zen 0.4.2 → 0.4.3

data/lib/zen/package.rb

@@ -279,7 +279,7 @@ module Zen
     ##
     # Creates a new instance of the package.
     #
-    # @since 12-02-2012
+    # @since 2012-02-12
     #
     def initialize
       @env = OpenStruct.new
@@ -325,7 +325,7 @@ module Zen
     # Returns the title as either an ``<a>`` tag or plain text depending on
     # whether or not the package has a URL set.
     #
-    # @since  19-11-2011
+    # @since  2011-11-19
     # @return [String]
     #
     def formatted_title

data/lib/zen/package/all.rb

@@ -5,8 +5,8 @@ require __DIR__('settings/lib/settings')
 require __DIR__('users/lib/users')
 require __DIR__('dashboard/lib/dashboard')
 require __DIR__('sections/lib/sections')
+require __DIR__('custom_fields/lib/custom_fields')
 require __DIR__('comments/lib/comments')
 require __DIR__('categories/lib/categories')
-require __DIR__('custom_fields/lib/custom_fields')
 require __DIR__('menus/lib/menus')
 require __DIR__('extensions/lib/extensions')

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

@@ -71,10 +71,10 @@ module Categories
     #
     # This controller uses the following permissions:
     #
-    # * show_category
-    # * edit_category
-    # * new_category
-    # * delete_category
+    # * show\_category
+    # * edit\_category
+    # * new\_category
+    # * delete\_category
     #
     # @since  0.1
     # @map    /admin/categories

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

@@ -82,10 +82,10 @@ module Categories
     #
     # ## Used Permissions
     #
-    # * show_category_group
-    # * edit_category_group
-    # * new_category_group
-    # * delete_category_group
+    # * show\_category\_group
+    # * edit\_category\_group
+    # * new\_category\_group
+    # * delete\_category\_group
     #
     # @since  0.1
     # @map    /admin/category-groups

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

@@ -64,7 +64,7 @@ module Ramaze
       # category group ID.
       #
       # @since  0.2.8
-      # @param  [Fixnum[ category_id The ID of the category, this one will be
+      # @param  [Fixnum] category_id The ID of the category, this one will be
       #  excluded from the hash.
       # @param  [Fixnum] category_group_id The ID of a category group for which
       #  to retrieve all the possible parent items.
@@ -87,7 +87,7 @@ module Ramaze
       # Redirects the user to the category groups overview and shows a message
       # about an invalid group being specified.
       #
-      # @since 03-04-2012
+      # @since 2012-04-03
       #
       def redirect_invalid_group
         message(:error, lang('category_groups.errors.invalid_group'))
@@ -99,7 +99,7 @@ module Ramaze
       # and shows a message informing the user that the specified category was
       # invalid.
       #
-      # @since 03-04-2012
+      # @since 2012-04-03
       # @param [Fixnum] category_group_id The ID of the category group that the
       #  category belongs to.
       #

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

@@ -30,12 +30,12 @@ module Categories
     #     end
     #
     # @since 0.1
-    # @event before_new_category
-    # @event after_new_category
-    # @event before_edit_category
-    # @event after_edit_category
-    # @event before_delete_category
-    # @event after_delete_category
+    # @event before\_new\_category
+    # @event after\_new\_category
+    # @event before\_edit\_category
+    # @event after\_edit\_category
+    # @event before\_delete\_category
+    # @event after\_delete\_category
     #
     class Category < Sequel::Model
       include Zen::Model::Helper
@@ -43,7 +43,7 @@ module Categories
       ##
       # Array containing the column names that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [:parent_id, :name, :description, :slug, :category_group_id]
 
@@ -63,7 +63,7 @@ module Categories
       ##
       # Searches for a set of category groups using the specified search query.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -85,7 +85,7 @@ module Categories
       ##
       # Hook that is executed before creating or saving an object.
       #
-      # @since 03-01-2012
+      # @since 2012-01-03
       #
       def before_save
         sanitize_fields([:name, :slug, :description])

data/lib/zen/package/categories/lib/categories/model/category_group.rb

@@ -31,12 +31,12 @@ module Categories
     #     end
     #
     # @since 0.1
-    # @event before_new_category_group
-    # @event after_new_category_group
-    # @event before_edit_category_group
-    # @event after_edit_category_group
-    # @event before_delete_category_group
-    # @event after_delete_category_group
+    # @event before\_new\_category\_group
+    # @event after\_new\_category\_group
+    # @event before\_edit\_category\_group
+    # @event after\_edit\_category\_group
+    # @event before\_delete\_category\_group
+    # @event after\_delete\_category\_group
     #
     class CategoryGroup < Sequel::Model
       include Zen::Model::Helper
@@ -44,7 +44,7 @@ module Categories
       ##
       # Array containing the column names that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [:name, :description]
 
@@ -64,7 +64,7 @@ module Categories
       ##
       # Searches for a set of category groups using the specified search query.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -85,7 +85,7 @@ module Categories
       ##
       # Hook that is run before creating or saving an object.
       #
-      # @since 03-01-2012
+      # @since 2012-01-03
       #
       def before_save
         sanitize_fields([:name, :description])

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

@@ -117,10 +117,10 @@ module Comments
     #
     # This controller uses the following permissions:
     #
-    # * show_comment
-    # * edit_comment
-    # * new_comment
-    # * delete_comment
+    # * show\_comment
+    # * edit\_comment
+    # * new\_comment
+    # * delete\_comment
     #
     # @since  0.1
     # @map    /admin/comments

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

@@ -86,8 +86,8 @@ module Comments
     # two objects in the flash just like the backend controllers. These are the
     # following two items:
     #
-    # * **form_data**: an instance of {Comments::Model::Comment}
-    # * **form_errros**: a hash containing all errors, automatically used by
+    # * **form\_data**: an instance of {Comments::Model::Comment}
+    # * **form\_errros**: a hash containing all errors, automatically used by
     # ``Ramaze::Helper::BlueForm`` if the form was created using the
     # ``form_for()`` method.
     #

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

@@ -33,7 +33,7 @@ module Ramaze
       # 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
+      # @since 2012-04-05
       #
       def redirect_invalid_comment
         message(:error, lang('comments.errors.invalid_comment'))

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

@@ -32,12 +32,12 @@ module Comments
     #    end
     #
     # @since 0.1
-    # @event before_new_comment
-    # @event after_new_comment
-    # @event before_edit_comment
-    # @event after_edit_comment
-    # @event beore_delete_comment
-    # @event after_delete_comment
+    # @event before\_new\_comment
+    # @event after\_new\_comment
+    # @event before\_edit\_comment
+    # @event after\_edit\_comment
+    # @event beore\_delete\_comment
+    # @event after\_delete\_comment
     #
     class Comment < Sequel::Model
       include Zen::Model::Helper
@@ -45,7 +45,7 @@ module Comments
       ##
       # Array containing all the columns that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [
         :user_id, :name, :website, :email, :comment, :comment_status_id,
@@ -79,7 +79,7 @@ module Comments
       # * users.email
       # * users.name
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Array]
       #
@@ -155,7 +155,7 @@ module Comments
       # retrieved from the current comment row or from an associated user
       # object.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @return [String]
       #
       def user_name
@@ -169,7 +169,7 @@ module Comments
       ##
       # Gets the Email address of the author of the comment.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @return [String]
       #
       def user_email
@@ -184,7 +184,7 @@ module Comments
       # Gets the website of the author of the comment and optionally creates an
       # anchor tag for it.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [TrueClass|FalseClass] with_link When set to true the website
       #  will be returned as an ``<a>`` tag.
       # @param  [String] text The alternative text to use for the link tag.
@@ -213,7 +213,7 @@ module Comments
       # Returns the first 15 characters of a comment, optionally wrapped in a
       # link that points to the form to edit the comment.
       #
-      # @since  17-10-2011
+      # @since  2011-10-17
       # @param  [TrueClass|FalseClass] with_link When set to true the comment
       #  will be wrapped in an ``<a>`` tag.
       # @return [String]
@@ -249,7 +249,7 @@ module Comments
       ##
       # Returns the name of the comment status.
       #
-      # @since  17-10-2011
+      # @since  2011-10-17
       # @return [String]
       #
       def status_name

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

@@ -273,7 +273,7 @@ module CustomFields
       # ``flash[:form_data]`` it will be retrieved from this hash, otherwise the
       # default value is used.
       #
-      # @since  26-02-2012
+      # @since  2012-02-26
       # @param  [String] name The name of the field.
       # @param  [Mixed] value The default value.
       # @return [Mixed]

data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb

@@ -75,10 +75,10 @@ module CustomFields
     #
     # ## Used Permissions
     #
-    # * show_custom_field_group
-    # * new_custom_field_group
-    # * edit_custom_field_group
-    # * delete_custom_field_group
+    # * show\_custom\_field\_group
+    # * new\_custom\_field\_group
+    # * edit\_custom\_field\_group
+    # * delete\_custom\_field\_group
     #
     # @since  0.1
     # @map    /admin/custom-field-groups

data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_types.rb

@@ -99,10 +99,10 @@ module CustomFields
     #
     # ## Used Permissions
     #
-    # * show_custom_field_type
-    # * edit_custom_field_type
-    # * new_custom_field_type
-    # * delete_custom_field_type
+    # * show\_custom\_field\_type
+    # * edit\_custom\_field\_type
+    # * new\_custom\_field\_type
+    # * delete\_custom\_field\_type
     #
     # @since  0.2.8
     # @map    /admin/custom-field-types
@@ -165,7 +165,7 @@ module CustomFields
         )
 
         @custom_field_type    = validate_custom_field_type(id)
-        @custom_field_methods = Model::CustomFieldMethod.pk_hash(:name)
+        @custom_field_methods = Model::CustomFieldMethod.to_hash(:id, :name)
 
         @custom_field_type.set(flash[:form_data]) if flash[:form_data]
 
@@ -186,7 +186,7 @@ module CustomFields
           lang('custom_field_types.titles.new')
         )
 
-        @custom_field_methods = Model::CustomFieldMethod.pk_hash(:name)
+        @custom_field_methods = Model::CustomFieldMethod.to_hash(:id, :name)
         @custom_field_type    = Model::CustomFieldType.new
 
         @custom_field_type.set(flash[:form_data]) if flash[:form_data]

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

@@ -133,10 +133,10 @@ module CustomFields
     #
     # ## Used Permissions
     #
-    # * show_custom_field
-    # * new_custom_field
-    # * edit_custom_field
-    # * delete_custom_field
+    # * show\_custom\_field
+    # * new\_custom\_field
+    # * edit\_custom\_field
+    # * delete\_custom\_field
     #
     # @since  0.1
     # @map    /admin/custom-fields
@@ -197,7 +197,7 @@ module CustomFields
       ##
       # Show a form that lets the user edit an existing custom field group.
       #
-      # @param  [Fixnum] id The ID of the custom field
+      # @param  [Fixnum] custom_field_group_id The ID of the custom field
       #  group to which all fields belong.
       # @param  [Fixnum] id The ID of the custom field to retrieve so that we
       #  can edit it.

data/lib/zen/package/custom_fields/lib/custom_fields/helper/custom_field.rb

@@ -74,7 +74,7 @@ module Ramaze
       # Redirects the user back to the field groups overview and shows a message
       # informing the user that the group he/she tried to access was invalid.
       #
-      # @since 05-04-2012
+      # @since 2012-04-05
       #
       def redirect_invalid_field_group
         message(:error, lang('custom_field_groups.errors.invalid_group'))
@@ -85,7 +85,7 @@ module Ramaze
       # Redirects the user to the custom field types overview and informs
       # him/her that the type he/she tried to access was invalid.
       #
-      # @since 05-04-2012
+      # @since 2012-04-05
       #
       def redirect_invalid_field_type
         message(:error, lang('custom_field_types.errors.invalid_type'))
@@ -96,7 +96,7 @@ module Ramaze
       # Redirects the user to the overview of all custom fields of a given group
       # and informs the user that the field he/she tried to access is invalid.
       #
-      # @since 05-04-2012
+      # @since 2012-04-05
       # @param [Fixnum] custom_field_group_id The ID of the group to use for
       #  redirecting the user.
       #

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field.rb

@@ -5,12 +5,12 @@ module CustomFields
     # Model for managing retrieving custom fields.
     #
     # @since 0.1
-    # @event before_new_custom_field
-    # @event after_new_custom_field
-    # @event before_edit_custom_field
-    # @event after_edit_custom_field
-    # @event before_delete_custom_field
-    # @event after_delete_custom_field
+    # @event before\_new\_custom\_field
+    # @event after\_new\_custom\_field
+    # @event before\_edit\_custom\_field
+    # @event after\_edit\_custom\_field
+    # @event before\_delete\_custom\_field
+    # @event after\_delete\_custom\_field
     #
     class CustomField < Sequel::Model
       include Zen::Model::Helper
@@ -18,7 +18,7 @@ module CustomFields
       ##
       # Array containing all the columns the user can set.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [
         :name,
@@ -57,7 +57,7 @@ module CustomFields
       ##
       # Searches for a set of custom fields.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -96,7 +96,7 @@ module CustomFields
       ##
       # Hook that is executed before creating or saving an object.
       #
-      # @since 03-01-2012
+      # @since 2012-01-03
       #
       def before_save
         sanitize_fields([:name, :slug, :description, :format])