zen 0.4.2 → 0.4.3

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

@@ -5,12 +5,12 @@ module CustomFields
     # Model that represents a single custom field group.
     #
     # @since 0.1
-    # @event before_new_custom_field_group
-    # @event after_new_custom_field_group
-    # @event before_edit_custom_field_group
-    # @event after_edit_custom_field_group
-    # @event before_delete_custom_field_group
-    # @event after_delete_custom_field_group
+    # @event before\_new\_custom\_field\_group
+    # @event after\_new\_custom\_field\_group
+    # @event before\_edit\_custom\_field\_group
+    # @event after\_edit\_custom\_field\_group
+    # @event before\_delete\_custom\_field\_group
+    # @event after\_delete\_custom\_field\_group
     #
     class CustomFieldGroup < Sequel::Model
       include Zen::Model::Helper
@@ -18,7 +18,7 @@ module CustomFields
       ##
       # Array containing the columns that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [:name, :description]
 
@@ -41,7 +41,7 @@ module CustomFields
       ##
       # Searches for a set of custom field groups.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -62,7 +62,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, :description])

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

@@ -5,12 +5,12 @@ module CustomFields
     # Model for managing custom field types.
     #
     # @since 0.2.8
-    # @event before_new_custom_field_type
-    # @event after_new_custom_field_type
-    # @event before_edit_custom_field_type
-    # @event after_edit_custom_field_type
-    # @event before_delete_custom_field_type
-    # @event after_delete_custom_field_type
+    # @event before\_new\_custom\_field\_type
+    # @event after\_new\_custom\_field\_type
+    # @event before\_edit\_custom\_field\_type
+    # @event after\_edit\_custom\_field\_type
+    # @event before\_delete\_custom\_field\_type
+    # @event after\_delete\_custom\_field\_type
     #
     class CustomFieldType < Sequel::Model
       include Zen::Model::Helper
@@ -18,7 +18,7 @@ module CustomFields
       ##
       # Array containing all the columns that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [
         :name, :language_string, :html_class, :serialize, :allow_markup,
@@ -43,7 +43,7 @@ module CustomFields
       ##
       # Searches for a set of custom field types.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -87,7 +87,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, :language_string, :html_class])

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

@@ -7,16 +7,21 @@ module CustomFields
     # @since  0.1
     #
     class CustomFieldValue < Sequel::Model
-      many_to_one :custom_field , :class => 'CustomFields::Model::CustomField',
+      many_to_one :custom_field ,
+        :class => 'CustomFields::Model::CustomField',
         :eager => [:custom_field_type]
 
-      many_to_one :section_entry, :class => 'Sections::Model::SectionEntry'
+      many_to_one :section_entry,
+        :class => 'Sections::Model::SectionEntry'
+
+      many_to_one :revision,
+        :class => 'Sections::Model::Revision'
 
       ##
       # Sets the value and serializes it based on the field type.
       #
       # @since  0.2.8
-      # @param  [Mixed] value The value to store.
+      # @param  [Mixed] val The value to store.
       #
       def value=(val)
         val  = Zen::Security.sanitize(val)

data/lib/zen/package/custom_fields/migrations/1336171490_revisions.rb

@@ -0,0 +1,41 @@
+Sequel.migration do
+  up do
+    alter_table :custom_field_values do
+      add_foreign_key :revision_id, :revisions,
+        :on_update => :cascade,
+        :on_delete => :cascade,
+        :key       => :id
+    end
+
+    # Create a revision for each existing entry.
+    entries = Zen.database[:section_entries] \
+      .select(:id, :user_id) \
+      .order(:id.asc)
+
+    entries.each do |entry|
+      rev_id = Zen.database[:revisions].insert(
+        :created_at       => Time.now,
+        :user_id          => entry[:user_id],
+        :section_entry_id => entry[:id]
+      )
+
+      Zen.database[:section_entries] \
+        .filter(:id => entry[:id]) \
+        .update(:revision_id => rev_id)
+
+      Zen.database[:custom_field_values] \
+        .filter(:section_entry_id => entry[:id]) \
+        .update(:revision_id => rev_id)
+    end
+  end
+
+  down do
+    alter_table :custom_field_values do
+      if Zen.database.database_type.to_s.include?('mysql')
+        drop_constraint :custom_field_values_ibfk_3, :type => :foreign_key
+      end
+
+      drop_column :revision_id
+    end
+  end
+end

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

@@ -14,7 +14,7 @@
 # * {Dashboard::Widget}
 # * {Dashboard::WidgetError}
 #
-# @since 16-01-2012
+# @since 2012-01-16
 #
 module Dashboard
   module Controller
@@ -58,7 +58,7 @@ module Dashboard
     #   around the application.
     # * Recent Entries: a widget that displays the 10 most recent entries.
     #
-    # @since 08-01-2012
+    # @since 2012-01-08
     # @map   /admin
     #
     class Dashboard < Zen::Controller::AdminController
@@ -75,7 +75,7 @@ module Dashboard
       # Shows all the active widgets and allows the user to manage these widgets
       # or add new ones.
       #
