zen 0.3 → 0.4

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

@@ -27,7 +27,6 @@ module Ramaze
       ##
       # Validates a section entry and returns it if it's valid.
       #
-      #
       # @since  0.2.8
       # @param  [Fixnum] section_entry_id The ID of the section entry to
       #  validate.
@@ -45,6 +44,50 @@ module Ramaze
           return entry
         end
       end
+
+      ##
+      # Creates or updates a set of custom fields for a given section entry.
+      #
+      # @since 17-02-2012
+      # @param [Sections::Model::SectionEntry] entry The entry for which to
+      #  create or update the fields.
+      # @return [Hash] Hash containing any errors for the custom fields.
+      #
+      def process_custom_fields(entry)
+        request.params.delete('id')
+
+        field_values = {}
+        field_errors = {}
+
+        entry.custom_field_values.each do |value|
+          field_values[value.custom_field_id] = value
+        end
+
+        entry.custom_fields.each do |field|
+          key = "custom_field_value_#{field.id}"
+
+          if field.required \
+          and (request.POST[key].nil? or request.POST[key].empty?)
+            field_errors[:"custom_field_value_#{field.id}"] = \
+              lang('zen_models.presence')
+
+            next
+          end
+
+          next unless request.POST.key?(key)
+
+          if field_values.key?(field.id)
+            field_values[field.id].update(:value => request.POST[key])
+          else
+            entry.add_custom_field_value(
+              :custom_field_id => field.id,
+              :value           => request.POST[key]
+            )
+          end
+        end
+
+        return field_errors
+      end
     end # Section
   end # Helper
 end # Ramaze

data/lib/zen/package/sections/lib/sections/language/en/section_entries.rb

@@ -46,5 +46,7 @@ Zen::Language::Translation.add do |trans|
     t['permissions.edit']   = 'Edit section entry'
     t['permissions.new']    = 'Add section entry'
     t['permissions.delete'] = 'Delete section entry'
+
+    t['widgets.titles.recent_entries'] = 'Recent Entries'
   end
 end

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

@@ -46,5 +46,7 @@ Zen::Language::Translation.add do |trans|
     t['permissions.edit']   = 'Sectie item aanpassen'
     t['permissions.new']    = 'Sectie item aanmaken'
     t['permissions.delete'] = 'Sectie item verwijderen'
+
+    t['widgets.titles.recent_entries'] = 'Recente sectie items'
   end
 end

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

@@ -4,11 +4,34 @@ module Sections
     ##
     # Model that represents a single section.
     #
-    # @since  0.1
+    # @since 0.1
+    # @event before_new_section
+    # @event after_new_section
+    # @event before_edit_section
+    # @event after_edit_section
+    # @event before_delete_section
+    # @event after_delete_section
     #
     class Section < Sequel::Model
       include Zen::Model::Helper
 
+      ##
+      # Array containing all the columns that can be set by the user.
+      #
+      # @since 17-02-2012
+      #
+      COLUMNS = [
+        :name,
+        :slug,
+        :description,
+        :comment_allow,
+        :comment_require_account,
+        :comment_moderate,
+        :comment_format,
+        :custom_field_group_pks,
+        :category_group_pks
+      ]
+
       one_to_many :section_entries,
         :class => 'Sections::Model::SectionEntry',
         :eager => [:custom_field_values, :section_entry_status]
@@ -21,6 +44,19 @@ module Sections
 
       plugin :sluggable, :source => :name, :freeze => false
 
+      plugin :association_dependencies,
+        :section_entries     => :delete,
+        :custom_field_groups => :nullify,
+        :category_groups     => :nullify
+
+      plugin :events,
+        :before_create  => :before_new_section,
+        :after_create   => :after_new_section,
+        :before_update  => :before_edit_section,
+        :after_update   => :after_edit_section,
+        :before_destroy => :before_delete_section,
+        :after_destroy  => :after_delete_section
+
       ##
       # Searches for a number of sections of which the title or description
       # matches the search query.
@@ -61,6 +97,17 @@ module Sections
 
         validates_unique(:slug)
       end
