zen 0.2.5 → 0.2.6

data/lib/zen/package/settings/migrations/1299538742_add_language_key.rb

@@ -5,49 +5,49 @@ Sequel.migration do
     add_column(:settings, :language_group_key, String)
 
     # Set the correct values for all rows
-    Zen::Database.handle[:settings].filter(:key => 'website_name')
+    Zen.database[:settings].filter(:key => 'website_name') \
       .update(
         :language_key       => 'settings.labels.website_name',
         :language_group_key => 'settings.tabs.general'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'website_description')
+    Zen.database[:settings].filter(:key => 'website_description') \
       .update(
         :language_key       => 'settings.labels.website_description',
         :language_group_key => 'settings.tabs.general'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'website_enabled')
+    Zen.database[:settings].filter(:key => 'website_enabled') \
       .update(
         :language_key       => 'settings.labels.website_enabled',
         :language_group_key => 'settings.tabs.general'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'language')
+    Zen.database[:settings].filter(:key => 'language') \
       .update(
         :language_key       => 'settings.labels.language',
         :language_group_key => 'settings.tabs.general'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'default_section')
+    Zen.database[:settings].filter(:key => 'default_section') \
       .update(
         :language_key       => 'settings.labels.default_section',
         :language_group_key => 'settings.tabs.general'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'theme')
+    Zen.database[:settings].filter(:key => 'theme') \
       .update(
         :language_key       => 'settings.labels.theme',
         :language_group_key => 'settings.tabs.general'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'enable_antispam')
+    Zen.database[:settings].filter(:key => 'enable_antispam') \
       .update(
         :language_key       => 'settings.labels.enable_antispam',
         :language_group_key => 'settings.tabs.security'
       )
 
-    Zen::Database.handle[:settings].filter(:key => 'defensio_key')
+    Zen.database[:settings].filter(:key => 'defensio_key') \
       .update(
         :language_key       => 'settings.labels.defensio_key',
         :language_group_key => 'settings.tabs.security'

data/lib/zen/package/settings/migrations/1303196915_settings_plugin.rb

@@ -7,15 +7,12 @@ Sequel.migration do
     drop_column(:settings, :language_key)
     drop_column(:settings, :language_group_key)
 
-    # Ensure the identifiers are unique
-    #add_index(:settings, :key, :unique => true)
-
     # Update the settings
-    Zen::Database.handle[:settings].all.each do |row|
+    Zen.database[:settings].all.each do |row|
       name  = row[:name].split('.').last
       group = row[:group].split('.').last
 
-      Zen::Database.handle[:settings].filter(:id => row[:id])
+      Zen.database[:settings].filter(:id => row[:id]) \
         .update(:name => name, :group => group)
     end
   end

data/lib/zen/package/users/lib/users/controller/access_rules.rb

@@ -3,9 +3,9 @@ module Users
   #:nodoc:
   module Controller
     ##
-    # Controller for managing access rules. Each access rule can be used
-    # to specify whether or not a user can edit or create something.
-    # 
+    # Controller for managing access rules. Each access rule can be used to specify
+    # whether or not a user can edit or create something.
+    #
     # The following permissions are available:
     #
     # * create
@@ -21,14 +21,14 @@ module Users
 
       map('/admin/access-rules')
 
-      javascript(['users/access_rules'])
-      
+      javascript ['users/access_rules']
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Load our language packs, set the form URLs and define our page title.
       #
@@ -41,23 +41,23 @@ module Users
       #
       def initialize
         super
-        
+
         @form_save_url   = AccessRules.r(:save)
         @form_delete_url = AccessRules.r(:delete)
         @rules_lang      = Zen::Language.load('access_rules')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
           @page_title = lang("access_rules.titles.#{method}") rescue nil
         end
-        
+
         @rule_applies_hash = {
-          lang('access_rules.labels.user')       => 'div_user_id', 
+          lang('access_rules.labels.user')       => 'div_user_id',
           lang('access_rules.labels.user_group') => 'div_user_group_id'
         }
       end
-      
+
       ##
       # Show an overview of all access rules and allow the current user
       # to manage these groups.
@@ -73,14 +73,14 @@ module Users
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('access_rules.titles.index'))
-        
+
         @access_rules = AccessRule.all
       end
