RubyGems - zen - Versions diffs - 0.2.5 → 0.2.6 - Mend

zen 0.2.5 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (178) hide show

data/lib/zen/language/en/zen_general.yml CHANGED

@@ -14,6 +14,7 @@ errors:
   website_offline : 'This website is currently offline.'
   no_templates    : 'No templates were found for the given action.'
   no_theme        : 'No theme has been specified.'
+  invalid_request : 'The request could not be executed as the specified data is incorrect.'
 special:
   format_hash:
@@ -25,7 +26,3 @@ special:
   boolean_hash:
     'true'    : 'Yes'
     'false'   : 'No'
-  language_hash:
-    en  : 'English'

data/lib/zen/language/nl/zen_general.yml ADDED

@@ -0,0 +1,28 @@
+---
+labels:
+  zen_version : 'Deze website draait op Zen versie %s'
+  zen_website : 'Website'
+  zen_docs    : 'Documentatie'
+  zen_github  : 'GitHub account'
+  view_website: 'Bekijk website'
+  logout      : 'Uitloggen'
+  profile     : 'Profiel'
+errors:
+  csrf           : 'De actie kan niet worden uitgevoerd zonder een geldige CSRF token.'
+  not_authorized : 'U bent niet toegestaan om de huidige pagina te bekijken.'
+  website_offline: 'Deze website is momenteel offline.'
+  no_templates   : 'Er konden geen sjablonen worden gevonden voor de huidige actie.'
+  no_theme       : 'Er is geen thema ingesteld.'
+  invalid_request: 'De actie kon niet worden uitgevoerd omdat de data onjuist is.'
+special:
+  format_hash:
+    html    : 'HTML'
+    textile : 'Textile'
+    markdown: 'Markdown'
+    plain   : 'Platte tekst'
+  boolean_hash:
+    'true' : 'Ja'
+    'false': 'Nee'

data/lib/zen/language/nl/zen_models.yml ADDED

@@ -0,0 +1,13 @@
+---
+exact_length: 'Dit veld bevat niet exact %s karakters.'
+format      : 'Het formaat van de waarde van dit veld is onjuist.'
+includes    : 'De waarde van dit veld is niet binnen het bereik van %s.'
+integer     : 'De waarde van dit veld is niet numeriek.'
+length_range: 'De waarde van dit veld is te lang of te kort.'
+max_length  : 'De waarde van dit veld mag niet langer zijn dan %s karakters.'
+min_length  : 'De waarde van dit veld mag niet korter zijn dan %s karakters.'
+not_string  : 'De waarde van dit veld is geen tekst.'
+numeric     : 'De waarde van dit veld is niet numeriek.'
+type        : 'De waarde van dit veld is niet het type %s.'
+presence    : 'Dit veld is vereist.'
+unique      : 'De waarde van dit veld is al in gebruik.'

data/lib/zen/layout/admin.xhtml CHANGED

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="#{::Zen::Settings[:language]}">
+<html lang="#{::Zen.settings[:language]}">
     <head>
         <meta charset="utf-8" />

data/lib/zen/layout/login.xhtml CHANGED

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="#{::Zen::Settings[:language]}">
+<html lang="#{::Zen.settings[:language]}">
     <head>
         <meta charset="utf-8" />

data/lib/zen/model/settings.rb CHANGED

@@ -9,6 +9,8 @@ Sequel::Model.strict_param_setting = false
 Sequel::Model.plugin :validation_helpers
 Sequel::Model.plugin :association_pks