+
+      ##
+      # Hook that is executed before creating or saving an object.
+      #
+      # @since 03-01-2012
+      #
+      def before_save
+        sanitize_fields([:name, :slug, :description, :comment_format])
+
+        super
+      end
     end # Section
   end # Model
 end # Sections

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

@@ -4,11 +4,32 @@ module Sections
     ##
     # Model that represents a singe section entry.
     #
-    # @since  0.1
+    # @since 0.1
+    # @event before_new_section_entry
+    # @event after_new_section_entry
+    # @event before_edit_section_entry
+    # @event after_edit_section_entry
+    # @event before_delete_section_entry
+    # @event after_delete_section_entry
     #
     class SectionEntry < Sequel::Model
       include Zen::Model::Helper
 
+      ##
+      # Array containing all the columns that can be set by the user.
+      #
+      # @since 17-02-2012
+      #
+      COLUMNS = [
+        :title,
+        :created_at,
+        :section_id,
+        :user_id,
+        :slug,
+        :section_entry_status_id,
+        :category_pks
+      ]
+
       one_to_many :comments,
         :class => 'Comments::Model::Comment'
 
@@ -29,7 +50,23 @@ module Sections
         :class => 'Sections::Model::SectionEntryStatus'
 
       plugin :sluggable , :source => :title     , :freeze => false
-      plugin :timestamps, :create => :created_at, :update => false
+      plugin :timestamps, :create => :created_at, :update => :updated_at
+
+      plugin :association_dependencies,
+        :comments            => :delete,
+        :custom_field_values => :delete
+
+      plugin :events,
+        :before_create  => :before_new_section_entry,
+        :after_create   => :after_new_section_entry,
+        :before_update  => :before_edit_section_entry,
+        :after_update   => :after_edit_section_entry,
+        :before_destroy => :before_delete_section_entry,
+        :after_destroy  => :after_delete_section_entry
+
+      # String containing the date format to use for the created_at field when
+      # rendering the form.
+      DATE_FORMAT = '%Y-%m-%d %H:%M'
 
       # A hash that will contain all the custom fields and the values of these
       # fields for a single entry.
@@ -196,9 +233,7 @@ module Sections
 
             begin
               result[group.id][:fields].push(
-                CustomFields::BlueFormParameters.send(
-                  m, field, values[field.id]
-                )
+                CustomFields::BlueFormParameters.send(m, field, values[field.id])
               )
             rescue => e
               Ramaze::Log.error(e)
@@ -209,12 +244,27 @@ module Sections
         return result
       end
 
+      ##
+      # Returns a string containing the name of the entry's status in the
+      # currently used language.
+      #
+      # @since  17-12-2011
+      # @return [String]
+      #
+      def status_name
+        return lang(
+          'section_entries.special.status_hash.%s' % section_entry_status.name
+        )
+      end
+
       ##
       # Hook that is executed before saving an existing section entry.
       #
       # @since  0.2.8
       #
       def before_save
+        sanitize_fields([:title, :slug])
+
         if self.section_entry_status_id.nil?
           self.section_entry_status_id = ::Sections::Model::SectionEntryStatus[
             :name => 'draft'

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

@@ -8,6 +8,8 @@ module Sections
     class SectionEntryStatus < Sequel::Model
       many_to_one :section_entry,
         :class => 'Sections::Model::SectionEntryStatus'
+
+      plugin :association_dependencies, :section_entry => :delete
     end # SectionEntryStatus
   end # Model
 end # Sections

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

@@ -6,12 +6,13 @@
     <div class="tabs">
         <ul>
             <li>
-                <a href="#basic" title="#{lang('section_entries.tabs.basic')}">
+                <a href="#basic" class="icon edit"
+                title="#{lang('section_entries.tabs.basic')}">
                     #{lang('section_entries.tabs.basic')}
                 </a>
             </li>
             <li>
-                <a href="#categories"
+                <a href="#categories" class="icon categories"
                 title="#{lang('section_entries.tabs.categories')}">
                     #{lang('section_entries.tabs.categories')}
                 </a>
@@ -27,85 +28,93 @@
         </ul>
     </div>
 
-    #{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)
+    <div class="body">
+        #{form_for(
+          @entry,
+          :method              => :post,
+          :action              => Sections::Controller::SectionEntries.r(:save),
+          :id                  => :section_entry_form,
+          :'data-autosave-url' => Sections::Controller::SectionEntries \
+            .r(:autosave)
+        ) 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,
-            :required  => :required,
-            :maxlength => 255
-          )
-
-          f.input_text(
-            lang('section_entries.labels.slug'),
-            :slug,
-            :maxlength => 255
-          )
-
-          # Only show the date field when modifying an existing entry
-          if !@entry.nil?
+          f.g.div(:id => :basic) do
             f.input_text(
-              lang('section_entries.labels.created_at'),
-              :created_at,
-              :class => 'date'
+              lang('section_entries.labels.title'),
+              :title,
+              :required  => :required,
+              :maxlength => 255
             )
