zen 0.2.5 → 0.2.6

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

@@ -17,14 +17,17 @@ module Sections
     class Sections < Zen::Controller::AdminController
       include ::Sections::Model
 
-      map('/admin')
-      
+      map '/admin'
+
+      # Load all required Javascript files
+      javascript ['zen/tabs']
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Constructor method, called upon initialization. It's used to set the
       # URL to which forms send their data and load the language pack.
@@ -38,19 +41,19 @@ module Sections
       #
       def initialize
         super
-        
+
         @form_save_url   = Sections.r(:save)
         @form_delete_url = Sections.r(:delete)
-        
+
         Zen::Language.load('sections')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
           @page_title = lang("sections.titles.#{method}") rescue nil
         end
       end
-    
+
       ##
       # Show an overview of all existing sections. Using this overview a user
       # can manage an existing section, delete it or create a new one.
@@ -58,7 +61,7 @@ module Sections
       # This method requires the following permissions:
       #
       # * read
-      # 
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
@@ -66,12 +69,12 @@ module Sections
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('sections.titles.index'))
-        
+
         @sections = Section.all
       end
-      
+
       ##
       # Show a form that lets the user edit an existing section.
       #
@@ -84,16 +87,16 @@ module Sections
       # @param  [Integer] id The ID of the section 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('sections.titles.index'), Sections.r(:index)), 
+          anchor_to(lang('sections.titles.index'), Sections.r(:index)),
           @page_title
         )
-        
+
         @custom_field_group_pk_hash = CustomFields::Model::CustomFieldGroup.pk_hash(:name)
         @category_group_pk_hash     = Categories::Model::CategoryGroup.pk_hash(:name)
 
@@ -103,7 +106,7 @@ module Sections
           @section = Section[id.to_i]
         end
       end
-      
+
       ##
       # Show a form that lets the user create a new section.
       #
@@ -119,17 +122,17 @@ module Sections
         if !user_authorized?([:create, :read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('sections.titles.index'), Sections.r(:index)), 
+          anchor_to(lang('sections.titles.index'), Sections.r(:index)),
           @page_title
         )
-        
+
         @custom_field_group_pk_hash = CustomFields::Model::CustomFieldGroup.pk_hash(:name)
         @category_group_pk_hash     = Categories::Model::CategoryGroup.pk_hash(:name)
         @section                    = Section.new
       end
-      
+
       ##
       # Method used for processing the form data and redirecting the user back to
       # the proper URL. Based on the value of a hidden field named "id" we'll determine
@@ -147,8 +150,11 @@ module Sections
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        post = request.params.dup
+
+        post = request.subset(
+          :id, :name, :slug, :description, :comment_allow, :comment_require_account,
+          :comment_moderate, :comment_format, :custom_field_group_pks, :category_group_pks
+        )
 
         if post['id'] and !post['id'].empty?
           @section      = Section[post['id']]
@@ -157,49 +163,47 @@ module Sections
           @section      = Section.new
           save_action   = :new
         end
-        
+
         flash_success = lang("sections.success.#{save_action}")
         flash_error   = lang("sections.errors.#{save_action}")
-        
+
+
+        post['custom_field_group_pks'] ||= []
+        post['category_group_pks']     ||= []
+
         # The primary keys have to be integers otherwise Sequel will soil it's pants
-        if !post['custom_field_group_pks'].nil?
-          post['custom_field_group_pks'].map! { |value| value.to_i }
-        else
-          post['custom_field_group_pks'] = []
-        end
-        
-        if !post['category_group_pks'].nil?
-          post['category_group_pks'].map! { |value| value.to_i }
-        else
-          post['category_group_pks'] = [] 
+        ['custom_field_group_pks', 'category_group_pks'].each do |k|
+          post[k].map! { |value| value.to_i }
         end
 
         # Auto generate the slug if it's empty
         post.delete('slug') if post['slug'].empty?
-        
+        post.delete('id')
+
         begin
           @section.update(post)
-          
+
           if save_action == :new
             @section.custom_field_group_pks = post['custom_field_group_pks']
             @section.category_group_pks     = post['category_group_pks']
           end
