zen 0.2.8 → 0.3b

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_method.rb

@@ -1,15 +1,13 @@
-#:nodoc:
 module CustomFields
   #:nodoc:
   module Model
     ##
     # Model for managing custom field methods.
     #
-    # @author Yorick Peterse
     # @since  0.2.8
     #
     class CustomFieldMethod < Sequel::Model
-    
+
     end # CustomFieldType
   end # Model
 end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_type.rb

@@ -1,31 +1,40 @@
-#:nodoc:
 module CustomFields
   #:nodoc:
   module Model
     ##
     # Model for managing custom field types.
     #
-    # @author Yorick Peterse
     # @since  0.2.8
     #
     class CustomFieldType < Sequel::Model
-      many_to_one(
-        :custom_field_method, 
+      include Zen::Model::Helper
+
+      many_to_one :custom_field_method,
         :class => 'CustomFields::Model::CustomFieldMethod'
-      )
+
+      ##
+      # Searches for a set of custom field types.
+      #
+      # @since  16-10-2011
+      # @param  [String] query The search query.
+      # @return [Mixed]
+      #
+      def self.search(query)
+        return filter(search_column(:custom_field_types__name, query)) \
+          .eager(:custom_field_method)
+      end
 
       ##
       # Returns a hash where the keys are the IDs of all custom field types and
       # the values the full language strings based on the value of the column
       # "language_string".
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @return [Hash]
       #
       def self.type_hash
         rows = {}
-        
+
         CustomFieldType.select(:id, :language_string).each do |row|
           rows[row.id] = lang(row.language_string)
         end
@@ -36,14 +45,15 @@ module CustomFields
       ##
       # Validates the model before inserting/updating the database record.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       #
       def validate
         validates_presence([:name, :language_string, :custom_field_method_id])
         validates_integer(:custom_field_method_id)
         validates_type(TrueClass, [:serialize, :allow_markup])
-        validates_format(/^[a-zA-Z\-_0-9]*/, [:html_class])
+        validates_format(/^[a-zA-Z\-_0-9\s]*$/, [:html_class])
+
+        validates_max_length(255, [:name, :language_string, :html_class])
       end
     end # CustomFieldType
   end # Model

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb

@@ -1,34 +1,27 @@
-#:nodoc:
 module CustomFields
   #:nodoc:
   module Model
     ##
-    # Model that represents a single custom field value. This model
-    # has the following relations:
+    # Model that represents a single custom field value.
     #
-    # * custom field (many to one)
-    # * section entry (many to one)
-    #
-    # This model is basically just a join table with some extra columns.
-    #
-    # @author Yorick Peterse
     # @since  0.1
     #
     class CustomFieldValue < Sequel::Model
-      many_to_one(:custom_field , :class => "CustomFields::Model::CustomField")
-      many_to_one(:section_entry, :class => "Sections::Model::SectionEntry")
+      many_to_one :custom_field , :class => 'CustomFields::Model::CustomField',
+        :eager => [:custom_field_type]
+
+      many_to_one :section_entry, :class => 'Sections::Model::SectionEntry'
 
       ##
       # Sets the value and serializes it based on the field type.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @param  [Mixed] value The value to store.
       #
       def value=(val)
         type = custom_field.custom_field_type
 
-        if !type.nil? and type.serialize === true
+        if !type.nil? and type.serialize == true
           val = [Marshal.dump(val)].pack('m')
         end
 
@@ -38,7 +31,6 @@ module CustomFields
       ##
       # Retrieves the value and optionally unserializes it.
       #
-      # @author Yorick Peterse
       # @since  0.2.8
       # @return [Mixed]
       #
@@ -46,12 +38,23 @@ module CustomFields
         val  = super
         type = custom_field.custom_field_type
 
-        if !type.nil? and type.serialize === true
+        if !type.nil? and type.serialize == true
           val = Marshal.load(val.unpack('m')[0]) rescue Marshal.load(val)
         end
 
         return val
       end