-          end
 
-          f.select(
-            lang('section_entries.labels.author'),
-            :user_id,
-            :values   => ::Users::Model::User.pk_hash(:name),
-            :size     => 1,
-            :required => :required
-          )
+            f.input_text(
+              lang('section_entries.labels.slug'),
+              :slug,
+              :maxlength => 255
+            )
 
-          f.select(
-            lang('section_entries.labels.status'),
-            :section_entry_status_id,
-            :values   => ::Sections::Model::SectionEntry.status_hash,
-            :selected => @entry.section_entry_status_id,
-            :size     => 1
-          )
-        end
+            # Only show the date field when modifying an existing entry
+            if @entry.exists?
+              format = Sections::Model::SectionEntry::DATE_FORMAT
 
-        f.g.div(:id => :categories) do
-          if !@possible_categories.empty?
-            @possible_categories.each do |group, categories|
-              f.input_checkbox(
-                group,
-                :category_pks,
-                @entry.category_pks,
-                :values => categories.invert,
+              f.input_text(
+                lang('section_entries.labels.created_at'),
+                :created_at,
+                :class => 'date',
+                :value => @entry.created_at.strftime(format),
+                :'data-date-format' => format,
+                :'data-date-time'   => true,
               )
             end
-          else
-            f.g.p(lang('section_entries.messages.no_categories'))
+
+            f.select(
+              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,
+              :values   => ::Sections::Model::SectionEntry.status_hash,
+              :selected => @entry.section_entry_status_id,
+              :size     => 1
+            )
           end
-        end
 
-        # Display all the custom fields for this entry
-        @custom_fields_hash.each do |id, group|
-          f.g.div(:id => "group_#{id}") do
-            group[:fields].each do |field|
-              f.send(*field)
+          f.g.div(:id => :categories) do
+            if !@possible_categories.empty?
+              @possible_categories.each do |group, categories|
+                f.input_checkbox(
+                  group,
+                  :category_pks,
+                  @entry.category_pks,
+                  :values => categories.invert,
+                )
+              end
+            else
+              f.g.p(lang('section_entries.messages.no_categories'))
+            end
+          end
+
+          # Display all the custom fields for this entry
+          @custom_fields_hash.each do |id, group|
+            f.g.div(:id => "group_#{id}") do
+              group[:fields].each do |field|
+                f.send(*field)
+              end
             end
           end
-        end
 
-        f.g.div(:class => 'button') do
           f.g.input(
             :type  => 'submit',
-            :value => lang('section_entries.buttons.save')
+            :value => lang('section_entries.buttons.save'),
+            :class => 'button'
           )
-        end
-      end}
+        end}
+    </div>
 </section>

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

@@ -1,95 +1,90 @@
 <section>
-    #{render_search_form(
-      ::Sections::Controller::SectionEntries.r(:index, @section_id)
-    )}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
+
+        #{render_search_form(
+          ::Sections::Controller::SectionEntries.r(:index, @section_id)
+        )}
     </header>
 