-      # @since 08-01-2012
+      # @since 2012-01-08
       #
       def index; end
 
@@ -83,7 +83,7 @@ module Dashboard
       # Updates the sort order of all the widgets for the currently logged in
       # user.
       #
-      # @since 15-01-2012
+      # @since 2012-01-15
       #
       def widget_order
         ::Dashboard::Widget::REGISTERED.each do |name, widget|
@@ -105,7 +105,7 @@ module Dashboard
       ##
       # Enables or disables a widget for the currently logged in user.
       #
-      # @since 15-01-2012
+      # @since 2012-01-15
       #
       def widget_state
         widget  = request.POST['widget']
@@ -140,7 +140,7 @@ module Dashboard
       # Updates the amount of widget columns to use for the currently logged in
       # user.
       #
-      # @since 15-01-2012
+      # @since 2012-01-15
       #
       def widget_columns
         columns = request.POST['columns']

data/lib/zen/package/dashboard/lib/dashboard/model/widget.rb

@@ -3,7 +3,7 @@ module Dashboard
     ##
     # Model for the table that contains the active widgets for a user.
     #
-    # @since 12-01-2012
+    # @since 2012-01-12
     #
     class Widget < Sequel::Model
       many_to_one :users, :class => 'Users::Model::User'
@@ -12,7 +12,7 @@ module Dashboard
       # Returns an integer containing the order of the last widget. If no
       # widgets were found 0 is returned.
       #
-      # @since  15-01-2012
+      # @since  2012-01-15
       # @param  [Fixnum] user_id The ID of the user for which to retrieve the
       #  widget order.
       # @return [Fixnum]
@@ -34,7 +34,7 @@ module Dashboard
       ##
       # Validates the model instance before saving it in the database.
       #
-      # @since 13-01-2012
+      # @since 2012-01-13
       #
       def validate
         validates_presence([:name, :order, :user_id])

data/lib/zen/package/dashboard/lib/dashboard/widget.rb

@@ -36,7 +36,7 @@ module Dashboard
   #
   #     Dashboard::Widget[:example_widget] # => <Dashboard::Widget ...>
   #
-  # @since 08-01-2012
+  # @since 2012-01-08
   #
   class Widget
     include Zen::Validation
@@ -75,7 +75,7 @@ module Dashboard
       #       end
       #     end
       #
-      # @since 08-01-2012
+      # @since 2012-01-08
       #
       def add
         widget = self.new
@@ -92,7 +92,7 @@ module Dashboard
       # @example
       #  Dashboard::Widget[:recent_entries]
       #
-      # @since 08-01-2012
+      # @since 2012-01-08
       #
       def [](name)
         name = name.to_sym
@@ -108,7 +108,7 @@ module Dashboard
       # Generates the HTML for all active widgets and sorts them by the user's
       # sort order.
       #
-      # @since  14-01-2012
+      # @since  2012-01-14
       # @return [String]
       #
       def html
@@ -129,7 +129,7 @@ module Dashboard
       # Builds the HTML for the radio buttons that can be used to change the
       # amount of widget columns.
       #
-      # @since  15-01-2012
+      # @since  2012-01-15
       # @return [String]
       #
       def columns_html
@@ -160,7 +160,7 @@ module Dashboard
       # Generates a chunk of HTML that contains various checkboxes to toggle the
       # state of all widgets.
       #
-      # @since  14-01-2012
+      # @since  2012-01-14
       # @return [String]
       #
       def checkbox_html
@@ -196,7 +196,7 @@ module Dashboard
       ##
       # Returns the current user model.
       #
