zen 0.1a → 0.2

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

@@ -1,12 +1,14 @@
+#:nodoc:
 module Users
+  #:nodoc:
   module Liquid
     ##
     # Block that can be used to retrieve a number of users and show their details.
     # Basic usage of this tag is as following:
     #
-    # bc. {% users limit="10" offset="5" %}
-    #   {{email}}
-    # {% endusers %}
+    #     {% users limit="10" offset="5" %}
+    #         {{email}}
+    #     {% endusers %}
     #
     # Note that this tag will retrieve a list of users, if you want to only retrieve
     # a single user it's best to use the tag "zen_user" defined under Users::Liquid::User.

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

@@ -1,4 +1,6 @@
+#:nodoc:
 module Users
+  #:nodoc:
   module Models
     ##
     # Model that represents a single access rule. This model has the following
@@ -11,7 +13,7 @@ module Users
     # @since  0.1
     #
     class AccessRule < Sequel::Model
-      many_to_one :user, :class => "Users::Models::User"
+      many_to_one :user      , :class => "Users::Models::User"
       many_to_one :user_group, :class => "Users::Models::UserGroup"
       
       ##
@@ -21,8 +23,14 @@ module Users
       # @since  0.1
       #
       def validate
-        validates_presence [:extension, :create_access, :read_access, :update_access, :delete_access]
-        validates_type TrueClass, [:create_access, :read_access, :update_access, :delete_access]
+        validates_presence(
+          [:extension, :create_access, :read_access, :update_access, :delete_access]
+        )
+
+        validates_type(
+          TrueClass, 
+          [:create_access, :read_access, :update_access, :delete_access]
+        )
       end
     end
   end

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

@@ -1,4 +1,6 @@
+#:nodoc:
 module Users
+  #:nodoc:
   module Models
     ##
     # Model that represents the very important user. This model
@@ -47,7 +49,7 @@ module Users
         user = self[:email => email]
 
         if !user.nil? and user.password == password and user.status == 'open'
-          Ramaze::Controller.session[:user] = user
+          ::Zen::Controllers::BaseController.session[:user] = user
           return user
         else
           return false
@@ -85,6 +87,8 @@ module Users
       #
       # @author Yorick Peterse
       # @since  0.1
+      # @todo   Email validation using regular expressions is bad, a DNS call would be
+      # much better.
       #
       def validate
         validates_presence [:email, :name]

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

@@ -1,4 +1,6 @@
+#:nodoc:
 module Users
+  #:nodoc:
   module Models
     ##
     # Model that represents a single user group. This model has the following
@@ -15,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::Models::User")
+      one_to_many(:access_rules, :class => "Users::Models::AccessRule")
       
       plugin :sluggable , :source => :name, :freeze => false
       
@@ -30,7 +32,8 @@ module Users
       def validate
         validates_presence [:name, :super_group]
         validates_presence :slug unless new?
-        validates_unique :slug
+        validates_unique   :slug
+
         validates_type TrueClass, :super_group
       end
     end

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

@@ -0,0 +1,42 @@
+window.addEvent('domready', function()
+{
+    // Hide the fields that allow a user to pick a user or group
+    // for an access rule. Each field (and thus the select element)
+    // will be shown when the corresponding radio button is selected.
+    var radios = $$('input[name="rule_applies"]');
+    var divs   = []
+    
+    radios.each(function(radio)
+    {
+        var value = radio.get('value');
+        
+        if ( value !== "0" )
+        {
+            value = $(value);
+
+            if ( radio.get('checked') == false )
+            {
+                value.setStyle('display', 'none'); 
+            }
+            
+            divs.push(value);
+        }
+        
+        radio.addEvent('click', function()
+        {
+            var radio_value = this.get('value');
+            
+            divs.each(function(div)
+            {
+                if ( div.get('id') == radio_value )
+                {
+                    div.setStyle('display', 'block');
+                }
+                else
+                {
+                    div.setStyle('display', 'none');
+                }
+            });
+        });
+    });
+});

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

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

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

@@ -0,0 +1,108 @@
+#{
+  form_for(
+    @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.extensions.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)
+    
+    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   => 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,
+        :selected => @access_rule.user_group_id, 
+        :size     => 1
+      )
+
+    end
+      
+    f.select(
+      lang('access_rules.labels.extension'), 
+      :extension, 
+      :values   => extensions,
+      :selected => @access_rule.extension, 
+      :size     => 1
+    )
+
+    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.g.div(:class => 'clearfix') do
+      f.g.div(:class => 'button') do
+        f.g.input(:type => 'submit', :value => lang('access_rules.buttons.save'))
+      end
+    end
+
+  end
+}

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

