zen 0.2.4.1 → 0.2.5

data/lib/zen/package/settings/migrations/1295597111_create_schema.rb

@@ -10,18 +10,6 @@ Sequel.migration do
       String :type     , :default => 'textbox' 
       String :value    , :text => true
     end
-    
-    # Insert our default settings
-    Zen::Database.handle[:settings].insert_multiple([
-      {:key => 'website_name'       , :group_key => 'general' , :default => 'Zen', :type => 'textbox'},
-      {:key => 'website_description', :group_key => 'general' ,                    :type => 'textarea'},
-      {:key => 'website_enabled'    , :group_key => 'general' , :default => '1',   :type => 'radio'},
-      {:key => 'language'           , :group_key => 'general' , :default => 'en',  :type => 'select'},
-      {:key => 'default_section'    , :group_key => 'general' ,                    :type => 'select'},
-      {:key => 'theme'              , :group_key => 'general' ,                    :type => 'select'},
-      {:key => 'enable_antispam'    , :group_key => 'security', :default => true,  :type => 'radio'},
-      {:key => 'defensio_key'       , :group_key => 'security',                    :type => 'textbox'}
-    ])
   end
   
   down do

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

@@ -0,0 +1,31 @@
+Sequel.migration do
+
+  up do
+    rename_column(:settings, :key, :name, :unique => true)
+    rename_column(:settings, :group_key, :group)
+
+    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|
+      name  = row[:name].split('.').last
+      group = row[:group].split('.').last
+
+      Zen::Database.handle[:settings].filter(:id => row[:id])
+        .update(:name => name, :group => group)
+    end
+  end
+  
+  down do
+    rename_column(:settings, :name , :key)
+    rename_column(:settings, :group, :group_key)
+
+    add_column(:settings, :language_key      , String)
+    add_column(:settings, :language_group_key, String)
+  end
+
+end

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

@@ -1,38 +1,41 @@
-
 require __DIR__('users/model/user')
 require __DIR__('users/model/user_group')
 require __DIR__('users/model/access_rule')
-
 require __DIR__('users/controller/users')
 require __DIR__('users/controller/user_groups')
 require __DIR__('users/controller/access_rules')
 
-require __DIR__('users/liquid/users')
-require __DIR__('users/liquid/user')
-
-Liquid::Template.register_tag('users', Users::Liquid::Users)
-Liquid::Template.register_tag('user' , Users::Liquid::User)
+Zen::Language.options.paths.push(__DIR__('users'))
+Zen::Language.load('users')
+Zen::Language.load('user_groups')
+Zen::Language.load('access_rules')
 
 # 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::Controller::BaseController.trait(:user_model => Users::Model::User)
 
 Zen::Package.add do |p|
-  p.name          = 'Users'
+  p.name          = 'users'
   p.author        = 'Yorick Peterse'
   p.url           = 'http://yorickpeterse.com/'
-  p.about         = "Module for managing users along with handling authentication and authorization."
+  p.about         = "Module for managing users along with handling authentication and 
+authorization."
   
-  p.identifier    = 'com.zen.users'
   p.directory     = __DIR__('users')
   p.migration_dir = __DIR__('../migrations')
   
   p.menu = [{
-    :title    => "Users",
-    :url      => "admin/users",
+    :title    => lang('users.titles.index'),
+    :url      => 'admin/users',
     :children => [
-      {:title => "User Groups" , :url => "admin/user-groups" },
-      {:title => "Access Rules", :url => "admin/access-rules"}
+      {:title => lang('user_groups.titles.index') , :url => 'admin/user-groups' },
+      {:title => lang('access_rules.titles.index'), :url => 'admin/access-rules'}
     ]
   }]
+
+  p.controllers = {
+    lang('users.titles.index')        => Users::Controller::Users, 
+    lang('user_groups.titles.index')  => Users::Controller::UserGroups, 
+    lang('access_rules.titles.index') => Users::Controller::AccessRules
+  }
 end

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

@@ -1,7 +1,7 @@
 #:nodoc:
 module Users
   #:nodoc:
-  module Controllers
+  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.
@@ -16,11 +16,12 @@ module Users
     # @author Yorick Peterse
     # @since  0.1
     #
-    class AccessRules < Zen::Controllers::AdminController
-      include ::Users::Models
+    class AccessRules < Zen::Controller::AdminController
+      include ::Users::Model
 
-      map   '/admin/access-rules'
-      trait :extension_identifier => 'com.zen.users'
+      map('/admin/access-rules')
+
+      javascript(['users/access_rules'])
       
       before_all do
         csrf_protection(:save, :delete) do
@@ -51,8 +52,6 @@ module Users
           @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'
@@ -80,6 +79,39 @@ module Users
         @access_rules = AccessRule.all
       end
       
+      ##
+      # 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
+      # @since  0.2.5
+      #
+      before(:index, :edit, :new) do
+        @form_users       = {}
+        @form_groups      = {}
+        @form_packages    = {}
+        @form_controllers = {}
+
+        ::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
+          @form_packages[name]      = name
+          @form_controllers[name] ||= {lang('access_rules.labels.all_controllers') => '*'}
+
+          pkg.controllers.each do |key, value|
+            @form_controllers[name][key] = value.to_s
+          end
+        end
+
+        ::Users::Model::UserGroup.select(:id, :name).each do |group|
+          @form_groups[group.id.to_s] = group.name
+        end 
+      end
+
       ##
       # Edit an existing access rule.
       #
@@ -151,7 +183,7 @@ module Users
         
         post = request.params.dup
 
-        if post['rule_applies'] == 'div_user_id'
+        if post['rule_applies'] === 'div_user_id'
           post['user_group_id'] = nil
         else
           post['user_id'] = nil
@@ -172,6 +204,9 @@ module Users
         
         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)
@@ -217,6 +252,7 @@ module Users
           
           begin
             @access_rule.delete