-    <form method="post"
-    action="#{Sections::Controller::SectionEntries.r(:delete)}">
-        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+    <div class="body">
+        <form method="post"
+        action="#{Sections::Controller::SectionEntries.r(:delete)}">
+            <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
-        <?r if !@entries.empty? ?>
+            <?r if !@entries.empty? ?>
 
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_section_entry) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_section_entry) ?>
+                        <th class="no_sort">
+                            <input type="checkbox" />
+                        </th>
+                        <?r end ?>
 
-                    <th>#{lang('section_entries.labels.id')}</th>
-                    <th>#{lang('section_entries.labels.title')}</th>
-                    <th>#{lang('section_entries.labels.slug')}</th>
-                    <th>#{lang('section_entries.labels.status')}</th>
-                    <th>#{lang('section_entries.labels.created_at')}</th>
-                    <th>#{lang('section_entries.labels.updated_at')}</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?r @entries.each do |entry| ?>
-                <tr>
-                    <?r if user_authorized?(:delete_section_entry) ?>
-                    <td>
-                        <input type="checkbox" name="section_entry_ids[]"
-                        value="#{entry.id}" />
-                    </td>
-                    <?r end ?>
+                        <th>#{lang('section_entries.labels.id')}</th>
+                        <th>#{lang('section_entries.labels.title')}</th>
+                        <th>#{lang('section_entries.labels.slug')}</th>
+                        <th>#{lang('section_entries.labels.status')}</th>
+                        <th>#{lang('section_entries.labels.created_at')}</th>
+                        <th>#{lang('section_entries.labels.updated_at')}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?r @entries.each do |entry| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete_section_entry) ?>
+                        <td>
+                            <input type="checkbox" name="section_entry_ids[]"
+                            value="#{entry.id}" />
+                        </td>
+                        <?r end ?>
 
-                    <td>#{entry.id}</td>
+                        <td>#{entry.id}</td>
+
+                        <td>
+                            #{if user_authorized?(:edit_section_entry)
+                              edit_link(
+                                Sections::Controller::SectionEntries.r(
+                                  :edit,
+                                  @section_id,
+                                  entry.id
+                                ),
+                                entry.title
+                              )
+                            else
+                              entry.title
+                            end}
+                        </td>
+
+                        <td>#{entry.slug}</td>
+                        <td>#{entry.status_name}</td>
+                        <td>#{format_date(entry.created_at)}</td>
+                        <td>#{format_date(entry.updated_at)}</td>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
 
-                    <td>
-                        #{if user_authorized?(:edit_section_entry)
-                          Sections::Controller::SectionEntries.a(
-                            entry.title,
-                            :edit,
-                            @section_id,
-                            entry.id
-                          )
-                        else
-                          entry.title
-                        end}
-                    </td>
+            #{render_pagination(@entries)}
 
-                    <td>#{entry.slug}</td>
-                    <td>
-                        #{lang(
-                        "section_entries.special.status_hash.#{entry. \
-                          section_entry_status.name}"
-                        )}
-                    </td>
-                    <td>#{format_date(entry.created_at)}</td>
-                    <td>#{format_date(entry.updated_at)}</td>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
+            <?r else ?>
 
-        #{if @entries.respond_to?(:navigation) and @entries.page_count > 1
-          @entries.navigation
-        end}
+            <p>#{lang('section_entries.messages.no_entries')}</p>
 
-        <?r else ?>
-        <p>#{lang('section_entries.messages.no_entries')}</p>
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:new_section_entry) ?>
-        <div class="button">
-            #{Sections::Controller::SectionEntries.a(
-              lang('section_entries.buttons.new'), :new, @section_id
+            <?r if user_authorized?(:new_section_entry) ?>
+            #{new_button(
+              Sections::Controller::SectionEntries.r(:new, @section_id),
+              lang('section_entries.buttons.new')
             )}
-        </div>
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:delete_section_entry) and !@entries.empty? ?>
-        <div class="button">
-            <input type="submit"
-            value="#{lang('section_entries.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:delete_section_entry) and !@entries.empty? ?>
+            #{delete_button(lang('section_entries.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>