zen 0.2.7 → 0.2.8

data/lib/zen/package/custom_fields/migrations/1311694920_rename_css_class.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    rename_column(:custom_field_types, :css_class, :html_class)
+  end
+
+  # Reverts the changes made in the up() block.
+  down do
+    rename_column(:custom_field_types, :html_class, :css_class)
+  end
+end

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

@@ -11,8 +11,8 @@ module Menus
     class MenuItems < ::Zen::Controller::AdminController
       include ::Menus::Model
 
-      map('/admin/menu-items')
-      helper(:menu_item)
+      map '/admin/menu-items'
+      helper :menu
 
       before_all do
         csrf_protection(:save, :delete) do
@@ -34,9 +34,6 @@ module Menus
       def initialize
         super
 
-        @form_save_url   = MenuItems.r(:save)
-        @form_delete_url = MenuItems.r(:delete)
-
         Zen::Language.load('menu_items')
         Zen::Language.load('menus')
 
@@ -59,19 +56,18 @@ module Menus
       # @param  [Integer] menu_id The ID of the current navigation menu.
       #
       def index(menu_id)
-        if !user_authorized?([:read])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read)
 
-        validate_menu(menu_id)
+        menu = validate_menu(menu_id)
 
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
+          Menus.a(lang('menus.titles.index'), :index),
           lang('menu_items.titles.index')
         )
 
         @menu_id    = menu_id
-        @menu_items = Menu[menu_id.to_i].menu_items
+        @menu_items = MenuItem.filter(:menu_id => menu_id)
+        @menu_items = paginate(@menu_items)
       end
 
       ##
@@ -88,15 +84,13 @@ module Menus
       # @param  [Integer] id The ID of the menu item to edit.
       #
       def edit(menu_id, id)
-        if !user_authorized?([:read, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read, :update)
 
         validate_menu(menu_id)
 
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
-          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)),
+          Menus.a(lang('menus.titles.index'), :index),
+          MenuItems.a(lang('menu_items.titles.index'), :index, menu_id),
           lang('menu_items.titles.edit')
         )
 
@@ -105,8 +99,10 @@ module Menus
         if flash[:form_data]
           @menu_item = flash[:form_data]
         else
-          @menu_item = MenuItem[id]
+          @menu_item = validate_menu_item(id, menu_id)
         end
+
+        render_view(:form)
       end
 
       ##
@@ -122,24 +118,25 @@ module Menus
       # @param  [Integer] menu_id  The ID of the current navigation menu.
       #
       def new(menu_id)
-        if !user_authorized?([:create, :read])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:create, :read)
 
         validate_menu(menu_id)
 
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
-          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)),
+          Menus.a(lang('menus.titles.index'), :index),
+          MenuItems.a(lang('menu_items.titles.index'), :index, menu_id),
           lang('menu_items.titles.new')
         )
 
         @menu_id   = menu_id
         @menu_item = MenuItem.new
+
+        render_view(:form)
       end
 
       ##
-      # Saves an existing menu iten or creates a new one using the supplied POST data.
+      # Saves an existing menu iten or creates a new one using the supplied
+      # POST data.
       #
       # This method requires the following permissions:
       #
@@ -150,24 +147,31 @@ module Menus
       # @since  0.2a
       #
       def save