+            session.delete(:access_rules)
             notification(
               :success, 
               lang('access_rules.titles.index'), 

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

@@ -1,7 +1,7 @@
 #:nodoc:
 module Users
   #:nodoc:
-  module Controllers
+  module Controller
     ##
     # Controller for managing all user groups. It's not
     # required to add a user to a group but it can certainly
@@ -11,11 +11,10 @@ module Users
     # @author Yorick Peterse
     # @since  0.1
     #
-    class UserGroups < Zen::Controllers::AdminController
-      include ::Users::Models
+    class UserGroups < Zen::Controller::AdminController
+      include ::Users::Model
 
-      map   '/admin/user-groups'
-      trait :extension_identifier => 'com.zen.users'
+      map('/admin/user-groups')
       
       before_all do
         csrf_protection(:save, :delete) do

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

@@ -1,7 +1,7 @@
 #:nodoc:
 module Users
   #:nodoc:
-  module Controllers
+  module Controller
     ##
     # Controller for managing users. Users in this case are people
     # that have access to the backend. However, users might be able
@@ -14,11 +14,10 @@ module Users
     # @author Yorick Peterse
     # @since  0.1
     #
-    class Users < Zen::Controllers::AdminController
-      include ::Users::Models
+    class Users < Zen::Controller::AdminController
+      include ::Users::Model
 
-      map   '/admin/users'
-      trait :extension_identifier => 'com.zen.users'
+      map('/admin/users')
       
       before_all do
         csrf_protection(:save, :delete) do
@@ -158,7 +157,7 @@ module Users
             User[:email => request.params['email']].update(:last_login => Time.new)
             
             notification(:success, lang('users.titles.index'), lang('users.success.login'))
-            redirect(::Sections::Controllers::Sections.r(:index))
+            redirect(::Sections::Controller::Sections.r(:index))
           else
             notification(:error, lang('users.titles.index'), lang('users.errors.login'))
           end

data/lib/zen/package/users/lib/users/language/en/access_rules.yml

@@ -5,15 +5,17 @@ titles:
   new   : 'Add Access Rule'
 
 labels:
-  id           : '#'
-  extension    : 'Extension'
-  rule_applies : 'Rule applies to'
-  create       : 'Create'
-  read         : 'Read'
-  update       : 'Update'
-  delete       : 'Delete'
-  user         : 'User'
-  user_group   : 'User group'
+  id             : '#'
+  package        : 'Package'
+  controller     : 'Controller'
+  rule_applies   : 'Rule applies to'
+  create         : 'Create'
+  read           : 'Read'
+  update         : 'Update'
+  delete         : 'Delete'
+  user           : 'User'
+  user_group     : 'User group'
+  all_controllers: 'All controllers'
 
 messages:
   no_rules: 'No access rules have been added yet.'

data/lib/zen/package/users/lib/users/model/access_rule.rb

@@ -1,7 +1,7 @@
 #:nodoc:
 module Users
   #:nodoc:
-  module Models
+  module Model
     ##
     # Model that represents a single access rule. This model has the following
     # relations:
@@ -13,8 +13,8 @@ module Users
     # @since  0.1
     #
     class AccessRule < Sequel::Model
-      many_to_one :user      , :class => "Users::Models::User"
-      many_to_one :user_group, :class => "Users::Models::UserGroup"
+      many_to_one :user      , :class => "Users::Model::User"
+      many_to_one :user_group, :class => "Users::Model::UserGroup"
       
       ##
       # Validation rules used when creating or updating an access rule.
@@ -23,9 +23,10 @@ module Users
       # @since  0.1
       #
       def validate
-        validates_presence(
-          [:extension, :create_access, :read_access, :update_access, :delete_access]
-        )
+        validates_presence([
+          :package, :controller, :create_access, :read_access, :update_access, 
+          :delete_access
+        ])
 
         validates_type(
           TrueClass, 

data/lib/zen/package/users/lib/users/model/user.rb

@@ -1,7 +1,7 @@
 #:nodoc:
 module Users
   #:nodoc:
-  module Models
+  module Model
     ##
     # Model that represents the very important user. This model
     # can be used for both CRUD actions as well as authenticating a user.
@@ -22,8 +22,8 @@ module Users
     class User < Sequel::Model
       plugin :timestamps, :create => :created_at, :update => :updated_at
       
-      many_to_many :user_groups, :class => "Users::Models::UserGroup", :eager => [:access_rules]
-      one_to_many :access_rules, :class => "Users::Models::AccessRule"
+      many_to_many :user_groups, :class => "Users::Model::UserGroup", :eager => [:access_rules]
+      one_to_many :access_rules, :class => "Users::Model::AccessRule"
       
       ##
       # Try to authenticate the user based on the specified credentials.
@@ -49,7 +49,7 @@ module Users
         user = self[:email => email]
 
         if !user.nil? and user.password == password and user.status == 'open'
-          ::Zen::Controllers::BaseController.session[:user] = user
+          ::Zen::Controller::BaseController.session[:user] = user
           return user
         else
           return false

data/lib/zen/package/users/lib/users/model/user_group.rb

@@ -1,7 +1,7 @@
 #:nodoc:
 module Users
   #:nodoc:
-  module Models
+  module Model
     ##
     # Model that represents a single user group. This model has the following
     # relations:
@@ -17,8 +17,8 @@ module Users
     # @since  0.1
     #
     class UserGroup < Sequel::Model
-      many_to_many(:users      , :class => "Users::Models::User")
-      one_to_many(:access_rules, :class => "Users::Models::AccessRule")
+      many_to_many(:users      , :class => "Users::Model::User")
+      one_to_many(:access_rules, :class => "Users::Model::AccessRule")
       
       plugin :sluggable , :source => :name, :freeze => false
       

data/lib/zen/package/users/lib/users/public/admin/js/users/access_rules.js

@@ -1,3 +1,33 @@
+/**
+ * Function that toggles a given select element from the list of elements.
+ *
+ * @author Yorick Peterse
+ * @since  0.2.5
+ * @param  {array} controllers A list of select boxes containing all controllers.
+ * @param  {string} selected The ID of the select element that has to be displayed.
+ *
+ */
+function toggleSelect(controllers, selected)
+{
+    // Show the correct box and hide all others
+    controllers.each(function(element)
+    {
+        if ( element.id === selected )
+        {
+            element.removeClass('hidden').set('disabled', false);
+        }
+        else
+        {
+            if ( !element.hasClass('hidden') )
+            {
+                element.addClass('hidden');
+            }
+
+            element.set('disabled', true);
+        }
+    });
+}
+
 window.addEvent('domready', function()
 {
     // Hide the fields that allow a user to pick a user or group
@@ -39,4 +69,24 @@ window.addEvent('domready', function()
             });
         });
     });
