zen 0.1a → 0.2

data/lib/zen/{packages → package}/settings/migrations/1295597111_create_schema.rb

@@ -7,7 +7,7 @@ Sequel.migration do
       String :key      , :null => false, :unique => true
       String :group_key, :null => false
       String :default  , :text => true
-      Enum   :type     , :elements => ['textbox', 'textarea', 'radio', 'checkbox', 'select']
+      String :type     , :default => 'textbox' 
       String :value    , :text => true
     end
     
@@ -28,4 +28,4 @@ Sequel.migration do
     drop_table :settings
   end
 
-end
+end

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

@@ -0,0 +1,62 @@
+Sequel.migration do
+
+  up do
+    add_column(:settings, :language_key      , String) 
+    add_column(:settings, :language_group_key, String)
+
+    # Set the correct values for all rows
+    Zen::Database.handle[: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')
+      .update(
+        :language_key       => 'settings.labels.website_description',
+        :language_group_key => 'settings.tabs.general'
+      )
+
+    Zen::Database.handle[: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')
+      .update(
+        :language_key       => 'settings.labels.language',
+        :language_group_key => 'settings.tabs.general'
+      )
+
+    Zen::Database.handle[: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')
+      .update(
+        :language_key       => 'settings.labels.theme',
+        :language_group_key => 'settings.tabs.general'
+      )
+
+    Zen::Database.handle[: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')
+      .update(
+        :language_key       => 'settings.labels.defensio_key',
+        :language_group_key => 'settings.tabs.security'
+      )
+  end
+  
+  down do
+    drop_column(:settings, :language_key)
+    drop_column(:settings, :language_group_key)
+  end
+
+end

data/lib/zen/{packages → package}/users/lib/users.rb

@@ -13,6 +13,10 @@ require __DIR__('users/liquid/user')
 Liquid::Template.register_tag('users', Users::Liquid::Users)
 Liquid::Template.register_tag('user' , Users::Liquid::User)
 
+# The trait for the User helper has to be specified in the constructor as
+# our user model is loaded after this class is loaded (but before it's initialized)
+Zen::Controllers::BaseController.trait(:user_model => Users::Models::User)
+
 Zen::Package.add do |p|
   p.type        = 'extension'
   p.name        = 'Users'
@@ -28,8 +32,8 @@ Zen::Package.add do |p|
     :title    => "Users",
     :url      => "admin/users",
     :children => [
-      {:title => "User Groups" , :url => "admin/user_groups"},
-      {:title => "Access Rules", :url => "admin/access_rules"}
+      {:title => "User Groups" , :url => "admin/user-groups" },
+      {:title => "Access Rules", :url => "admin/access-rules"}
     ]
   }]
 end

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

@@ -0,0 +1,238 @@
+#:nodoc:
+module Users
+  #:nodoc:
+  module Controllers
+    ##
+    # 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
+    # * read
+    # * update
+    # * delete
+    #
+    # @author Yorick Peterse
+    # @since  0.1
+    #
+    class AccessRules < Zen::Controllers::AdminController
+      include ::Users::Models
+
+      map   '/admin/access-rules'
+      trait :extension_identifier => 'com.zen.users'
+      
+      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.
+      #
+      # This method loads the following language files:
+      #
+      # * access_rules
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      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
+        
+        require_js 'users/access_rules'
+
+        @rule_applies_hash = {
+          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.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def index
+        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
+      
+      ##
+      # Edit an existing access rule.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * update
+      #
+      # @author Yorick Peterse
+      # @param  [Integer] id The ID of the access rule to edit.
+      # @since  0.1
+      #
+      def edit(id)
+        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)), 
+          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.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * create§
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def new
+        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)), 
+          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'.
+      #
+      # This method requires the following permissions:
+      #
+      # * create
+      # * update
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def save
+        if !user_authorized?([:create, :update])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end
+        
+        post = request.params.dup
+
+        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']]
+          save_action = :save
+        else
+          @access_rule = AccessRule.new
+          save_action = :new
+        end
+        
+        flash_success = lang("access_rules.success.#{save_action}")
+        flash_error   = lang("access_rules.errors.#{save_action}")
+        
+        begin
+          @access_rule.update(post)
+          notification(:success, lang('access_rules.titles.index'), flash_success)
+        rescue
+          notification(:error, lang('access_rules.titles.index'), 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.
+      #
+      # This method requires the following permissions:
+      #
+      # * delete
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def delete
+        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')
+          )
+
+          redirect_referrer
+        end
+        
+        request.params['access_rule_ids'].each do |id|
+          @access_rule = AccessRule[id]
+          
+          begin
+            @access_rule.delete
+            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
+            )
+          end
+        end
+        
+        redirect_referrer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,217 @@
+#:nodoc:
+module Users
+  #:nodoc:
+  module Controllers
+    ##
+    # 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
+    #
+    class UserGroups < Zen::Controllers::AdminController
+      include ::Users::Models
+
+      map   '/admin/user-groups'
+      trait :extension_identifier => 'com.zen.users'
+      
+      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.
+      #
+      # This method loads the following language files:
+      #
+      # * user_groups
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      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
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def index
+        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.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * update
+      #
+      # @author Yorick Peterse
+      # @param  [Integer] id The ID of the user group to edit.
+      # @since  0.1
+      #
+      def edit(id)
+        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)), 
+          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.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * create
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def new
+        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)), 
+          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
+      # * read
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def save
+        if !user_authorized?([:create, :update])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end
+        
+        post = request.params.dup
+       
+        if post['id'] and !post['id'].empty?
+          @user_group = UserGroup[post['id']]
+          save_action = :save
+        else
+          @user_group = UserGroup.new
+          save_action = :new
+        end
+        
+        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)
+          
+          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.
+      #
+      # This method requires the following permissions:
+      #
+      # * delete
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      #
+      def delete
+        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')
+          )
+
+          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
+            )
+          end
+        end
+        
+        redirect_referrer
+      end
+    end
+  end
+end