-        if !user_authorized?([:create, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
-
         post = request.subset(
-          :id, :parent_id, :name, :url, :order, :css_class, :css_id, :menu_id
+          :id,
+          :parent_id,
+          :name,
+          :url,
+          :sort_order,
+          :html_class,
+          :html_id,
+          :menu_id
         )
 
         if post['parent_id'].empty? or post['parent_id'] === post['id']
           post['parent_id'] = nil
         end
 
-        # Determine if we're saving changes made to an existing menu item or if we're
-        # going to create a new one.
-        if !post['id'].empty?
-          @menu_item  = MenuItem[post['id']]
+        # Determine if we're saving changes made to an existing menu item or
+        # if we're going to create a new one.
+        if post.key?('id') and !post['id'].empty?
+          require_permissions(:update)
+
+          @menu_item  = validate_menu_item(post['id'], post['menu_id'])
           save_action = :save
         else
+          require_permissions(:create)
+
           @menu_item  = MenuItem.new
           save_action = :new
         end
@@ -188,6 +192,8 @@ module Menus
 
           flash[:form_data]   = @menu_item
           flash[:form_errors] = @menu_item.errors
+
+          redirect_referrer
         end
 
         if @menu_item.id
@@ -207,9 +213,7 @@ module Menus
       # @since  0.2a
       #
       def delete
-        if !user_authorized?([:delete])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:delete)
 
         post = request.subset(:menu_item_ids)
 
@@ -224,6 +228,7 @@ module Menus
           rescue => e
             Ramaze::Log.error(e.inspect)
             message(:error, lang('menu_items.errors.delete') % id)
+
             redirect_referrer
           end
         end

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

@@ -3,8 +3,8 @@ module Menus
   #:nodoc:
   module Controller
     ##
-    # Controller for managing menu groups. Individual navigation items are managed using
-    # the menu items controller, simply named "menu_items".
+    # Controller for managing menu groups. Individual navigation items are
+    # managed using the menu items controller, simply named "menu_items".
     #
     # @author Yorick Peterse
     # @since  0.2a
@@ -12,7 +12,8 @@ module Menus
     class Menus < Zen::Controller::AdminController
       include ::Menus::Model
 
-      map('/admin/menus')
+      map '/admin/menus'
+      helper :menu
 
       before_all do
         csrf_protection(:save, :delete) do
@@ -33,9 +34,6 @@ module Menus
       def initialize
         super
 
-        @form_save_url   = Menus.r(:save)
-        @form_delete_url = Menus.r(:delete)
-
         Zen::Language.load('menus')
 
         # Set the page title
@@ -57,21 +55,17 @@ module Menus
       # @since  0.2a
       #
       def index
-        if !user_authorized?([:read])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read)
 
-        # Set our breadcrumbs
         set_breadcrumbs(lang('menus.titles.index'))
 
-        # Get all menus
-        @menus = Menu.all
+        @menus = paginate(Menu)
       end
 
       ##
-      # Show a form that allows the user to edit the details (such as the name and slug)
-      # of a menu group. This method can not be used to manage all menu items for this
-      # group.
+      # Show a form that allows the user to edit the details (such as the name
+      # and slug) of a menu group. This method can not be used to manage all
+      # menu items for this group.
       #
       # This method requires the following permissions:
       #
@@ -82,25 +76,26 @@ module Menus
       # @since  0.2a
       #
       def edit(id)
-        if !user_authorized?([:read, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read, :update)
 
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
+          Menus.a(lang('menus.titles.index'), :index),
           @page_title
         )
 
         if flash[:form_data]
           @menu = flash[:form_data]
         else
-          @menu = Menu[id]
+          @menu = validate_menu(id)
         end
+
+        render_view(:form)
       end
 
       ##
-      # Show a form that can be used to create a new menu group. Once a menu group has
-      # been created users can start adding navigation items to the group.
+      # Show a form that can be used to create a new menu group. Once a menu
+      # group has been created users can start adding navigation items to the
+      # group.
       #
       # This method requires the following permissions:
       #
@@ -111,24 +106,24 @@ module Menus
       # @since  0.2a
       #
       def new
-        if !user_authorized?([:create, :read])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:create, :read)
 
-        # Breadcrumbs, om nom nom!
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
+          Menus.a(lang('menus.titles.index'), :index),
           @page_title
         )
 
         @menu = Menu.new
+
+        render_view(:form)
       end
 
       ##
-      # Saves the changes made to an existing menu group or creates a new group using the
-      # supplied POST data. In order to detect this forms that contain data of an existing
-      # group should have a hidden field named "id", the value of this field is the primary
-      # value of the menu group of which the changes should be saved.
+      # Saves the changes made to an existing menu group or creates a new group
+      # using the supplied POST data. In order to detect this forms that contain
+      # data of an existing group should have a hidden field named "id", the
+      # value of this field is the primary value of the menu group of which the
+      # changes should be saved.
       #
       # This method requires the following permissions:
       #
@@ -139,17 +134,24 @@ module Menus
       # @since  0.2a
       #
       def save