+
+    var package_select = $('form_package');
+
+    if ( package_select )
+    {
+        // Hide all the controller select boxes and only show the ones that belong to the
+        // currently selected package.
+        var controllers = $$('select.controllers');
+
+        // Show the first box by default
+        toggleSelect(controllers, package_select.get('value') + '_controllers');
+
+        // When the select element's value is changed the correct controller box should 
+        // be displayed and the old one should be hidden
+        package_select.addEvent('change', function()
+        {
+            var selected = this.get('value') + '_controllers';
+            toggleSelect(controllers, selected);
+        });
+    }
 });

data/lib/zen/package/users/lib/users/view/admin/access-rules/form.xhtml

@@ -3,31 +3,12 @@
     @access_rule, :method => :post, :action => @form_save_url, :id => :access_rule_form
   ) do |f|
     
-    users        = {}
-    groups       = {}
-    extensions   = {}
-    rule_applies = ''
-    
     if !@access_rule.user_id.nil?
       rule_applies = 'div_user_id'
     else
       rule_applies = 'div_user_group_id'
     end
     
-    Users::Models::User.select(:id, :name).each do |user|
-      users[user.id.to_s] = user.name
-    end
-    
-    Zen::Package.packages.each do |ident, ext|
-      extensions[ident] = ext.name
-    end
-    
-    Users::Models::UserGroup.select(:id, :name).each do |group|
-      groups[group.id.to_s] = group.name
-    end
-    
-    # ---------------------
-    
     f.input_hidden(:id, @access_rule.id)
     f.input_hidden(:csrf_token, get_csrf_token)
     
@@ -39,37 +20,59 @@
     )
     
     f.g.div(:id => 'div_user_id') do
-
       f.select(
         lang('access_rules.labels.user'), 
         :user_id, 
-        :values   => users,
+        :values   => @form_users,
         :selected => @access_rule.user_id, 
         :size     => 1
       ) 
-
     end
     
     f.g.div(:id => 'div_user_group_id') do
-    
       f.select(
         lang('access_rules.labels.user_group'), 
         :user_group_id, 
-        :values   => groups,
+        :values   => @form_groups,
         :selected => @access_rule.user_group_id, 
         :size     => 1
       )
-
     end
       
     f.select(
-      lang('access_rules.labels.extension'), 
-      :extension, 
-      :values   => extensions,
-      :selected => @access_rule.extension, 
+      lang('access_rules.labels.package'), 
+      :package, 
+      :values   => @form_packages,
+      :selected => @access_rule.package, 
       :size     => 1
     )
 
+    # Build the select boxes for all controllers
+    f.g.p do
+      f.g.label { lang('access_rules.labels.controller') }
+      @form_controllers.each do |pkg, controllers|
+        f.g.select(
+          :id => "#{pkg}_controllers", :class => 'controllers hidden', :name => 'controller'
+        ) do
+          # Show all the options
+          controllers.each do |key, value|
+            args = {:value => value}
+
+            # Is it selected?
+            if value === @access_rule.controller
+              args[:selected] = 'selected'
+            else
+              args.delete(:selected)
+            end
+
+            f.g.option(args) do
+              key
+            end
+          end
+        end
+      end
+    end
+
     f.input_radio(
       lang('access_rules.labels.create'), 
       :create_access,