zen 0.2.7 → 0.2.8

data/lib/zen/package/users/lib/users/view/admin/users/index.xhtml

@@ -1,22 +1,21 @@
-<article>    
+<article>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post" action="#{Users::Controller::Users.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        
-        <?r if @users and !@users.empty? ?>
-        
-        <table class="table">
+
+        <?r if !@users.empty? ?>
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
-                    
+
                     <th>#{lang('users.labels.id')}</th>
                     <th>#{lang('users.labels.email')}</th>
                     <th>#{lang('users.labels.status')}</th>
@@ -30,25 +29,28 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="user_ids[]" value="#{user.id}" />
+                        <input type="checkbox" name="user_ids[]"
+                        value="#{user.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{user.id}</td>
-                    
-                    <?r if user_authorized?([:update]) ?>
+
                     <td>
-                        #{anchor_to(
-                          user.email, 
-                          Users::Controller::Users.r(:edit, user.id)
-                        )}
+                        #{
+                        if user_authorized?([:update])
+                          Users::Controller::Users.a(user.email, :edit, user.id)
+                        else
+                          user.email
+                        end
+                        }
+                    </td>
+                    <td>
+                        #{lang("users.special.status_hash.#{user.status}")}
+                    </td>
+                    <td>
+                        #{user.created_at.strftime(session[:user].date_format)}
                     </td>
-                    <?r else ?>
-                    <td>#{user.email}</td>
-                    <?r end ?>
-                    
-                    <td>#{lang("users.special.status_hash.#{user.status}")}</td>
-                    <td>#{user.created_at.strftime(session[:user].date_format)}</td>
                     <td>
                         #{
                         if user.updated_at
@@ -67,27 +69,27 @@
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @users.respond_to?(:navigation) and @users.page_count > 1
+          @users.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('users.messages.no_users')}</p>
         <?r end ?>
-        
-        <div class="clearfix">
-            
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('users.buttons.new'), 
-                  Users::Controller::Users.r(:new)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @users and !@users.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('users.buttons.delete')}" />
-            </div>
-            <?r end ?>
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{Users::Controller::Users.a(lang('users.buttons.new'), :new)}
         </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@users.empty? ?>
+        <div class="button">
+            <input type="submit" value="#{lang('users.buttons.delete')}" />
+        </div>
+        <?r end ?>
     </form>
 </article>

data/lib/zen/package/users/lib/users/view/admin/users/login.xhtml

@@ -4,23 +4,26 @@
     </header>
 
     #{
-    form_for(nil, :method => :post, :action => @form_login_url, :id => 'login_form') do |f|
+    form_for(
+      nil,
+      :method => :post,
+      :action => Users::Controller::Users.r(:login),
+      :id     => 'login_form'
+    ) do |f|
       f.input_text(
-        lang('users.labels.email'), 
-        :email, 
+        lang('users.labels.email'),
+        :email,
         :tabindex => 1
       )
 
       f.input_password(
-        lang('users.labels.password'), 
-        :password, 
+        lang('users.labels.password'),
+        :password,
         :tabindex => 2
       )
 
-      f.g.div(:class => 'clearfix') do
-        f.g.div(:class => 'button') do
-          f.g.input(:type => :submit, :value => lang('users.buttons.login'))
-        end
+      f.g.div(:class => 'button') do
+        f.g.input(:type => :submit, :value => lang('users.buttons.login'))
       end
     end
     }

data/lib/zen/package/users/migrations/1295281013_create_schema.rb

@@ -4,10 +4,10 @@ Sequel.migration do
     create_table :users do
       primary_key :id
         
-      String :email,    :null      => false, :unique => true
+      String :email,    :null    => false, :unique => true
       String :name
       String :website
-      String :password, :null      => false
+      String :password, :null    => false
       String :status,   :default => 'closed'
       Time   :created_at
       Time   :updated_at

data/lib/zen/plugin.rb

@@ -4,18 +4,19 @@ require __DIR__('plugin/base')
 #:nodoc:
 module Zen
   ##