-          
-          notification(:success, lang('sections.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('sections.titles.index'), flash_error)
-          
+
+          message(:success, flash_success)
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
+
           flash[:form_data]   = @section
           flash[:form_errors] = @section.errors
         end
-        
+
         if @section.id
           redirect(Sections.r(:edit, @section.id))
         else
           redirect_referrer
         end
       end
-      
+
       ##
       # Delete an existing section. Poor section, what did he do wrong?
       # In order to delete a section you'll need to send a POST request that contains
@@ -217,36 +221,24 @@ module Sections
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        if !request.params['section_ids'] or request.params['section_ids'].empty?
-          notification(
-            :error, 
-            lang('sections.titles.index'), 
-            lang('sections.errors.no_delete')
-          )
 
+        if !request.params['section_ids'] or request.params['section_ids'].empty?
+          message(:error, lang('sections.errors.no_delete'))
           redirect_referrer
         end
-        
+
         request.params['section_ids'].each do |id|
           begin
             Section[id.to_i].destroy
-            notification(
-              :success, 
-              lang('sections.titles.index'), 
-              lang('sections.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('sections.titles.index'), 
-              lang('sections.errors.delete') % id
-            )
+            message(:success, lang('sections.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('sections.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end 
-  end
-end
+    end # Sections
+  end # Controller
+end # Sections

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

@@ -45,4 +45,3 @@ buttons:
   new     : 'Add section'
   delete  : 'Delete selected sections'
   save    : 'Save section'
-

data/lib/zen/package/sections/lib/sections/language/nl/section_entries.yml

@@ -0,0 +1,43 @@
+---
+titles:
+  index: 'Sectie items'
+  edit : 'Sectie item aanpassen'
+  new  : 'Sectie item aanmaken'
+
+labels:
+  id        : '#'
+  title     : 'Titel'
+  slug      : 'Slug'
+  status    : 'Status'
+  created_at: 'Aanmaak datum'
+  updated_at: 'Aanpas datum'
+  author    : 'Auteur'
+
+special:
+  status_hash:
+    draft    : 'Voorbeeld'
+    published: 'Gepubliceerd'
+
+tabs:
+  basic     : 'Algemeen'
+  categories: 'Categoriën'
+
+messages:
+  no_entries   : 'Er zijn nog geen items aangemaakt.'
+  no_categories: 'De huidige sectie bevat geen categoriën.'
+
+success:
+  new   : 'Het sectie item is aangemaakt.'
+  save  : 'Het sectie item is aangepast.'
+  delete: 'Alle geselecteerde items zijn verwijderd.'
+
+errors:
+  new      : 'Het sectie item kon niet worden aangemaakt.'
+  save     : 'Het sectie item kon niet worden aangepast.'
+  delete   : 'Het sectie item met ID #%s kon niet worden verwijderd.'
+  no_delete: 'U moet ten minste 1 item specificeren om te verwijderen.'
+
+buttons:
+  new   : 'Sectie item toevoegen'
+  save  : 'Sectie item opslaan'
+  delete: 'Geselecteerde items verwijderen'

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

@@ -0,0 +1,47 @@
+---
+titles:
+  index: 'Secties'
+  edit : 'Sectie aanpassen'
+  new  : 'Sectie toevoegen'
+
+labels:
+  id                     : '#'
+  name                   : 'Naam'
+  slug                   : 'Slug'
+  description            : 'Beschrijving'
+  comment_allow          : 'Reacties toegestaan'
+  comment_require_account: 'Reacties vereisen een account'
+  comment_moderate       : 'Beheer reacties'
+  comment_format         : 'Text opmaak'
+  custom_field_groups    : 'Veld groepen'
+  category_groups        : 'Categorie groepen'
+  manage_entries         : 'Beheer items'
+
+special:
+  boolean_hash:
+    'true' : 'Ja'
+    'false': 'Nee'
+
+tabs:
+  general          : 'Algemeen'
+  comment_settings : 'Reactie instellingen'
+  group_assignments: 'Groepen'
+
+messages:
+  no_sections: 'Er zijn nog geen secties aangemaakt.'
+
+success:
+  new   : 'De sectie is aangemaakt.'
+  save  : 'De sectie is aangepast.'
+  delete: 'Alle geselecteerde secties zijn verwijderd.'
+
+errors:
+  new      : 'De sectie kon niet worden aangemaakt.'
+  save     : 'De sectie kon niet worden aangepast.'
+  delete   : 'De sectie met ID #%s kon niet worden verwijderd.'
+  no_delete: 'U moet ten minste 1 sectie specificeren om te verwijderen.'
+
+buttons:
+  new   : 'Sectie toevoegen'
+  save  : 'Sectie opslaan'
+  delete: 'Geselecteerde secties verwijderen'

data/lib/zen/package/sections/lib/sections/model/section.rb

@@ -24,15 +24,8 @@ module Sections
         :eager => [:custom_field_values]
       )
       
-      many_to_many(
-        :custom_field_groups, 
-        :class => "CustomFields::Model::CustomFieldGroup"
-      )
-
-      many_to_many(
-        :category_groups,
-        :class => "Categories::Model::CategoryGroup"
-      )
+      many_to_many(:custom_field_groups, :class => "CustomFields::Model::CustomFieldGroup")
+      many_to_many(:category_groups, :class => "Categories::Model::CategoryGroup")
 
       plugin(:sluggable, :source => :name, :freeze => false)
       
@@ -43,9 +36,12 @@ module Sections
       # @since  0.1
       #
       def validate
-        validates_presence([
-          :name, :comment_allow, :comment_require_account, :comment_moderate, :comment_format
-        ])
+        validates_presence(
+          [
+            :name, :comment_allow, :comment_require_account, :comment_moderate, 
+            :comment_format
+          ]
+        )
 
         validates_presence(:slug) unless new?
         validates_max_length(255, [:name, :slug])
@@ -57,6 +53,6 @@ module Sections
         
         validates_unique(:slug)
       end
-    end
-  end
-end
+    end # Section
+  end # Model
+end # Sections

data/lib/zen/package/sections/lib/sections/model/section_entry.rb

@@ -20,7 +20,6 @@ module Sections
     # @since  0.1
     #
     class SectionEntry < Sequel::Model
-
       one_to_many(:comments, :class => "Comments::Model::Comment")
 
       one_to_many(
@@ -45,8 +44,13 @@ module Sections
       def validate
         validates_presence([:title, :status, :user_id])
         validates_presence(:slug) unless new?
-      end
 
-    end
-  end
-end
+        # Check if the slug is unique for the current section
+        if !SectionEntry.filter({:slug => slug, :section_id => section_id}, ~{:id => id}) \
+          .all.empty?
+          errors.add(:slug, lang('zen_models.unique'))
+        end
+      end
+    end # SectionEntry
+  end # Model
+end # Sections

data/lib/zen/package/sections/lib/sections/plugin/section_entries.rb

@@ -143,9 +143,9 @@ module Sections
         end
 
         # Get the entries
-        entries = SectionEntry.filter(filter_hash)
-          .eager(*eager_models)
-          .limit(@options[:limit], @options[:offset])
+        entries = SectionEntry.filter(filter_hash) \
+          .eager(*eager_models) \
+          .limit(@options[:limit], @options[:offset]) \
           .all
 
         comment_format = nil
@@ -177,7 +177,7 @@ module Sections
           # Get all the comments if the developer wants them
           if @options[:comments] === true
             entry.comments.each do |c|
-              comment        = c.values
+              comment = c.values
 
               if c.user
                 comment[:user] = c.user.values
@@ -218,7 +218,6 @@ module Sections
 
         return entries
       end
-
-    end
-  end
-end
+    end # SectionEntries
+  end # Plugin
+end # Sections

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

@@ -79,7 +79,6 @@ module Sections
 
         return sections
       end
-
-    end
-  end
-end
+    end # Sections
+  end # Plugin
+end # Sections