-      
+
       ##
-      # Hook that's executed before the edit and new method. This hook is used to 
+      # Hook that's executed before the edit and new method. This hook is used to
       # pre-process some data used in the form.
       #
       # @author Yorick Peterse
@@ -95,7 +95,7 @@ module Users
         ::Users::Model::User.select(:id, :name).each do |user|
           @form_users[user.id.to_s] = user.name
         end
-        
+
         # Build the list of available packages and controllers
         ::Zen::Package::Registered.each do |name, pkg|
           name                      = name.to_s
@@ -109,7 +109,7 @@ module Users
 
         ::Users::Model::UserGroup.select(:id, :name).each do |group|
           @form_groups[group.id.to_s] = group.name
-        end 
+        end
       end
 
       ##
@@ -128,19 +128,19 @@ module Users
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('access_rules.titles.index'), AccessRules.r(:index)), 
+          anchor_to(lang('access_rules.titles.index'), AccessRules.r(:index)),
           lang('access_rules.titles.edit')
         )
-        
+
         if flash[:form_data]
           @access_rule = flash[:form_data]
         else
           @access_rule = AccessRule[id]
         end
       end
-      
+
       ##
       # Create a new access rule.
       #
@@ -156,15 +156,15 @@ module Users
         if !user_authorized?([:read, :create])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('access_rules.titles.index'), AccessRules.r(:index)), 
+          anchor_to(lang('access_rules.titles.index'), AccessRules.r(:index)),
           lang('access_rules.titles.new')
         )
-        
+
         @access_rule = AccessRule.new
       end
-      
+
       ##
       # Saves or creates a new access rule based on the POST data and a field named 'id'.
       #
@@ -180,16 +180,17 @@ module Users
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        post = request.params.dup
+
+        post = request.subset(
+          :id, :package, :read_access, :create_access, :update_access, :delete_access,
+          :user_id, :user_group_id, :controller, :rule_applies
+        )
 
         if post['rule_applies'] === 'div_user_id'
           post['user_group_id'] = nil
         else
           post['user_id'] = nil
         end
-        
-        post.delete('rule_applies')
 
         if post['id'] and !post['id'].empty?
           @access_rule = AccessRule[post['id']]
@@ -198,30 +199,34 @@ module Users
           @access_rule = AccessRule.new
           save_action = :new
         end
-        
+
+        post.delete('rule_applies')
+        post.delete('id')
+
         flash_success = lang("access_rules.success.#{save_action}")
         flash_error   = lang("access_rules.errors.#{save_action}")
-        
+
         begin
           @access_rule.update(post)
 
           # Flush the existing rules from the session
           session.delete(:access_rules)