-  # Plugins in Zen are quite similar to packages except for a few differences. The biggest
-  # difference is that plugins won't update any Ramaze root directories or language
-  # directories. This means that they can't have controllers, models and so on.
-  # Plugins are useful for supporting multiple markup formats (Markdown, Textile, etc)
-  # and other small tasks such as replacing Email addresses and so on.
+  # Plugins in Zen are quite similar to packages except for a few differences.
+  # The biggest difference is that plugins won't update any Ramaze root
+  # directories or language directories. This means that they can't have
+  # controllers, models and so on. Plugins are useful for supporting multiple
+  # markup formats (Markdown, Textile, etc) and other small tasks such as
+  # replacing Email addresses and so on.
   #
   # ## Creating Plugins
   #
-  # Creating a plugin happens in two steps. First you'll create your class and then you'll
-  # register it so that it can be used by the system. A plugin has a very simple layout,
-  # it's just a class with two methods: initialize and call. The most basic skeleton of a
-  # plugin looks like the following:
+  # Creating a plugin happens in two steps. First you'll create your class and
+  # then you'll register it so that it can be used by the system. A plugin has
+  # a very simple layout, it's just a class with two methods: initialize and
+  # call. The most basic skeleton of a plugin looks like the following:
   #
   #     class MyPlugin
   #       def initialize
@@ -27,9 +28,9 @@ module Zen
   #       end
   #     end
   #
-  # When a plugin is called all specified arguments are sent to the construct method so if
-  # your plugin requires a number of arguments be sure to store them. An example of this
-  # looks like the following:
+  # When a plugin is called all specified arguments are sent to the construct
+  # method so if your plugin requires a number of arguments be sure to store
+  # them. An example of this looks like the following:
   #
   #     class MyPlugin
   #       def initialize(name)
@@ -41,8 +42,8 @@ module Zen
   #       end
   #     end
   #
-  # The call method is supposed to return some data. Say we want to capitalize a given
-  # name we'd modify the skeleton so that it looks like the following:
+  # The call method is supposed to return some data. Say we want to capitalize
+  # a given name we'd modify the skeleton so that it looks like the following:
   #
   #     class MyPlugin
   #       def initialize(name)
@@ -56,9 +57,10 @@ module Zen
   #
   # ## Registering Plugins
   #
-  # Now that the plugin is created it's time to tell Zen it actually is a plugin and not
-  # some random class that doesn't belong somewhere. This can be done by calling
-  # Zen::Plugin.add and specifying a block with the details of the plugin. Example:
+  # Now that the plugin is created it's time to tell Zen it actually is a plugin
+  # and not some random class that doesn't belong somewhere. This can be done
+  # by calling Zen::Plugin.add and specifying a block with the details of the
+  # plugin. Example:
   #
   #     Zen::Plugin.add do |plugin|
   #       plugin.name   = :my_plugin
@@ -67,31 +69,32 @@ module Zen
   #       plugin.plugin = MyPlugin
   #     end
   #
-  # The name and plugin setter are the most important. Names should always match the
-  # regular expression /[a-z0-9_\-]+/. This is done to ensure names are consistent and
-  # easy to remember. It's also used for calling plugins and making sure there are no
-  # duplicates.
+  # The name and plugin setter are the most important. Names should always match
+  # the regular expression /[a-z0-9_\-]+/. This is done to ensure names are
+  # consistent and easy to remember. It's also used for calling plugins and
+  # making sure there are no duplicates.
   #
-  # The second important part is the plugin setting. This setter takes the class constant
-  # of the plugin that was created earlier on. There's no need to call new(), this will
-  # be done by Zen whenever the plugin is actually used.
+  # The second important part is the plugin setting. This setter takes the class
+  # constant of the plugin that was created earlier on. There's no need to call
+  # new(), this will be done by Zen whenever the plugin is actually used.
   #
   # ## Executing Plugins
   #
