zen 0.2.8 → 0.3b

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

@@ -1,70 +1,63 @@
-#:nodoc:
 module Sections
   #:nodoc:
   module Model
     ##
-    # Model that represents a singe section entry. This model has the following
-    # relations:
+    # Model that represents a singe section entry.
     #
-    # * comments (one to many)
-    # * custom field values (one to many), eager loads all custom fields
-    # * categories (many to many)
-    # * sections (many to one)
-    #
-    # The following plugins are loaded by this model
-    #
-    # * sluggable (source "title")
-    # * timestamps
-    #
-    # @author Yorick Peterse
     # @since  0.1
     #
     class SectionEntry < Sequel::Model
-      one_to_many(
-        :comments,
-        :class => "Comments::Model::Comment"
-      )
-
-      one_to_many(
-        :custom_field_values,
-        :class => "CustomFields::Model::CustomFieldValue",
+      include Zen::Model::Helper
+
+      one_to_many :comments,
+        :class => 'Comments::Model::Comment'
+
+      one_to_many :custom_field_values,
+        :class => 'CustomFields::Model::CustomFieldValue',
         :eager => [:custom_field]
-      )
 
-      many_to_one(
-        :user,
-        :class => "Users::Model::User"
-      )
+      many_to_one :user,
+        :class => 'Users::Model::User'
 
-      many_to_many(
-        :categories,
-        :class => "Categories::Model::Category"
-      )
+      many_to_many :categories,
+        :class => 'Categories::Model::Category'
 
-      many_to_one(
-        :section,
-        :class => "Sections::Model::Section"
-      )
+      many_to_one :section,
+        :class => 'Sections::Model::Section'
 
-      many_to_one(
-        :section_entry_status,
+      many_to_one :section_entry_status,
         :class => 'Sections::Model::SectionEntryStatus'
-      )
 
-      plugin(:sluggable , :source => :title     , :freeze => false)
-      plugin(:timestamps, :create => :created_at, :update => false)
+      plugin :sluggable , :source => :title     , :freeze => false
+      plugin :timestamps, :create => :created_at, :update => false
+
+      # A hash that will contain all the custom fields and the values of these
+      # fields for a single entry.
+      attr_accessor :fields
+
+      ##
+      # Searches for a set of section entries based on the specified search
+      # query.
+      #
+      # @since  16-10-2011
+      # @param  [String] query The search query.
+      # @return [Mixed]
+      #
+      def self.search(query)
+        return filter(search_column(:title, query))
+      end
 
       ##
       # Specify our validation rules.
       #
-      # @author Yorick Peterse
       # @since  0.1
       #
       def validate
         validates_presence([:title, :user_id])
-        validates_presence(:slug) unless new?
         validates_integer(:section_entry_status_id)
 
+        validates_max_length(255, [:title, :slug])
+
         # Check if the slug is unique for the current section
         if !SectionEntry \
         .filter({:slug => slug, :section_id => section_id}, ~{:id => id}) \
@@ -77,7 +70,6 @@ module Sections
       # Returns a hash containing all the entry statuses. The keys of this hash
       # are the IDs and the values the names.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @return [Hash]
       #
@@ -98,23 +90,24 @@ module Sections
       ##
       # Retrieves all custom fields for a section entry.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @return [Array]
       #
       def custom_fields
-        return CustomFields::Model::CustomField.select_all(
-          :custom_fields
-        ).join(
-          :custom_field_groups,
-          :custom_field_groups__id => :custom_fields__custom_field_group_id
-        ).join(
-          :custom_field_groups_sections,
-          :custom_field_groups_sections__custom_field_group_id \
-            => :custom_field_groups__id
-        ).filter(
-          :custom_field_groups_sections__section_id => section_id
-        ).all
+        return CustomFields::Model::CustomField.select_all(:custom_fields) \
+          .join(
+            :custom_field_groups,
+            :custom_field_groups__id => :custom_fields__custom_field_group_id
+          ) \
+          .join(
+            :custom_field_groups_sections,
+            :custom_field_groups_sections__custom_field_group_id \
+              => :custom_field_groups__id
+          ) \
+          .filter(
+            :custom_field_groups_sections__section_id => section_id
+          ) \
+          .all
       end
 
       ##
@@ -127,7 +120,6 @@ module Sections
       #  e = Sections::Model::SectionEntry[1]
       #  e.possible_categories # => {'Blog' => {1 => 'General', 2 => 'Code'}}
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @return [Hash]
       #
@@ -166,7 +158,6 @@ module Sections
       # values and returns them as a hash. This hash can be used in views to
       # build the HTML for all the fields.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @return [Hash]
       #