@@ -0,0 +1,93 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    <form method="post" action="#{@form_delete_url}">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        
+        <?r if @access_rules and !@access_rules.empty? ?>
+        
+        <table class="table">
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th>
+                        <input type="checkbox" />
+                    </th>
+                    <?r end ?>
+                    
+                    <th>#{lang('access_rules.labels.id')}</th>
+                    <th>#{lang('access_rules.labels.extension')}</th>
+                    <th>#{lang('access_rules.labels.create')}</th>
+                    <th>#{lang('access_rules.labels.read')}</th>
+                    <th>#{lang('access_rules.labels.update')}</th>
+                    <th>#{lang('access_rules.labels.delete')}</th>
+                    <th>#{lang('access_rules.labels.user')}</th>
+                    <th>#{lang('access_rules.labels.user_group')}</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?r @access_rules.each do |rule| ?>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <td>
+                        <input type="checkbox" name="access_rule_ids[]" value="#{rule.id}" />
+                    </td>
+                    <?r end ?>
+                    
+                    <td>#{rule.id}</td>
+                    
+                    <?r if user_authorized?([:update]) ?>
+                    <td>
+                        #{anchor_to(
+                          rule.extension, 
+                          Users::Controllers::AccessRules.r(:edit, rule.id)
+                        )}
+                    </td>
+                    <?r else ?>
+                    <td>#{rule.extension}</td>
+                    <?r end ?>
+                    
+                    <td>#{@boolean_hash[rule.create_access]}</td>
+                    <td>#{@boolean_hash[rule.read_access]}</td>
+                    <td>#{@boolean_hash[rule.update_access]}</td>
+                    <td>#{@boolean_hash[rule.delete_access]}</td>
+                    <td>
+                        <?r if !rule.user_id.nil? ?>
+                        #{rule.user.name}
+                        <?r end ?>
+                    </td>
+                    <td>
+                        <?r if !rule.user_group_id.nil? ?>
+                        #{rule.user_group.name}
+                        <?r end ?>
+                    </td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+        
+        <?r else ?>
+        <p>#{lang('access_rules.messages.no_rules')}</p>
+        <?r end ?>
+        
+        <div class="clearfix">
+            
+            <?r if user_authorized?([:create]) ?>
+            <div class="button">
+                #{anchor_to(
+                  lang('access_rules.buttons.new'), 
+                  Users::Controllers::AccessRules.r(:new)
+                )}
+            </div>
+            <?r end ?>
+            
+            <?r if user_authorized?([:delete]) and @access_rules and !@access_rules.empty? ?>
+            <div class="button">
+                <input type="submit" value="#{lang('access_rules.buttons.delete')}" />
+            </div>
+            <?r end ?>
+        </div>
+    </form>
+</article>

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

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/package/users/lib/users/view/admin/user-groups/edit.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/package/users/lib/users/view/admin/user-groups/form.xhtml

@@ -0,0 +1,37 @@
+#{
+  form_for(
+    @user_group, :method => :post, :action => @form_save_url, :id => :user_group_form
+  ) do |f|
+    f.input_hidden(:id, @user_group.id)
+    f.input_hidden(:csrf_token, get_csrf_token)
+  
+    f.input_text(
+      lang('user_groups.labels.name'), 
+      :name
+    )
+
+    f.input_text(
+      lang('user_groups.labels.slug'), 
+      :slug
+    )
+
+    f.input_radio(
+      lang('user_groups.labels.super_group'), 
+      :super_group, 
+      @user_group.super_group,
+      :values => @boolean_hash,
+    )
+      
+    f.textarea(
+      lang('user_groups.labels.description'), 
+      :description, 
+      :rows => 10
+    )
+    
+    f.g.div(:class => 'clearfix') do
+      f.g.div(:class => 'button') do
+        f.g.input(:type => 'submit', :value => lang('user_groups.buttons.save'))
+      end
+    end
+  end
+}

data/lib/zen/package/users/lib/users/view/admin/user-groups/index.xhtml

@@ -0,0 +1,76 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    <form method="post" action="#{@form_delete_url}">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        
+        <?r if @user_groups and !@user_groups.empty? ?>
+        
+        <table class="table">
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th>
+                        <input type="checkbox" />
+                    </th>
+                    <?r end ?>
+                    
+                    <th>#{lang('user_groups.labels.id')}</th>
+                    <th>#{lang('user_groups.labels.name')}</th>
+                    <th>#{lang('user_groups.labels.slug')}</th>
+                    <th>#{lang('user_groups.labels.super_group')}</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?r @user_groups.each do |group| ?>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <td>
+                        <input type="checkbox" name="user_group_ids[]" value="#{group.id}" />
+                    </td>
+                    <?r end ?>
+                    
+                    <td>#{group.id}</td>
+                    
+                    <?r if user_authorized?([:update]) ?>
+                    <td>
+                        #{anchor_to(
+                          group.name, Users::Controllers::UserGroups.r(:edit, group.id)
+                        )}
+                    </td>
+                    <?r else ?>
+                    <td>#{group.name}</td>
+                    <?r end ?>
+                    
+                    <td>#{group.slug}</td>
+                    <td>#{@boolean_hash[group.super_group]}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+        
+        <?r else ?>
+        <p>#{lang('user_groups.messages.no_groups')}</p>
+        <?r end ?>
+        
+        <div class="clearfix">
+            
+            <?r if user_authorized?([:create]) ?>
+            <div class="button">
+                #{anchor_to(
+                  lang('user_groups.buttons.new'), 
+                  Users::Controllers::UserGroups.r(:new)
+                )}
+            </div>
+            <?r end ?>
+            
+            <?r if user_authorized?([:delete]) and @user_groups and !@user_groups.empty? ?>
+            <div class="button">
+                <input type="submit" value="#{lang('user_groups.buttons.delete')}" />
+            </div>
+            <?r end ?>
+        </div>
+    </form>
+</article>