-  # Executing plugins is very easy and can be done by using the global method plugin():
+  # Executing plugins is very easy and can be done by using the global method
+  # plugin():
   #
   #     plugin(:my_plugin, 'yorick') # => "YORICK"
   #
-  # The first argument is the name of the plugin to call, all following arguments will be
-  # sent to the plugin's construct method.
+  # The first argument is the name of the plugin to call, all following
+  # arguments will be sent to the plugin's construct method.
   #
   # @author Yorick Peterse
   # @since  0.2.4
   #
   module Plugin
     ##
-    # Hash containing all registered plugins. The keys are the names of the plugins and
-    # the values are instances of Zen::Plugin::Base.
+    # Hash containing all registered plugins. The keys are the names of the
+    # plugins and the values are instances of Zen::Plugin::Base.
     #
     # @author Yorick Peterse
     # @since  0.2.5
@@ -103,8 +106,8 @@ module Zen
     #
     # @author Yorick Peterse
     # @since  0.2.4
-    # @raise  [Zen::PluginError] Error raised whenever the plugin already exists or is
-    # missing a certain setter.
+    # @raise  [Zen::PluginError] Error raised whenever the plugin already exists
+    # or is missing a certain setter.
     #
     def self.add
       plugin = Zen::Plugin::Base.new
@@ -127,18 +130,12 @@ module Zen
     # @author Yorick Peterse
     # @since  0.2.4
     # @param  [String] name The name of the plugin to retrieve.
-    # @raise  Zen::PluginError Error that's raised when no plugins have been added yet or
-    # the specified plugin doesn't exist.
+    # @raise  Zen::PluginError Error that's raised when no plugins have been
+    # added yet or the specified plugin doesn't exist.
     # @return [Struct] Instance of the plugin.
     #
     def self.[](name)
-      if name.class != Symbol
-        name = name.to_sym
-      end
-
-      if Registered.nil?
-        raise(Zen::PluginError, "No plugins have been added.")
-      end
+      name = name.to_sym if name.class != Symbol
 
       if !Registered[name]
         raise(Zen::PluginError, "The plugin #{name} doesn't exist.")
@@ -147,11 +144,24 @@ module Zen
       return Registered[name]
     end
 
+    ##
+    # @author Yorick Peterse
+    # @since  0.2.8
+    # @see    Zen::Plugin::SingletonMethods#plugin
+    #
+    def self.plugin(name, *data, &block)
+      if name.class != Symbol
+        name = name.to_sym
+      end
+
+      return ::Zen::Plugin[name].plugin.new(*data, &block).call
+    end
+
     #:nodoc:
     module SingletonMethods
       ##
-      # Retrieves the given plugin and executes it. All specified parameters will be sent
-      # to the plugin as well.
+      # Retrieves the given plugin and executes it. All specified parameters
+      # will be sent to the plugin as well.
       #
       # @example
       #  plugin(:settings, :get, :language)
@@ -160,17 +170,13 @@ module Zen
       # @since  0.2.5
       # @param  [String/Symbol] name The name of the plugin to call.
       # @param  [Array] data Any data to pass to the plugin's action (a lambda).
-      # @param  [Proc] block A block that should be passed to the plugin instead of this
-      # method.
+      # @param  [Proc] block A block that should be passed to the plugin instead
+      # of this method.
       # @return [Mixed]
       #
       def plugin(name, *data, &block)
-        if name.class != Symbol
-          name = name.to_sym
-        end
-
-        return ::Zen::Plugin[name].plugin.new(*data, &block).call
+        ::Zen::Plugin.plugin(name, *data, &block)
       end
-    end
+    end # SingletonMethods
   end # Plugin
 end # Zen

data/lib/zen/plugin/markup/lib/markup/markup.rb

@@ -3,16 +3,16 @@ module Zen
   #:nodoc
   module Plugin
     ##