-          notification(:success, lang('access_rules.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('access_rules.titles.index'), flash_error)
-          
+          message(:success, flash_success)
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
+
           flash[:form_data]   = @access_rule
           flash[:form_errors] = @access_rule.errors
         end
-        
+
         if @access_rule.id
           redirect(AccessRules.r(:edit, @access_rule.id))
         else
           redirect_referrer
         end
       end
-      
+
       ##
       # Delete all specified access rules.
       #
@@ -236,39 +241,27 @@ module Users
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        if !request.params['access_rule_ids'] or request.params['access_rule_ids'].empty?
-          notification(
-            :error, 
-            lang('access_rules.titles.index'), 
-            lang('access_rules.errors.no_delete')
-          )
 
+        if !request.params['access_rule_ids'] or request.params['access_rule_ids'].empty?
+          message(:error, lang('access_rules.errors.no_delete'))
           redirect_referrer
         end
-        
+
         request.params['access_rule_ids'].each do |id|
           @access_rule = AccessRule[id]
-          
+
           begin
             @access_rule.delete
             session.delete(:access_rules)
-            notification(
-              :success, 
-              lang('access_rules.titles.index'), 
-              lang('access_rules.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('access_rules.titles.index'), 
-              lang('access_rules.errors.delete') % id
-            )
+            message(:success, lang('access_rules.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('access_rules.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end
-  end
-end
+    end # AccessRules
+  end # Controller
+end # Users

data/lib/zen/package/users/lib/users/controller/user_groups.rb

@@ -3,11 +3,10 @@ module Users
   #:nodoc:
   module Controller
     ##
-    # Controller for managing all user groups. It's not
-    # required to add a user to a group but it can certainly
-    # make it easier when adding custom permissions or
-    # granting a user full access to the backend.
-    # 
+    # Controller for managing all user groups. It's not required to add a user to a group
+    # but it can certainly make it easier when adding custom permissions or granting a
+    # user full access to the backend.
+    #
     # @author Yorick Peterse
     # @since  0.1
     #
@@ -15,13 +14,13 @@ module Users
       include ::Users::Model
 
       map('/admin/user-groups')
-      
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Load our language packs, set the form URLs and define our page title.
       #
@@ -34,19 +33,19 @@ module Users
       #
       def initialize
         super
-        
+
         @form_save_url   = UserGroups.r(:save)
         @form_delete_url = UserGroups.r(:delete)
 
         Zen::Language.load('user_groups')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
           @page_title = lang("user_groups.titles.#{method}") rescue nil
         end
       end
-      
+
       ##
       # Show an overview of all user groups and allow the current user
       # to manage these groups
@@ -62,12 +61,12 @@ module Users
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('user_groups.titles.index'))
-        
+
         @user_groups = UserGroup.all
       end
-      
+
       ##
       # Edit an existing user group.
       #
@@ -84,19 +83,19 @@ module Users
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('user_groups.titles.index'), UserGroups.r(:index)), 
+          anchor_to(lang('user_groups.titles.index'), UserGroups.r(:index)),
           lang('user_groups.titles.edit')
         )
-        
+
         if flash[:form_data]
           @user_group = flash[:form_data]
         else
           @user_group = UserGroup[id.to_i]
         end
       end
-      
+
       ##
       # Create a new user group.
       #
@@ -112,18 +111,18 @@ module Users
         if !user_authorized?([:read, :create])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('user_groups.titles.index'), UserGroups.r(:index)), 
+          anchor_to(lang('user_groups.titles.index'), UserGroups.r(:index)),
           lang('user_groups.titles.new')
         )
-        
+
         @user_group = UserGroup.new
       end
-      
+
       ##
       # Saves or creates a new user group based on the POST data and a field named 'id'.
-      # 
+      #
       # This method requires the following permissions:
       #
       # * create
@@ -136,37 +135,42 @@ module Users
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        post = request.params.dup
-       
+
+        post = request.subset(:id, :name, :slug, :description, :super_group)
+
         if post['id'] and !post['id'].empty?
           @user_group = UserGroup[post['id']]
           save_action = :save
         else
           @user_group = UserGroup.new
           save_action = :new
+
+          post.delete('slug') if post['slug'].empty?
         end
-        
+
+        post.delete('id')
+
         flash_success = lang("user_groups.success.#{save_action}")
         flash_error   = lang("user_groups.errors.#{save_action}")
-        
+
         begin
           @user_group.update(post)
-          notification(:success, lang('user_groups.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('user_groups.titles.index'), flash_error)
-          
+          message(:success, flash_success)
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
+
           flash[:form_data]   = @user_group
           flash[:form_errors] = @user_group.errors
         end
-        
+
         if @user_group.id
           redirect(UserGroups.r(:edit, @user_group.id))
         else
           redirect_referrer
         end
       end
-      
+
       ##
       # Delete all specified user groups.
       #
@@ -181,36 +185,24 @@ module Users
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        if !request.params['user_group_ids'] or request.params['user_group_ids'].empty?
-          notification(
-            :error, 
-            lang('user_groups.titles.index'), 
-            lang('user_groups.errors.no_delete')
-          )
 
+        if !request.params['user_group_ids'] or request.params['user_group_ids'].empty?
+          message(:error, lang('user_groups.errors.no_delete'))
           redirect_referrer
         end
-        
+
         request.params['user_group_ids'].each do |id|
           begin
-            UserGroup[id.to_i].destroy
-            notification(
-              :success, 
-              lang('user_groups.titles.index'), 
-              lang('user_groups.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('user_groups.titles.index'), 
-              lang('user_groups.errors.delete') % id
-            )
+            UserGroup[id].destroy
+            message(:success,  lang('user_groups.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('user_groups.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end
-  end
-end
+    end # UserGroups
+  end # Controller
+end # Users