+Sequel.extension(:migration)
 Sequel::Plugins::ValidationHelpers::DEFAULT_OPTIONS.merge!(
 {
   :exact_length => {

data/lib/zen/package.rb CHANGED

@@ -5,12 +5,12 @@ require __DIR__('package/base')
 #:nodoc:
 module Zen
   ##
-  # Module used for registering extensions and themes, setting their details and the
-  # whole shebang. Packages follow the same directory structure as Rubygems and can
-  # actually be installed using either Rubygems or by storing them in a custom directory.
+  # Module used for registering extensions and themes, setting their details and the
+  # whole shebang. Packages follow the same directory structure as Rubygems and can
+  # actually be installed using either Rubygems or by storing them in a custom directory.
   # As long as you require the correct file you're good to go.
   #
-  # Packages are added or "described" using a simple block and the add() method as
+  # Packages are added or "described" using a simple block and the add() method as
   # following:
   #
   #     Zen::Package.add do |ext|
@@ -24,7 +24,7 @@ module Zen
   # * about: a small description of the package.
   # * url: the URL to the package's website.
   # * directory: the root directory of the package, set this using __DIR__('path').
-  #
+  #
   # Optionally you can also specify the attribute "menu" (more on that later).
   #
   # ## ACL
@@ -72,12 +72,12 @@ module Zen
   #
   # If your package uses it's own database tables it's best to use migrations as these make
   # it very easy to install/uninstall the extension. Migrations should be put in the root
-  # directory of your extension. For example, if your extension is in "foobar" the
-  # migrations should be located in "foobar/migrations", the lib directory in "foobar/lib",
+  # directory of your extension. For example, if your extension is in "foobar" the
+  # migrations should be located in "foobar/migrations", the lib directory in "foobar/lib",
   # etc.
   #
   # Migrations can be executed using the Thor task "package:migrate" or "db:migrate",
-  # the latter will install all packages while the first one will only install the
+  # the latter will install all packages while the first one will only install the
   # specified packages. For more information on these tasks execute the following command:
   #
   #     $ rake -T
@@ -104,7 +104,7 @@ module Zen
     Controllers = []
     ##
-    # Adds a new package along with all it's details such as the name, author, version
+    # Adds a new package along with all it's details such as the name, author, version
     # and so on. Extensions can be added using a simple block as following:
     #
     #     Zen::Package.add do |ext|
@@ -130,7 +130,7 @@ module Zen
     #
     def self.add
       package = Zen::Package::Base.new
       yield package
       # Validate the package
@@ -154,8 +154,8 @@ module Zen
           Controllers.push(controller)
         end
       end
-      Registered[package.name.to_sym] = package
+      Registered[package.name.to_sym] = package
     end
     ##
@@ -194,7 +194,7 @@ module Zen
       @g           = Ramaze::Gestalt.new
       @permissions = permissions
       menu_items   = []
       Registered.each do |name, pkg|
         # Got a menu for us?
         if !pkg.menu.nil?
@@ -203,12 +203,12 @@ module Zen
           end
         end
       end
       # Sort the menu alphabetical
       menu_items = menu_items.sort_by do |item|
         item[:title]
       end
       @g.ul :class => css_class do
         if !menu_items.empty?
           menu_items.each do |m|
@@ -216,12 +216,12 @@ module Zen
           end
         end
       end
       return @g.to_s
     end
     private
     ##
     # Method that's used to generate the list items for each
     # navigation menu along with all sub elements.
@@ -231,13 +231,18 @@ module Zen
     # @since  0.1
     #
     def self.nav_list(menu)
-      if menu[:url][0] != '/'
+      if menu[:url][0, 1] != '/'
         menu[:url] = '/' + menu[:url]
       end
       # Get the controller for the current item
-      controller  = Ramaze::AppMap.at('/').url_map.at(menu[:url]).to_s
-      read_access = @permissions[controller].include?(:read)
+      controller = Ramaze::AppMap.at('/').url_map.at(menu[:url]).to_s
+      if @permissions[controller].nil?
+        read_access = false
+      else
+        read_access = @permissions[controller].include?(:read)
+      end
       # Ignore the menu item alltogether
       if !read_access and !menu.key?(:children)
@@ -253,7 +258,7 @@ module Zen
         @g.a :href => menu[:url], :title => menu[:title] do
           menu[:title]
         end
         if menu.key?(:children)
           @g.ul do
             menu[:children].each do |c|
@@ -263,6 +268,5 @@ module Zen
         end
       end
     end
-  end
-end
+  end # Package
+end # Zen

data/lib/zen/package/all.rb CHANGED

@@ -4,8 +4,8 @@
 # not work.
 #
 require __DIR__('users/lib/users')
-require __DIR__('sections/lib/sections')
 require __DIR__('settings/lib/settings')
+require __DIR__('sections/lib/sections')
 require __DIR__('comments/lib/comments')
 require __DIR__('categories/lib/categories')
 require __DIR__('custom_fields/lib/custom_fields')

data/lib/zen/package/categories/lib/categories/controller/categories.rb CHANGED

@@ -1,11 +1,11 @@
 #:nodoc:
-module Categories
+module Categories
   #:nodoc:
   module Controller
     ##
     # Categories can be seen as "tags" for your section entries. They describe the
     # type of entry just like tags except that categories generally cover larger elements.
-    # When adding a new entry categories aren't required so you're free to ignore
+    # When adding a new entry categories aren't required so you're free to ignore
     # them if you don't need them.
     #
     # @author Yorick Peterse
@@ -13,15 +13,15 @@ module Categories
     #
     class Categories < Zen::Controller::AdminController
       include ::Categories::Model
       map('/admin/categories')
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
       ##
       # The constructor is used to set various options such as the form URLs and load
       # the language pack for the categories module.
@@ -36,20 +36,20 @@ module Categories
       #
       def initialize
         super
         @form_save_url   = Categories.r(:save)
         @form_delete_url = Categories.r(:delete)
         Zen::Language.load('categories')
         Zen::Language.load('category_groups')
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_s
           @page_title = lang("categories.titles.#{method}") rescue nil
         end
       end
       ##
       # Show an overview of all existing categories and allow the user
       # to create and manage these categories.
@@ -67,16 +67,16 @@ module Categories
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
         set_breadcrumbs(
           anchor_to(lang('category_groups.titles.index'), CategoryGroups.r(:index)),
           lang('categories.titles.index')
         )
         @category_group_id = category_group_id.to_i
         @categories        = CategoryGroup[@category_group_id].categories
       end
       ##
       # Edit an existing category based on the ID specified in the URL.
       #
@@ -94,13 +94,13 @@ module Categories
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
         set_breadcrumbs(
           anchor_to(lang('category_groups.titles.index'), CategoryGroups.r(:index)),
           anchor_to(lang('categories.titles.index'), Categories.r(:index, category_group_id)),
           lang('categories.titles.edit')
         )
         @category_group_id = category_group_id.to_i
         if flash[:form_data]
@@ -109,7 +109,7 @@ module Categories
           @category = Category[id.to_i]
         end
       end
       ##
       # Create a new category.
       #
@@ -126,13 +126,13 @@ module Categories
         if !user_authorized?([:read, :create])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
         set_breadcrumbs(
           anchor_to(lang('category_groups.titles.index'), CategoryGroups.r(:index)),
           anchor_to(lang('categories.titles.index'), Categories.r(:index, category_group_id)),
           lang('categories.titles.new')
         )
         @category_group_id = category_group_id.to_i
         @category          = Category.new
       end
@@ -148,48 +148,52 @@ module Categories
       #
       # @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
-        category_group_id = post['category_group_id']
-        post.delete('slug') if post['slug'].empty?
+        post = request.subset(
+          :id, :parent_id, :name, :description, :slug, :category_group_id
+        )
         # Retrieve the category and set the notifications based on if the ID has
         # been specified or not.
         if post['id'] and !post['id'].empty?
-          @category   = Category[post['id'].to_i]
+          @category   = Category[post['id']]
           save_action = :save
         else
           @category   = Category.new
           save_action = :new
         end
+        # Remove various keys
+        post.delete('slug') if post['slug'].empty?
+        post.delete('id')
+        # Set the messages to display
         flash_success = lang("categories.success.#{save_action}")
         flash_error   = lang("categories.errors.#{save_action}")
         # Try to update the category
         begin
           @category.update(post)
-          notification(:success, lang('categories.titles.index'), flash_success)
+          message(:success, flash_success)
         rescue
-          notification(:error, lang('categories.titles.index'), flash_error)
+          message(:error, flash_error)
           flash[:form_errors] = @category.errors
           flash[:form_data]   = @category
         end
         if @category.id
-          redirect(Categories.r(:edit, category_group_id, @category.id))
-        else
-          redirect(Categories.r(:new, category_group_id))
+          redirect(Categories.r(:edit, post['category_group_id'], @category.id))
+        else
+          redirect(Categories.r(:new, post['category_group_id']))
         end
       end
       ##
       # Delete all specified category groups and their categories. In
       # order to delete a number of groups an array of fields, named "category_group_ids"
@@ -207,43 +211,27 @@ module Categories
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        post              = request.params.dup
-        category_group_id = post['category_group_id'].to_i
+        post = request.subset(:category_ids, :category_group_id)
         # Obviously we'll require some IDs
         if !request.params['category_ids'] or request.params['category_ids'].empty?
-          notification(
-            :error,
-            lang('categories.titles.index'),
-            lang('categorieserrors.no_delete')
-          )
-          redirect(Categories.r(:index, category_group_id))
+          message(:error, lang('categories.errors.no_delete'))
+          redirect(Categories.r(:index, post['category_group_id']))
         end
         # Delete each section
         request.params['category_ids'].each do |id|
           begin
-            Category[id.to_i].destroy
-            notification(
-              :success,
-              lang('categories.titles.index'),
-              lang('categories.success.delete')
-            )
+            Category[id].destroy
+            message(:success, lang('categories.success.delete'))
           rescue
-            notification(
-              :error,
-              lang('categories.titles.index'),
-              lang('categories.errors.delete') % id
-            )
+            message(:error, lang('categories.errors.delete') % id)
           end
         end
-        redirect(Categories.r(:index, category_group_id))
+        redirect(Categories.r(:index, post['category_group_id']))
       end
-    end
-  end
-end
+    end # Categories
+  end # Controller
+end # Categories