-    # The Markup plugin is used to convert the given markup using the specified engine.
-    # Out of the box this plugin is capable of doing the following:
+    # The Markup plugin is used to convert the given markup using the specified
+    # engine.  Out of the box this plugin is capable of doing the following:
     #
     # * Markdown -> HTML
     # * Textile -> HTML
     # * HTML -> Plain text (escapes HTML)
     # * Regular HTML
     #
-    # When using Markdown you'll have to make sure RDiscount is loaded, for Textile this
-    # should be RedCloth.
+    # When using Markdown you'll have to make sure RDiscount is loaded, for
+    # Textile this should be RedCloth.
     #
     # ## Usage
     #
@@ -22,14 +22,15 @@ module Zen
     #
     # ## Adding Engines
     #
-    # In order to add a custom markdown engine (e.g. RDoc) you'll have to update 
-    # Zen::Plugin::Markup::Engines so that it includes the name and human readable name
-    # of the engine you wish to use. This can be done as following:
+    # In order to add a custom markdown engine (e.g. RDoc) you'll have to update
+    # Zen::Plugin::Markup::Engines so that it includes the name and human
+    # readable name of the engine you wish to use. This can be done as
+    # following:
     #
     #     Zen::Plugin::Markup::Engines[:rdoc] => 'RDoc'
     #
-    # Once this is done you'll need to define a method that matches the key you've just
-    # added. In this case it will be named "rdoc":
+    # Once this is done you'll need to define a method that matches the key
+    # you've just added. In this case it will be named "rdoc":
     #
     #     module Zen
     #       module Plugin
@@ -41,22 +42,25 @@ module Zen
     #       end
     #     end
     #
-    # Once this has been done you're able to convert RDoc markup to HTML using this plugin.
+    # Once this has been done you're able to convert RDoc markup to HTML using
+    # this plugin.
     #
     # @author Yorick Peterse
     # @since  0.2.5
     #
     class Markup
       include Ramaze::Helper::CGI
-      
-      # Load the language pack in the class method scope rather than the instance's scope
+
+      # Load the language pack in the class method scope rather than the
+      # instance's scope
       class << self
         include Zen::Language
       end
 
       ##
-      # Hash containing the keys of the engines to use and their human friendly names
-      # (used in the backend). Note that the keys of this hash should be strings.
+      # Hash containing the keys of the engines to use and their human friendly
+      # names (used in the backend). Note that the keys of this hash should be
+      # strings.
       #
       # @author Yorick Peterse
       # @since  0.2.5
@@ -66,10 +70,11 @@ module Zen
         'textile'  => lang('markup.engines.textile'),
         'plain'    => lang('markup.engines.plain'),
         'html'     => lang('markup.engines.html')
-      } 
-    
+      }
+
       ##
-      # Creates a new instance of the markup plugin and validates all the given parameters.
+      # Creates a new instance of the markup plugin and validates all the given
+      # parameters.
       #
       # @author Yorick Peterse
       # @since  0.2.5
@@ -81,17 +86,23 @@ module Zen
 
         # Validate the given engine
         if !Engines.keys.include?(@engine)
-          raise(ArgumentError, "The markup engine \"#{@engine}\" is invalid.")
+          raise(
+            ArgumentError,
+            "The markup engine \"#{@engine}\" is invalid."
+          )
         end
 
         # Does the engine have a matching method?
         if !respond_to?(@engine)
-          raise(NoMethodError, "The engine \"#{@engine}\" has no matching method.")
+          raise(
+            NoMethodError,
+            "The engine \"#{@engine}\" has no matching method."
+          )
         end
       end
 
       ##
-      # Converts the markup into HTML or plain text. 
+      # Converts the markup into HTML or plain text.
       #
       # @author Yorick Peterse
       # @since  0.2.5
@@ -130,7 +141,8 @@ module Zen
       #
       # @author Yorick Peterse
       # @since  0.2.5
-      # @param  [String] markup The markup in which all HTML tags should be escaped.
+      # @param  [String] markup The markup in which all HTML tags should be
+      # escaped.
       # @return [String] String containing the escaped HTML.
       #
       def plain(markup)