zen 0.2.5 → 0.2.6

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

@@ -13,13 +13,13 @@ module Categories
       include ::Categories::Model
 
       map('/admin/category-groups')
-      
+
       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.
@@ -33,19 +33,19 @@ module Categories
       #
       def initialize
         super
-        
+
         @form_save_url   = CategoryGroups.r(:save)
         @form_delete_url = CategoryGroups.r(:delete)
-        
+
         Zen::Language.load('category_groups')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_s
           @page_title = lang("category_groups.titles.#{method}") rescue nil
         end
       end
-      
+
       ##
       # Show an overview of all existing category groups and allow the user
       # to create new category groups or manage individual categories.
@@ -61,12 +61,12 @@ module Categories
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('category_groups.titles.index'))
-        
+
         @category_groups = CategoryGroup.all
       end
-      
+
       ##
       # Edit an existing category group based on the ID specified in the URL.
       # This method requires the following permissions:
@@ -81,19 +81,19 @@ 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)),
           lang('category_groups.titles.edit')
         )
-        
+
         if flash[:form_data]
           @category_group = flash[:form_data]
         else
           @category_group = CategoryGroup[id]
         end
       end
-      
+
       ##
       # Create a new category group. This method requires the following permissions:
       #
@@ -107,12 +107,12 @@ module Categories
         if !user_authorized?([:create, :read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
           anchor_to(lang('category_groups.titles.index'), CategoryGroups.r(:index)),
           lang('category_groups.titles.new')
         )
-        
+
         @category_group = CategoryGroup.new
       end
 
@@ -125,42 +125,47 @@ 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
-        
+
+        post = request.subset(:id, :name, :description)
+
         if post['id'] and !post['id'].empty?
-          @category_group = CategoryGroup[post['id'].to_i]
+          @category_group = CategoryGroup[post['id']]
           save_action     = :save
         else
           @category_group = CategoryGroup.new
           save_action     = :new
         end
-        
+
+        # Set the messages
         flash_success = lang("category_groups.success.#{save_action}")
         flash_error   = lang("category_groups.errors.#{save_action}")
-        
+
+        post.delete('id')
+
+        # Try to run the query
         begin
           @category_group.update(post)
-          notification(:success, lang('category_groups.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('category_groups.titles.index'), flash_error)
+          message(:success, flash_success)
+        rescue => e
+          message(:error, flash_error)
+          Ramaze::Log.error(e.inspect)
 
           flash[:form_data]   = @category_group
           flash[:form_errors] = @category_group.errors
         end
-        
+
         if !@category_group.nil? and @category_group.id
           redirect(CategoryGroups.r(:edit, @category_group.id))
-        else  
+        else
           redirect(CategoryGroups.r(:new))
         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"
@@ -179,37 +184,25 @@ module Categories
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
 
-        post = request.params.dup
-        
-        if !post['category_group_ids'] or post['category_group_ids'].empty?
-          notification(
-            :error, 
-            lang('category_groups.titles.index'), 
-            lang('category_groups.errors.no_delete')
-          )
+        post = request.subset(:category_group_ids)
 
+        if !post['category_group_ids'] or post['category_group_ids'].empty?
+          message(:error, lang('category_groups.errors.no_delete'))
           redirect(CategoryGroups.r(:index))
         end
-        
+
         post['category_group_ids'].each do |id|
           begin
-            CategoryGroup[id.to_i].destroy
-            notification(
-              :success, 
-              lang('category_groups.titles.index'), 
-              lang('category_groups.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('category_groups.titles.index'), 
-              lang('category_groups.errors.delete') % id
-            )
+            CategoryGroup[id].destroy
+            message(:success, lang('category_groups.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('category_groups.errors.delete') % id)
           end
         end
-        
+
         redirect(CategoryGroups.r(:index))
       end
-    end
-  end
-end
+    end # CategoryGroups
+  end # Controller
+end # Categories

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

@@ -12,8 +12,8 @@ labels:
   slug        : 'Slug'
 
 placeholders:
-  name : 'The name of the category'
-  slug : 'A URL friendly name of the category'
+  name : 'The name of the category.'
+  slug : 'A URL friendly name of the category.'
 
 messages:
   no_categories : 'No categories have been created yet.'

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

@@ -0,0 +1,39 @@
+---
+titles:
+  index: 'Categoriën'
+  edit : 'Categorie aanpassen'
+  new  : 'Categorie aanmaken'
+
+labels:
+  id         : '#'
+  name       : 'Naam'
+  description: 'Beschrijving'
+
+  # TODO: "Ouder" is a rather uncommon translation of the word "parent" when dealing with
+  # a hierarchy. It should be replaced with a better word once I find out which one to
+  # use.
+  parent: 'Ouder'
+  slug  : 'Slug'
+
+placeholders:
+  name: 'De naam van de categorie.'
+  slug: 'Een URL vriendelijke versie van de naam van de categorie.'
+
+messages:
+  no_categories: 'Er zijn nog geen categoriën aangemaakt.'
+
+success:
+  new   : 'De categorie is aangemaakt.'
+  save  : 'De categorie is aangepast.'
+  delete: 'De categorie is verwijderd.'
+
+errors:
+  new      : 'De categorie kon niet worden aangemaakt.'
+  save     : 'De categorie kon niet worden aangepast.'
+  delete   : 'De categorie met ID #%s kon niet worden verwijderd.'
+  no_delete: 'U moet ten minste 1 categorie specificeren om te verwijderen.'
+
+buttons:
+  new   : 'Categorie aanmaken'
+  save  : 'Categorie opslaan'
+  delete: 'Geselecteerde categoriën verwijderen'

data/lib/zen/package/categories/lib/categories/language/nl/category_groups.yml

@@ -0,0 +1,33 @@
+---
+titles:
+  index: 'Categorie groepen'
+  edit : 'Categorie groep aanpassen'
+  new  : 'Categorie groep aanmaken'
+
+labels:
+  id         : '#'
+  name       : 'Naam'
+  description: 'Beschrijving'
+  manage     : 'Categoriën beheren'
+
+placeholders:
+  name: 'De naam van de groep.'
+
+messages:
+  no_groups: 'Er zijn nog geen groepen aangemaakt.'
+
+success:
+  new   : 'De categorie groep is aangemaakt.'
+  save  : 'De categorie groep is aangepast.'
+  delete: 'De categorie groep is verwijderd.'
+
+errors:
+  new      : 'De categorie groep kon niet worden aangemaakt.'
+  save     : 'De categorie groep kon niet worden aangepast.'
+  delete   : 'De categorie groep met ID #%s kon niet worden verwijderd.'
+  no_delete: 'U moet ten minste 1 groep specificeren om te verwijderen.'
+
+buttons:
+  new   : 'Groep aanmaken'
+  save  : 'Groep opslaan'
+  delete: 'Geselecteerde groepen verwijderen'

data/lib/zen/package/categories/lib/categories/plugin/categories.rb

@@ -100,8 +100,8 @@ module Categories
 
           # Get all the categories according to our specified configuration options
           # and the category group that was retrieved earlier on.
-          categories = Category.filter(:category_group_id => category_group.id)
-            .limit(@options[:limit], @options[:offset])
+          categories = Category.filter(:category_group_id => category_group.id) \
+            .limit(@options[:limit], @options[:offset]) \
             .all
           
         # Retrieve the category for the specified ID or slug

data/lib/zen/package/comments/lib/comments.rb

@@ -2,6 +2,7 @@ require __DIR__('comments/model/comment.rb')
 require __DIR__('comments/controller/comments')
 require __DIR__('comments/controller/comments_form')
 require __DIR__('comments/plugin/comments')
+require __DIR__('comments/plugin/anti_spam')
 
 Zen::Language.options.paths.push(__DIR__('comments'))
 Zen::Language.load('comments')
@@ -10,12 +11,12 @@ Zen::Package.add do |p|
   p.name          = 'comments'
   p.author        = 'Yorick Peterse'
   p.url           = 'http://yorickpeterse.com/'
-  p.about         = "Allow users to post comments on any given section entry (as long as 
+  p.about         = "Allow users to post comments on any given section entry (as long as
 the section allows it)."
 
   p.directory     = __DIR__('comments')
   p.migration_dir = __DIR__('../migrations')
-  
+
   p.menu = [{
     :title => lang('comments.titles.index'),
     :url   => "admin/comments"
@@ -33,3 +34,31 @@ Zen::Plugin.add do |p|
   p.about   = 'Plugin that can be used to retrieve comments.'
   p.plugin  = Comments::Plugin::Comments
 end
+
+Zen::Plugin.add do |p|
+  p.name    = 'anti_spam'
+  p.author  = 'Yorick Peterse'
+  p.url     = 'http://yorickpeterse.com/'
+  p.about   = 'Plugin used for checking if a comment is spam or ham.'
+  p.plugin  = Comments::Plugin::AntiSpam
+end
+
+plugin(:settings, :register) do |setting|
+  setting.title       = lang('comments.labels.anti_spam_system')
+  setting.description = lang('comments.placeholders.anti_spam_system')
+  setting.name        = 'anti_spam_system'
+  setting.group       = 'security'
+  setting.type        = 'select'
+  setting.default     = 'defensio'
+  setting.values      = {
+    'defensio' => lang('comments.labels.defensio')
+  }
+end
+
+plugin(:settings, :register) do |setting|
+  setting.title       = lang('comments.labels.defensio_key')
+  setting.description = lang('comments.placeholders.defensio_key')
+  setting.name        = 'defensio_key'
+  setting.group       = 'security'
+  setting.type        = 'textbox'
+end

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

@@ -17,37 +17,37 @@ module Comments
       include ::Comments::Model
 
       map('/admin/comments')
-      
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Constructor method that pre-loads several variables and language files.
       # The following language files are loaded:
       #
       # * comments
-      # 
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
       def initialize
         super
-        
+
         @form_save_url   = Comments.r(:save)
         @form_delete_url = Comments.r(:delete)
-        
+
         Zen::Language.load('comments')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_s
           @page_title = lang("comments.titles.#{method}") rescue nil
         end
       end
-    
+
       ##
       # Shows an overview of all posted comments along with their status,
       # author and so on.
@@ -55,7 +55,7 @@ module Comments
       # This method requires the following permissions:
       #
       # * read
-      # 
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
@@ -63,12 +63,12 @@ module Comments
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('comments.titles.index'))
-        
+
         @comments = Comment.all
       end
-      
+
       ##
       # Edits an existing comment based on the ID.
       #
@@ -81,14 +81,13 @@ module Comments
       # @param  [Integer] id The ID of the comment to retrieve so that we can edit it.
       # @since  0.1
       #
-      def edit id
+      def edit(id)
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('comments.titles.index'), Comments.r(:index)), 
-          @page_title
+          anchor_to(lang('comments.titles.index'), Comments.r(:index)), @page_title
         )
 
         if flash[:form_data]
@@ -97,7 +96,7 @@ module Comments
           @comment = Comment[id.to_i]
         end
       end
-      
+
       ##
       # Saves a comment based on the current POST data. Note that this
       # method won't create a new comment as this can't be done using the backend.
@@ -113,29 +112,27 @@ module Comments
         if !user_authorized?([:update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         # Copy the POST data so we can work with it without messing things up
-        post     = request.params.dup
-        @comment = Comment[post['id'].to_i]
+        post = request.subset(
+          :user_id, :name, :website, :email, :comment, :status, :section_entry_id, :id
+        )
+
+        @comment = Comment[post['id']]
+
+        post.delete('id')
 
         begin
           @comment.update(post)
-          notification(
-            :success, 
-            lang('comments.titles.index'), 
-            lang('comments.success.save')
-          )
-        rescue
-          notification(
-            :error, 
-            lang('comments.titles.index'), 
-            lang('comments.errors.save')
-          )
-          
+          message(:success, lang('comments.success.save'))
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, lang('comments.errors.save'))
+
           flash[:form_errors] = @comment.errors
           flash[:form_data]   = @comment
         end
-        
+
         # Redirect the user to the proper page.
         if @comment.id
           redirect(Comments.r(:edit, @comment.id))
@@ -143,7 +140,7 @@ module Comments
           redirect_referrer
         end
       end
-      
+
       ##
       # Deletes a number of comments based on the comment IDs specified
       # in the POST array "comment_ids".
@@ -159,38 +156,26 @@ module Comments
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         # Obviously we'll require some IDs
         if !request.params['comment_ids'] or request.params['comment_ids'].empty?
-          notification(
-            :error, 
-            lang('comments.titles.index'),
-            lang('comments.errors.no_delete')
-          )
-
+          message(:error, lang('comments.errors.no_delete'))
           redirect_referrer
         end
-        
+
         # Delete each section
         request.params['comment_ids'].each do |id|
           begin
-            Comment[id.to_i].destroy
-            notification(
-              :success, 
-              lang('comments.titles.index'), 
-              lang('comments.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('comments.titles.index'), 
-              lang('comments.errors.delete') % id
-            )
+            Comment[id].destroy
+            message(:success, lang('comments.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('comments.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end 
-  end
-end
+    end # Comments
+  end # Controller
+end # Comments