+
+      ##
+      # Retrieves the value of the custom field and converts it to the output
+      # based on the markup engine specified in the custom field.
+      #
+      # @since  0.3
+      # @return [String]
+      #
+      def html
+        return ::Zen::Markup.convert(custom_field.format, value)
+      end
     end # CustomFieldValue
   end # Model
 end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/form.xhtml

@@ -1,35 +1,35 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    #{
-    form_for(
-      @field_group, 
-      :method => :post, 
-      :action => CustomFields::Controller::CustomFieldGroups.r(:save), 
+
+    #{form_for(
+      @field_group,
+      :method => :post,
+      :action => CustomFields::Controller::CustomFieldGroups.r(:save),
       :id     => :custom_field_group_form
     ) do |f|
       f.input_hidden(:id        , @field_group.id)
       f.input_hidden(:csrf_token, get_csrf_token)
-      
+
       f.input_text(
-        lang('custom_field_groups.labels.name'), 
-        :name
+        lang('custom_field_groups.labels.name'),
+        :name,
+        :required  => :required,
+        :maxlength => 255
       )
-        
+
       f.textarea(
-        lang('custom_field_groups.labels.description'), 
-        :description, 
+        lang('custom_field_groups.labels.description'),
+        :description,
         :rows => 8
       )
-      
+
       f.g.div(:class => 'button') do
         f.g.input(
-          :type  => 'submit', 
+          :type  => 'submit',
           :value => lang('custom_field_groups.buttons.save')
         )
       end
-    end
-    }
-</article>
+    end}
+</section>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/index.xhtml

@@ -1,4 +1,8 @@
-<article>
+<section>
+    #{render_search_form(
+      ::CustomFields::Controller::CustomFieldGroups.r(:index)
+    )}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -7,12 +11,12 @@
     action="#{CustomFields::Controller::CustomFieldGroups.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
-        <?r if @field_groups and !@field_groups.empty? ?>
+        <?r if !@field_groups.empty? ?>
 
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_custom_field_group) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -22,9 +26,7 @@
                     <th>#{lang('custom_field_groups.labels.name')}</th>
                     <th>#{lang('custom_field_groups.labels.sections')}</th>
 
-                    <?r if user_authorized?(
-                      [:read], true, 'CustomFields::Controller::CustomFields'
-                    ) ?>
+                    <?r if user_authorized?(:show_custom_field) ?>
                     <th></th>
                     <?r end ?>
                 </tr>
@@ -32,7 +34,7 @@
             <tbody>
                 <?r @field_groups.each do |group| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete) ?>
                     <td>
                         <input type="checkbox" name="custom_field_group_ids[]"
                         value="#{group.id}" />
@@ -41,28 +43,31 @@
 
                     <td>#{group.id}</td>
 
-                    <?r if user_authorized?([:update]) ?>
+                    <?r if user_authorized?(:edit_custom_field_group) ?>
+
                     <td>
                         #{CustomFields::Controller::CustomFieldGroups.a(
                           group.name, :edit, group.id
                         )}
                     </td>
+
                     <?r else ?>
+
                     <td>#{group.name}</td>
+
                     <?r end ?>
 
                     <td>
-                        <?r sections = group.sections.map { |s| s.name } ?>
-                        <?r if !sections.empty? ?>
-                        #{sections.join(', ')}
-                        <?r else ?>
-                        #{lang('custom_field_groups.labels.none')}
-                        <?r end ?>
+                        #{sections = group.sections.map { |s| s.name }
+
+                        if sections.empty?
+                          lang('custom_field_groups.labels.none')
+                        else
+                          sections.join(', ')
+                        end}
                     </td>
 
-                    <?r if user_authorized?(
-                      [:read], true, 'CustomFields::Controller::CustomFields'
-                    ) ?>
+                    <?r if user_authorized?(:show_custom_field) ?>
                     <td>
                         #{CustomFields::Controller::CustomFields.a(
                           lang('custom_field_groups.labels.manage_fields'),