@@ -197,6 +188,9 @@ module Sections
         groups.each do |group|
           result[group.id] ||= {:name => group.name, :fields => []}
 
+          # Don't process the fields if there aren't any to begin with.
+          next unless fields.key?(group.id)
+
           fields[group.id].each do |field|
             m = field.custom_field_type.custom_field_method.name
 
@@ -218,7 +212,6 @@ module Sections
       ##
       # Hook that is executed before saving an existing section entry.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       #
       def before_save

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

@@ -3,11 +3,11 @@ module Sections
     ##
     # Model for managing the statuses of each section entry.
     #
-    # @author Yorick Peterse
     # @since  0.2.8
     #
     class SectionEntryStatus < Sequel::Model
-      many_to_one :section_entry, :class => 'Sections::Model::SectionEntryStatus' 
+      many_to_one :section_entry,
+        :class => 'Sections::Model::SectionEntryStatus'
     end # SectionEntryStatus
   end # Model
 end # Sections

data/lib/zen/package/sections/lib/sections/view/admin/form.xhtml

@@ -1,4 +1,4 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -25,8 +25,7 @@
         </ul>
     </div>
 
-    #{
-    form_for(
+    #{form_for(
       @section,
       :method => 'post',
       :action => Sections::Controller::Sections.r(:save),
@@ -38,12 +37,15 @@
       f.g.div(:id => 'general') do
         f.input_text(
           lang('sections.labels.name'),
-          :name
+          :name,
+          :required  => :required,
+          :maxlength => 255
         )
 
         f.input_text(
           lang('sections.labels.slug'),
-          :slug
+          :slug,
+          :maxlength => 255
         )
 
         f.textarea(
@@ -58,53 +60,54 @@
           lang('sections.labels.comment_allow'),
           :comment_allow,
           @section.comment_allow,
-          :values => @boolean_hash.invert
+          :values   => @boolean_hash.invert,
+          :required => :required
         )
 
         f.input_radio(
           lang('sections.labels.comment_require_account'),
           :comment_require_account,
           @section.comment_require_account,
-          :values => @boolean_hash.invert
+          :values   => @boolean_hash.invert,
+          :required => :required
         )
 
         f.input_radio(
           lang('sections.labels.comment_moderate'),
           :comment_moderate,
           @section.comment_moderate,
-          :values => @boolean_hash.invert
+          :values   => @boolean_hash.invert,
+          :required => :required
         )
 
         f.select(
           lang('sections.labels.comment_format'),
           :comment_format,
-          :values   => Zen::Plugin::Markup::Engines,
+          :values   => Zen::Markup.to_hash,
           :selected => @section.comment_format,
-          :size     => 1
+          :size     => 1,
+          :required => :required
         )
       end # f.g.div(:id => 'comments')
 
       f.g.div(:id => 'groups') do
-        f.select(
+        f.input_checkbox(
           lang('sections.labels.custom_field_groups'),
           :custom_field_group_pks,
-          :values   => @custom_field_group_pk_hash,
-          :multiple => :multiple,
-          :selected => @section.custom_field_group_pks
+          @section.custom_field_group_pks,
+          :values => @custom_field_group_pk_hash,
         )
 
-        f.select(
+        f.input_checkbox(
           lang('sections.labels.category_groups'),
           :category_group_pks,
-          :values   => @category_group_pk_hash,
-          :multiple => :multiple,
-          :selected => @section.category_group_pks
+          @section.category_group_pks,
+          :values => @category_group_pk_hash,
         )
       end # f.g.div(:id => 'groups')
 
       f.g.div(:class => 'button') do
         f.g.input(:type => 'submit', :value => lang('sections.buttons.save'))
       end
-    end
-    }
-</article>
+    end}
+</section>

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

@@ -1,4 +1,6 @@
-<article>
+<section>
+    #{render_search_form(Sections::Controller::Sections.r(:index))}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -11,7 +13,7 @@
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_section) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -22,9 +24,7 @@
                     <th>#{lang('sections.labels.slug')}</th>
                     <th>#{lang('sections.labels.comment_allow')}</th>
 
-                    <?r if user_authorized?(
-                      [:read], true, 'Sections::Controller::SectionEntries'
-                    ) ?>
+                    <?r if user_authorized?(:show_section_entry) ?>
                     <th></th>
                     <?r end ?>
                 </tr>
@@ -32,7 +32,7 @@
             <tbody>
                 <?r @sections.each do |section| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_section) ?>
                     <td>
                         <input type="checkbox" name="section_ids[]"
                         value="#{section.id}" />
