zen 0.2.7 → 0.2.8

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

@@ -21,15 +21,16 @@ messages:
   no_rules: 'No access rules have been added yet.'
 
 errors:
-  new       : 'Failed to create a new access rule.'
-  save      : 'Failed to save the access rule.'
-  delete    : 'Failed to delete the access rule with ID #%s.'
-  no_delete : 'You have to specify at least one rule to delete.'
+  new         : 'Failed to create a new access rule.'
+  save        : 'Failed to save the access rule.'
+  delete      : 'Failed to delete the access rule with ID #%s.'
+  no_delete   : 'You have to specify at least one rule to delete.'
+  invalid_rule: 'The specified access rule is invalid.'
   
 success: 
   new    : 'The access rule has been created.'
   save   : 'The access rule has been modified.'
-  delete : 'The access rule with ID #%s has been deleted.'
+  delete : 'The selected access rules have been deleted.'
   
 buttons:
   new    : 'New rule'

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

@@ -15,10 +15,11 @@ messages:
   no_groups: 'No user groups have been added yet.'
 
 errors:
-  new       : 'Failed to create a new user group.'
-  save      : 'Failed to modify the user group.'
-  delete    : 'Failed to delete the user group with ID #%s.'
-  no_delete : 'You have to specify at least one group to delete.'
+  new          : 'Failed to create a new user group.'
+  save         : 'Failed to modify the user group.'
+  delete       : 'Failed to delete the user group with ID #%s.'
+  no_delete    : 'You have to specify at least one group to delete.'
+  invalid_group: 'The specified user group is invalid.'
   
 success:
   new    : 'The new user group has been created.'

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

@@ -41,6 +41,7 @@ errors:
   no_password_match : 'The specified passwords did not match.'
   login             : 'Failed to log in with the specified details.'
   logout            : 'Failed to log out, perhaps you are already logged out.'
+  invalid_user      : 'The specified user is invalid.'
 
 success:
   new    : 'The new user has been created.'

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

@@ -26,10 +26,11 @@ success:
   delete: 'Alle gespecificeerde regels zijn verwijderd.' 
 
 errors:
-  new      : 'De toegangs regel kon niet worden aangemaakt.'
-  save     : 'De toegangs regel kon niet worden aangepast.'
-  delete   : 'De toegangs regel met ID #%s kon niet worden verwijderd.'
-  no_delete: 'U moet ten minste 1 regel specificeren om te verwijderen.'
+  new         : 'De toegangs regel kon niet worden aangemaakt.'
+  save        : 'De toegangs regel kon niet worden aangepast.'
+  delete      : 'De toegangs regel met ID #%s kon niet worden verwijderd.'
+  no_delete   : 'U moet ten minste 1 regel specificeren om te verwijderen.'
+  invalid_rule: 'De opgegeven regel is ongeldig.'
 
 buttons:
   new   : 'Regel toevoegen'

data/lib/zen/package/users/lib/users/language/nl/user_groups.yml

@@ -20,10 +20,11 @@ success:
   delete: 'De geselecteerde groepen zijn verwijderd.'
 
 errors:
-  new      : 'De gebruikers groep kon niet worden aangemaakt.'
-  save     : 'De gebruikers groep kon niet worden aangepast.'
-  delete   : 'De gebruikers groep met ID #%s kon niet worden verwijderd.'
-  no_delete: 'U moet ten minste 1 groep specificeren om te verwijderen.'
+  new          : 'De gebruikers groep kon niet worden aangemaakt.'
+  save         : 'De gebruikers groep kon niet worden aangepast.'
+  delete       : 'De gebruikers groep met ID #%s kon niet worden verwijderd.'
+  no_delete    : 'U moet ten minste 1 groep specificeren om te verwijderen.'
+  invalid_group: 'De opgegeven gebruikers groep is ongeldig.'
 
 buttons:
   new   : 'Groep toevoegen'

data/lib/zen/package/users/lib/users/language/nl/users.yml