-        if !user_authorized?([:create, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
-
-        post = request.subset(:name, :slug, :description, :css_class, :css_id, :id)
+        post = request.subset(
+          :name,
+          :slug,
+          :description,
+          :html_class,
+          :html_id,
+          :id
+        )
 
         # Determine if we're creating a new group or modifying an existing one.
-        if !post['id'].empty?
-          @menu       = Menu[post['id']]
+        if post.key?('id') and !post['id'].empty?
+          require_permissions(:update)
+
+          @menu       = validate_menu(post['id'])
           save_action = :save
         else
+          require_permissions(:create)
+
           @menu       = Menu.new
           save_action = :new
 
@@ -172,6 +174,8 @@ module Menus
 
           flash[:form_data]   = @menu
           flash[:form_errors] = @menu.errors
+
+          redirect_referrer
         end
 
         # Redrect the user to the proper page
@@ -183,8 +187,9 @@ module Menus
       end
 
       ##
-      # Deletes a number of navigation menus based on the supplied primary values.
-      # These primary values should be stored in a POST array called "menu_ids".
+      # Deletes a number of navigation menus based on the supplied primary
+      # values. These primary values should be stored in a POST array called
+      # "menu_ids".
       #
       # This method requires the following permissions:
       #
@@ -194,9 +199,7 @@ module Menus
       # @since  0.2a
       #
       def delete
-        if !user_authorized?([:delete])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:delete)
 
         post = request.params.dup
 
@@ -213,6 +216,7 @@ module Menus
           rescue => e
             Ramaze::Log.error(e.inspect)
             message(:error, lang('menus.errors.delete') % id)
+
             redirect_referrer
           end
         end

data/lib/zen/package/menus/lib/menus/helper/{menu_item.rb → menu.rb}

@@ -3,31 +3,58 @@ module Ramaze
   #:nodoc:
   module Helper
     ##
-    # Small helper for the Menus package mainly used to reduce the amount of code
-    # in controllers.
+    # Small helper for the Menus package mainly used to reduce the amount of
+    # code in controllers.
     #
     # @author Yorick Peterse
     # @since  0.2a
     #
-    module MenuItem
+    module Menu
       ##
-      # Checks if there is a menu for the given ID. If this isn't the case the user
-      # will be redirected back to the index page of the menus controller.
+      # Checks if there is a menu for the given ID. If this isn't the case the
+      # user will be redirected back to the index page of the menus controller.
       #
       # @author Yorick Peterse
       # @since  0.2a
-      # @param  [Integer] menu_id The ID of the menu to validate.
+      # @param  [Fixnum] menu_id The ID of the menu to validate.
+      # @return [Menus::Model::Menu] The menu that was specified in case it's
+      # valid.
       #
       def validate_menu(menu_id)
-        if !menu_id or ::Menus::Model::Menu[menu_id].nil?
-          message(:error, @menu_items_lang.errors[:invalid_menu])
+        menu = ::Menus::Model::Menu[menu_id]
+
+        if menu.nil?
+          message(:error, lang('menus.errors.invalid_menu'))
           redirect(::Menus::Controller::Menus.r(:index))
+        else
+          return menu
+        end
+      end
+
+      ##
+      # Validates a menu item and returns it if it's valid.
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      # @param  [Fixnum] menu_item_id The ID of the menu item to validate.
+      # @param  [Fixnum] menu_id The ID of the menu the item belongs to, used
+      # when redirecting the user.
+      # @return [Menus::Model::MenuItem]
+      #
+      def validate_menu_item(menu_item_id, menu_id)
+        menu_item = ::Menus::Model::MenuItem[menu_item_id]
+
+        if menu_item.nil?
+          message(:error, lang('menu_items.errors.invalid_item'))
+          redirect(::Menus::Controller::MenuItems.r(:index, menu_id))
+        else
+          return menu_item
         end
       end
 
       ##
-      # Builds a hierarchy of navigation items and all their sub items. The generated
-      # structure looks like the following:
+      # Builds a hierarchy of navigation items and all their sub items. The
+      # generated structure looks like the following:
       #
       #     Root
       #      |
@@ -36,15 +63,15 @@ module Ramaze
       #      | |_ Sub sub
       #      |
       #      |_ Sub 1
-      # 
+      #
       # @author Yorick Peterse
       # @since  0.2a
-      # @param  [Integer] menu_id The ID of the current menu group.
+      # @param  [Fixnum] menu_id The ID of the current menu group.
       # @return [Hash]
       #
       def menu_item_tree(menu_id)
         menu_items = ::Menus::Model::MenuItem.filter(
-          :menu_id   => menu_id, 
+          :menu_id   => menu_id,
           :parent_id => nil
         )
 
@@ -54,7 +81,7 @@ module Ramaze
           @menu_items_hash[item.id] = item.name
 
           item.descendants.each do |i|
-            self.descendant_items(i, 2)
+            descendant_items(i, 2)
           end
         end
 
@@ -67,7 +94,7 @@ module Ramaze
       # @author Yorick Peterse
       # @since  0.2a
       # @param  [Menus::Model::MenuItem] item A MenuItem instance
-      # @param  [Integer] spaces The amount of unbreakable spaces to use.
+      # @param  [Fixnum] spaces The amount of unbreakable spaces to use.
       #
       def descendant_items(item, spaces)
         return if @menu_items_hash.key?(item.id)