-      # @since  15-01-2012
+      # @since  2012-01-15
       # @return [Users::Model::User]
       def user
         return Ramaze::Current.action.node.request.env[
@@ -208,7 +208,7 @@ module Dashboard
     ##
     # Sets the name of the widget and converts it to a symbol.
     #
-    # @since 11-01-2012
+    # @since 2012-01-11
     # @param [#to_sym] name The name of the widget.
     #
     def name=(name)
@@ -220,7 +220,7 @@ module Dashboard
     # string the value of that string is returned, otherwise the raw title is
     # returned.
     #
-    # @since  11-01-2012
+    # @since  2012-01-11
     # @return [String]
     #
     def title
@@ -234,7 +234,7 @@ module Dashboard
     ##
     # Checks if the user is allowed to view the current widget.
     #
-    # @since  16-01-2012
+    # @since  2012-01-16
     # @return [TrueClass|Falseclass]
     #
     def allowed?
@@ -245,7 +245,7 @@ module Dashboard
     ##
     # Validates the instance of the widget.
     #
-    # @since 11-01-2012
+    # @since 2012-01-11
     #
     def validate
       validates_presence([:name, :title, :data])
@@ -269,7 +269,7 @@ module Dashboard
     #         </div>
     #     </section>
     #
-    # @since  12-01-2012
+    # @since  2012-01-12
     # @return [String]
     #
     def html

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

@@ -8,14 +8,14 @@
 #
 # This package does not provide any helpers or models.
 #
-# @since 18-11-2011
+# @since 2011-11-18
 #
 module Extensions
   module Controller
     ##
     # Controller that displays all the installed extensions.
     #
-    # @since 18-11-2011
+    # @since 2011-11-18
     # @map   /admin/extensions
     #
     class Extensions < Zen::Controller::AdminController
@@ -28,7 +28,7 @@ module Extensions
       # Shows an overview of all the installed themes, packages, added
       # languages, etc.
       #
-      # @since 18-11-2011
+      # @since 2011-11-18
       # @permission show_extension
       #
       def index

data/lib/zen/package/menus/lib/menus/controller/menu_items.rb

@@ -76,10 +76,10 @@ module Menus
     #
     # ## Used Permissions
     #
-    # * show_menu_item
-    # * new_menu_item
-    # * edit_menu_item
-    # * delete_menu_item
+    # * show\_menu\_item
+    # * new\_menu\_item
+    # * edit\_menu\_item
+    # * delete\_menu\_item
     #
     # @since  0.2a
     # @map    /admin/menu-items
@@ -223,7 +223,7 @@ module Menus
       ##
       # Updates the sort order and parent IDs for the given menu items.
       #
-      # @since      11-02-2012
+      # @since      2012-02-11
       # @permission edit_menu_item
       #
       def tree

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

@@ -96,10 +96,10 @@ module Menus
     #
     # ## Used Permissions
     #
-    # * show_menu
-    # * new_menu
-    # * edit_menu
-    # * delete_menu
+    # * show\_menu
+    # * new\_menu
+    # * edit\_menu
+    # * delete\_menu
     #
     # @since  0.2a
     # @map    /admin/menus

data/lib/zen/package/menus/lib/menus/helper/menu.rb

@@ -54,7 +54,7 @@ module Ramaze
       # Redirects the user to the menus overview and informs him/her that the
       # menu he/she tried to access is invalid.
       #
-      # @since 05-04-2012
+      # @since 2012-04-05
       #
       def redirect_invalid_menu
         message(:error, lang('menus.errors.invalid_menu'))
@@ -66,7 +66,7 @@ module Ramaze
       # menu and informs the user that the menu item he/she tried to access is
       # invalid.
       #
-      # @since 05-04-2012
+      # @since 2012-04-05
       # @param [Fixnum] menu_id The ID of the menu.
       #
       def redirect_invalid_menu_item(menu_id)
@@ -78,7 +78,7 @@ module Ramaze
       # Builds the menu item tree that can be used by the user to edit the sort
       # order, create the menu item tree and edit individual menu items.
       #
-      # @since  11-02-2012
+      # @since  2012-02-11
       # @param  [Array] tree The menu item tree to process. This array should be
       #  in the format as returned by {Menus::Model::Menu#menu_items_tree}.
       # @return [String]
@@ -106,7 +106,7 @@ module Ramaze
       # Builds the HTML for a single menu item and recursively calls itself for
       # any sub menu items.
       #
-      # @since 11-02-2012
+      # @since 2012-02-11
       # @param [Hash] item A single menu item to process.
       # @param [Ramaze::Gestalt] gestalt An instance of Ramaze::Gestalt to use
       #  for building the HTML.

data/lib/zen/package/menus/lib/menus/model/menu.rb

@@ -23,12 +23,12 @@ module Menus
     #  end
     #
     # @since 0.2a
-    # @event before_new_menu
-    # @event after_new_menu
-    # @event before_edit_menu
-    # @event after_edit_menu
-    # @event before_delete_menu
-    # @event after_delete_menu
+    # @event before\_new\_menu
+    # @event after\_new\_menu
+    # @event before\_edit\_menu
+    # @event after\_edit\_menu
+    # @event before\_delete\_menu
+    # @event after\_delete\_menu
     #
     class Menu < Sequel::Model
       include Zen::Model::Helper
@@ -36,7 +36,7 @@ module Menus
       ##
       # Array containing all the columns that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [:name, :slug, :description, :html_class, :html_id]
 
@@ -57,7 +57,7 @@ module Menus
       ##
       # Searches for a set of menus.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -99,7 +99,7 @@ module Menus
       #
       #  loop_nodes(Menus::Model::Menu[1].menu_items_tree)
       #
-      # @since  30-01-2012
+      # @since  2012-01-30
       # @param  [Symbol] order The sort order to apply to menu items, set to
       #  :asc by default.
       # @param  [Fixnum|NilClass] limit The maximum amount of menu items to
@@ -162,7 +162,7 @@ module Menus
       ##
       # 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, :html_class, :html_id])
@@ -176,7 +176,7 @@ module Menus
       # Sorts a set of sub nodes as returned by
       # {Menus::Model::Menu#menu_item_tree}.
       #
-      # @since  01-02-2012
+      # @since  2012-02-01
       # @param  [Array]  nodes An array of nodes to sort.
       # @param  [Symbol] order The sort order to apply.
       # @return [Array]