@@ -48,6 +48,7 @@ errors:
   no_password_match: 'De opgegeven wachtwoorden komen niet overeen.'
   login            : 'U kon niet worden ingelogd.'
   logout           : 'U kon niet worden uitgelogd, misschien bent u al uitgelogd.'
+  invalid_user     : 'De opgegeven gebruiker is ongeldig.'
 
 buttons:
   login : 'Inloggen'

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

@@ -24,7 +24,11 @@ module Users
       #
       def validate
         validates_presence([
-          :package, :controller, :create_access, :read_access, :update_access, 
+          :package, 
+          :controller, 
+          :create_access, 
+          :read_access, 
+          :update_access, 
           :delete_access
         ])
 

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

@@ -26,16 +26,21 @@ module Users
 
       plugin :timestamps, :create => :created_at, :update => :updated_at
       
-      many_to_many :user_groups, :class => "Users::Model::UserGroup", :eager => [:access_rules]
-      one_to_many :access_rules, :class => "Users::Model::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.
       # If the user credentials were incorrect false will be returned,
       # true otherwise.
       #
-      # Note that this method will NOT perform any sanitizing, that should be handled
-      # by the controller instead.
+      # Note that this method will NOT perform any sanitizing, that should be 
+      # handled by the controller instead.
       #
       # @author Yorick Peterse
       # @since  0.1
@@ -53,9 +58,7 @@ module Users
         if !user.nil? and user.password == password and user.status == 'open'
           # Overwrite all the global settings with the user specific ones
           [:language, :frontend_language, :date_format].each do |setting|
-            # "plugin" is already defined by Sequel so we'll have to call the plugin
-            # manually.
-            value = ::Zen::Plugin[:settings].plugin.new(:get, setting).call.value
+            value = Zen::Plugin.plugin(:settings, :get, setting).value
 
             if user.respond_to?(setting)
               got = user.send(setting)
@@ -104,13 +107,17 @@ module Users
       #
       # @author Yorick Peterse
       # @since  0.1
-      # @todo   Email validation using regular expressions is bad, a DNS call would be
-      # much better.
+      # @todo   Email validation using regular expressions is bad, a DNS call 
+      # would be much better.
       #
       def validate
         validates_presence [:email, :name]
         validates_presence :status unless new?
-        validates_format(/[a-zA-Z0-9\.\_\%\+\-]+@[a-zA-Z0-9\.\-]+\.[a-zA-Z]{2,4}/, :email)
+        validates_presence :password if new?
+        
+        validates_format(
+          /[a-zA-Z0-9\.\_\%\+\-]+@[a-zA-Z0-9\.\-]+\.[a-zA-Z]{2,4}/, :email
+        )
       end
     end
   end

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

@@ -1,33 +1,3 @@
-/**
- * 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
@@ -74,19 +44,22 @@ window.addEvent('domready', function()
 
     if ( package_select )
     {
-        // Hide all the controller select boxes and only show the ones that belong to the
-        // currently selected package.
+        // 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');
+        Users.AccessRules.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
+        // 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);
+            Users.AccessRules.toggleSelect(
+                controllers, this.get('value') + '_controllers'
+            );
         });
     }
 });

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

@@ -0,0 +1,49 @@
+/**
+ * Namespace for the Users package. The Users package is used to manage users,
+ * user groups and access rules.
+ *
+ * @author Yorick Peterse
+ * @since  0.2.8
+ */
+var Users = {};
+
+/**
+ * Object used when managing access rules in the backend.
+ *
+ * @author Yorick Peterse
+ * @since  0.2.8
+ */
+Users.AccessRules =
+{
+    /**
+     * Method that can be used to toggle the visibility of a <select>
+     * element based on a list of other 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.
+     */
+    toggleSelect: function(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);
+            }
+        });
+    }
+}

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