@@ -76,18 +81,18 @@
             </tbody>
         </table>
 
-        #{
-        if @field_groups.respond_to?(:navigation) \
+        #{if @field_groups.respond_to?(:navigation) \
         and @field_groups.page_count > 1
           @field_groups.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('custom_field_groups.messages.no_groups')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_custom_field_group) ?>
         <div class="button">
             #{CustomFields::Controller::CustomFieldGroups.a(
               lang('custom_field_groups.buttons.new'),
@@ -96,11 +101,12 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@field_groups.empty? ?>
+        <?r if user_authorized?(:delete_custom_field_group) \
+        and !@field_groups.empty? ?>
         <div class="button">
             <input type="submit"
             value="#{lang('custom_field_groups.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/form.xhtml

@@ -1,10 +1,9 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{
-    form_for(
+    #{form_for(
       @custom_field_type,
       :method => :post,
       :id     => :custom_field_type_form,
@@ -15,17 +14,23 @@
 
       f.input_text(
         lang('custom_field_types.labels.name'),
-        :name
+        :name,
+        :required  => :required,
+        :maxlength => 255
       )
 
       f.input_text(
         lang('custom_field_types.labels.language_string'),
-        :language_string
+        :language_string,
+        :required  => :required,
+        :maxlength => 255
       )
 
       f.input_text(
         lang('custom_field_types.labels.html_class'),
-        :html_class
+        :html_class,
+        :maxlength => 255,
+        :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
       )
 
       f.input_radio(
@@ -47,7 +52,8 @@
         :custom_field_method_id,
         :values   => @custom_field_methods,
         :size     => 1,
-        :selected => @custom_field_type.custom_field_method_id
+        :selected => @custom_field_type.custom_field_method_id,
+        :required => :required
       )
 
       f.g.div(:class => 'button') do
@@ -56,6 +62,5 @@
           :value => lang('custom_field_types.buttons.save')
         )
       end
-    end
-    }
-</article>
+    end}
+</section>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/index.xhtml

@@ -1,4 +1,8 @@
-<article>
+<section>
+    #{render_search_form(
+      ::CustomFields::Controller::CustomFieldTypes.r(:index)
+    )}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -12,7 +16,7 @@
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_custom_field_type) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -34,7 +38,7 @@
             <tbody>
                 <?r @field_types.each do |type| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_custom_field_type) ?>
                     <td>
                         <input type="checkbox" name="custom_field_type_ids[]"
                         id="custom_field_type_#{type.id}" value="#{type.id}" />
@@ -43,15 +47,15 @@
 
                     <td>#{type.id}</td>
                     <td>
-                        <?r if user_authorized?([:update]) ?>
-                        #{CustomFields::Controller::CustomFieldTypes.a(
-                          type.name,
-                          :edit,
-                          type.id
-                        )}
-                        <?r else ?>
-                        #{type.name}
-                        <?r end ?>
+                        #{if user_authorized?(:edit_custom_field_type)
+                          CustomFields::Controller::CustomFieldTypes.a(
+                            type.name,
+                            :edit,
+                            type.id
+                          )
+                        else
+                          type.name
+                        end}
                     </td>
                     <td>#{type.language_string}</td>
                     <td>#{type.html_class}</td>
@@ -63,18 +67,18 @@
             </tbody>
         </table>
 
-        #{
-        if @field_types.respond_to?(:navigation) \
+        #{if @field_types.respond_to?(:navigation) \
         and @field_types.page_count > 1
           @field_types.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('custom_field_types.messages.no_field_types')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_custom_field_type) ?>
         <div class="button">
             #{CustomFields::Controller::CustomFieldTypes.a(
               lang('custom_field_types.buttons.new'),
@@ -83,11 +87,12 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@field_types.empty? ?>
+        <?r if user_authorized?(:delete_custom_field_type) \
+        and !@field_types.empty? ?>
         <div class="button">
             <input type="submit"
             value="#{lang('custom_field_types.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>