@@ -41,24 +41,22 @@
 
                     <td>#{section.id}</td>
 
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{Sections::Controller::Sections.a(
-                          section.name, :edit, section.id
-                        )}
+                        #{if user_authorized?(:edit_section)
+                          Sections::Controller::Sections.a(
+                            section.name,
+                            :edit,
+                            section.id
+                          )
+                        else
+                          section.name
+                        end}
                     </td>
-                    <?r else ?>
-                    <td>#{section.name}</td>
-                    <?r end ?>
 
                     <td>#{section.slug}</td>
-                    <td>
-                        #{@boolean_hash[section.comment_allow]}
-                    </td>
+                    <td>#{@boolean_hash[section.comment_allow]}</td>
 
-                    <?r if user_authorized?(
-                      [:read], true, 'Sections::Controller::SectionEntries'
-                    ) ?>
+                    <?r if user_authorized?(:show_section_entry) ?>
                     <td>
                         #{Sections::Controller::SectionEntries.a(
                           lang('sections.labels.manage_entries'),
@@ -72,17 +70,17 @@
             </tbody>
         </table>
 
-        #{
-        if @sections.respond_to?(:navigation) and @sections.page_count > 1
+        #{if @sections.respond_to?(:navigation) and @sections.page_count > 1
           @sections.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('sections.messages.no_sections')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_section) ?>
         <div class="button">
             #{Sections::Controller::Sections.a(
               lang('sections.buttons.new'), :new
@@ -90,10 +88,10 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@sections.empty? ?>
+        <?r if user_authorized?(:delete_section) and !@sections.empty? ?>
         <div class="button">
             <input type="submit" value="#{lang('sections.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

data/lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml

@@ -1,4 +1,4 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -11,7 +11,7 @@
                 </a>
             </li>
             <li>
-                <a href="#categories" 
+                <a href="#categories"
                 title="#{lang('section_entries.tabs.categories')}">
                     #{lang('section_entries.tabs.categories')}
                 </a>
@@ -27,26 +27,28 @@
         </ul>
     </div>
 
-    #{
-      form_for(
-        @entry, 
-        :method => :post, 
-        :action => Sections::Controller::SectionEntries.r(:save), 
+    #{form_for(
+        @entry,
+        :method => :post,
+        :action => Sections::Controller::SectionEntries.r(:save),
         :id     => :section_entry_form
       ) do |f|
         f.input_hidden(:csrf_token, get_csrf_token)
         f.input_hidden(:section_id, @section_id)
         f.input_hidden(:id        , @entry.id)
-        
+
         f.g.div(:id => :basic) do
           f.input_text(
-            lang('section_entries.labels.title'), 
-            :title
+            lang('section_entries.labels.title'),
+            :title,
+            :required  => :required,
+            :maxlength => 255
           )
 
           f.input_text(
-            lang('section_entries.labels.slug'), 
-            :slug
+            lang('section_entries.labels.slug'),
+            :slug,
+            :maxlength => 255
           )
 
           # Only show the date field when modifying an existing entry
@@ -57,31 +59,32 @@
               :class => 'date'
             )
           end
-        
+
           f.select(
-            lang('section_entries.labels.author'), 
-            :user_id, 
-            :values => ::Users::Model::User.pk_hash(:name)
+            lang('section_entries.labels.author'),
+            :user_id,
+            :values   => ::Users::Model::User.pk_hash(:name),
+            :size     => 1,
+            :required => :required
           )
-          
+
           f.select(
-            lang('section_entries.labels.status'), 
-            :section_entry_status_id, 
+            lang('section_entries.labels.status'),
+            :section_entry_status_id,
             :values   => ::Sections::Model::SectionEntry.status_hash,
-            :selected => @entry.section_entry_status_id, 
+            :selected => @entry.section_entry_status_id,
             :size     => 1
           )
         end
-        
+
         f.g.div(:id => :categories) do
           if !@possible_categories.empty?
             @possible_categories.each do |group, categories|
-              f.select(
-                group, 
-                :category_pks, 
-                :values   => categories, 
-                :multiple => :multiple,
-                :selected => @entry.category_pks
+              f.input_checkbox(
+                group,
+                :category_pks,
+                @entry.category_pks,
+                :values => categories.invert,
               )
             end
           else
@@ -100,10 +103,9 @@
 
         f.g.div(:class => 'button') do
           f.g.input(
-            :type  => 'submit', 
+            :type  => 'submit',
             :value => lang('section_entries.buttons.save')
           )
         end
-      end
-      }
-</article>
+      end}
+</section>