@@ -1,111 +1,120 @@
-#{
-  form_for(
-    @access_rule, :method => :post, :action => @form_save_url, :id => :access_rule_form
-  ) do |f|
-    
-    if !@access_rule.user_id.nil?
-      rule_applies = 'div_user_id'
-    else
-      rule_applies = 'div_user_group_id'
-    end
-    
-    f.input_hidden(:id, @access_rule.id)
-    f.input_hidden(:csrf_token, get_csrf_token)
-    
-    f.input_radio(
-      lang('access_rules.labels.rule_applies'), 
-      :rule_applies, 
-      rule_applies,
-      :values => @rule_applies_hash
-    )
-    
-    f.g.div(:id => 'div_user_id') do
-      f.select(
-        lang('access_rules.labels.user'), 
-        :user_id, 
-        :values   => @form_users,
-        :selected => @access_rule.user_id, 
-        :size     => 1
-      ) 
-    end
-    
-    f.g.div(:id => 'div_user_group_id') do
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+
+    #{
+    form_for(
+      @access_rule,
+      :method => :post,
+      :action => Users::Controller::AccessRules.r(:save),
+      :id     => :access_rule_form
+    ) do |f|
+
+      if !@access_rule.user_id.nil?
+        rule_applies = 'div_user_id'
+      else
+        rule_applies = 'div_user_group_id'
+      end
+
+      f.input_hidden(:id, @access_rule.id)
+      f.input_hidden(:csrf_token, get_csrf_token)
+
+      f.input_radio(
+        lang('access_rules.labels.rule_applies'),
+        :rule_applies,
+        rule_applies,
+        :values => @rule_applies_hash
+      )
+
+      f.g.div(:id => 'div_user_id') do
+        f.select(
+          lang('access_rules.labels.user'),
+          :user_id,
+          :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   => @form_groups,
+          :selected => @access_rule.user_group_id,
+          :size     => 1
+        )
+      end
+
       f.select(
-        lang('access_rules.labels.user_group'), 
-        :user_group_id, 
-        :values   => @form_groups,
-        :selected => @access_rule.user_group_id, 
+        lang('access_rules.labels.package'),
+        :package,
+        :values   => @form_packages,
+        :selected => @access_rule.package,
         :size     => 1
       )
-    end
-      
-    f.select(
-      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}
+      # 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
+              # Is it selected?
+              if value === @access_rule.controller
+                args[:selected] = 'selected'
+              else
+                args.delete(:selected)
+              end
 
-            f.g.option(args) do
-              key
+              f.g.option(args) { key }
             end
           end
         end
       end
-    end
 
-    f.input_radio(
-      lang('access_rules.labels.create'), 
-      :create_access, 
-      @access_rule.create_access,
-      :values => @boolean_hash
-    )
-  
-    f.input_radio(
-      lang('access_rules.labels.read'), 
-      :read_access, 
-      @access_rule.read_access,
-      :values => @boolean_hash
-    )
-  
-    f.input_radio(
-      lang('access_rules.labels.update'), 
-      :update_access, 
-      @access_rule.update_access,
-      :values => @boolean_hash
-    )
+      f.input_radio(
+        lang('access_rules.labels.create'),
+        :create_access,
+        @access_rule.create_access,
+        :values => @boolean_hash.invert
+      )
+
+      f.input_radio(
+        lang('access_rules.labels.read'),
+        :read_access,
+        @access_rule.read_access,
+        :values => @boolean_hash.invert
+      )
+
+      f.input_radio(
+        lang('access_rules.labels.update'),
+        :update_access,
+        @access_rule.update_access,
+        :values => @boolean_hash.invert
+      )
+
+      f.input_radio(
+        lang('access_rules.labels.delete'),
+        :delete_access,
+        @access_rule.delete_access,
+        :values => @boolean_hash.invert
+      )
 
-    f.input_radio(
-      lang('access_rules.labels.delete'), 
-      :delete_access, 
-      @access_rule.delete_access,
-      :values => @boolean_hash
-    )
-    
-    f.g.div(:class => 'clearfix') do
       f.g.div(:class => 'button') do
-        f.g.input(:type => 'submit', :value => lang('access_rules.buttons.save'))
+        f.g.input(
+          :type  => 'submit',
+          :value => lang('access_rules.buttons.save')
+        )
       end
     end
-
-  end
-}
+    }
+</article>