zen 0.2.7 → 0.2.8

data/lib/zen/package/custom_fields/lib/custom_fields/helper/custom_field.rb

@@ -0,0 +1,79 @@
+#:nodoc:
+module Ramaze
+  #:nodocL
+  module Helper
+    ##
+    # Helper for the custom fields package.
+    #
+    # @author Yorick Peterse
+    # @since  0.2.8
+    #
+    module CustomField
+      ##
+      # Validates a custom field group and returns the object if it's valid.
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      # @param  [Fixnum] custom_field_group_id An ID of a custom field group
+      # that has to be validated.
+      # @return [CustomFields::Model::CustomFieldGroup]
+      #
+      def validate_custom_field_group(custom_field_group_id)
+        group = ::CustomFields::Model::CustomFieldGroup[custom_field_group_id]
+
+        if group.nil?
+          message(:error, lang('custom_field_groups.errors.invalid_group'))
+          redirect(::CustomFields::Controller::CustomFieldGroups.r(:index))
+        else
+          return group
+        end
+      end
+
+      ##
+      # Similar to validate_custom_field_group() this method validates a single
+      # custom field and returns it if it's valid.
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      # @param  [Fixnum] custom_field_id The ID of the custom field to validate.
+      # @param  [Fixnum] custom_field_group_id The ID of the field group the
+      # field is supposed to belong to.
+      # @return [CustomFields::Model::CustomField]
+      #
+      def validate_custom_field(custom_field_id, custom_field_group_id)
+        field = ::CustomFields::Model::CustomField[custom_field_id]
+
+        if field.nil?
+          message(:error, lang('custom_fields.errors.invalid_field'))
+          redirect(
+            ::CustomFields::Controller::CustomFields.r(
+              :index, custom_field_group_id
+            )
+          )
+        else
+          return field
+        end
+      end
+      
+      ##
+      # Validates a custom field type and returns it if it's valid.
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      # @param  [Fixnum] custom_field_type_id The ID of the field type to
+      # validate.
+      # @return [CustomFields::Model::CustomFieldType]
+      #
+      def validate_custom_field_type(custom_field_type_id)
+        type = ::CustomFields::Model::CustomFieldType[custom_field_type_id]
+
+        if type.nil?
+          message(:error, lang('custom_field_types.errors.invalid_type'))
+          redirect(::CustomFields::Controller::CustomFieldTypes.r(:index))
+        else
+          return type
+        end
+      end
+    end # CustomField
+  end # Helper
+end # Ramaze

data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.yml

@@ -1,32 +1,33 @@
 ---
 titles:
   index: 'Custom Field Groups'
-  edit: 'Edit Custom Field Group'
-  new: 'Add Custom Field Group'
+  edit : 'Edit Custom Field Group'
+  new  : 'Add Custom Field Group'
 
 labels:
-  id            : '#'
-  name          : 'Name'
-  description   : 'Description'
-  sections      : 'Sections'
-  manage_fields : 'Manage custom fields'
-  none          : 'None'
+  id           : '#'
+  name         : 'Name'
+  description  : 'Description'
+  sections     : 'Sections'
+  manage_fields: 'Manage custom fields'
+  none         : 'None'
 
 messages:
-  no_groups : 'No custom field groups have been created yet.'
+  no_groups: 'No custom field groups have been created yet.'
 
 errors:
-  new       : 'Failed to create a new custom field group.'
-  save      : 'Failed to modify the custom field group.'
-  delete    : 'Failed to delete the custom field group with ID #%s'
-  no_delete : "You haven't specified any custom field groups to delete"
+  new          : 'Failed to create a new custom field group.'
+  save         : 'Failed to modify the custom field group.'
+  delete       : 'Failed to delete the custom field group with ID #%s'
+  no_delete    : "You haven't specified any custom field groups to delete"
+  invalid_group: 'The specified custom field group is invalid.'
 
 success:
-  new    : 'The custom field group has been created.'
-  save   : 'The custom field group has been modified.'
-  delete : 'The selected custom field groups have been deleted.'
+  new   : 'The custom field group has been created.'
+  save  : 'The custom field group has been modified.'
+  delete: 'The selected custom field groups have been deleted.'
 
 buttons:
-  new    : 'Add group'
-  delete : 'Delete selected groups'
-  save   : 'Save group'
+  new   : 'Add group'
+  delete: 'Delete selected groups'
+  save  : 'Save group'

data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.yml

@@ -0,0 +1,40 @@
+---
+titles:
+  index: 'Custom Field Types'
+  edit : 'Edit Custom Field Type'
+  new  : 'Add Custom Field Type'
+
+labels:
+  id                    : '#'
+  name                  : 'Name'
+  language_string       : 'Language string'
+  html_class            : 'HTML class'
+  serialize             : 'Serialize'
+  allow_markup          : 'Allow markup'
+  custom_field_method_id: 'Custom field method'
+
+placeholders:
+  language_string: 'The full language string to use.'
+  html_class     : 'A set of HTML classes to apply to all fields.'
+  serialize      : 'Whether or not the value of a field has to be serialized.'
+  allow_markup   : 'Whether or not markup, such as Markdown, can be used. '
+
+messages:
+  no_field_types: 'No custom field types have been added yet.'
+
+errors:
+  new         : 'The custom field type could not be added.'
+  save        : 'The custom field type could not be modified.'
+  delete      : 'The custom field type with ID #%s could not be removed.'
+  no_delete   : 'You need to specify at least one custom field type to remove.'
+  invalid_type: 'The specified custom field type is invalid.'
+
+success:
+  new   : 'The custom field type has been added.'
+  save  : 'The custom field type has been modified.'
+  delete: 'All selected custom field types have been removed.'
+
+buttons:
+  new   : 'Add field type'
+  delete: 'Delete selected field types'
+  save  : 'Save field type'

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

@@ -1,35 +1,36 @@
 ---
 titles:
-  index  : 'Custom Fields'
-  edit   : 'Edit Custom Field'
-  new    : 'Add Custom Field'
+  index: 'Custom Fields'
+  edit : 'Edit Custom Field'
+  new  : 'Add Custom Field'
 
 labels:
-  id               : '#'
-  name             : 'Name'
-  slug             : 'Slug'
-  type             : 'Type'
-  format           : 'Format'
-  description      : 'Description'
-  possible_values  : 'Possible values (one value per line)'
-  required         : 'Requires a value'
-  visual_editor    : 'Enable the visual editor'
-  textarea_rows    : 'Textarea rows'
-  text_limit       : 'Character limit'
-  sort_order       : 'Sort order'
+  id                  : '#'
+  name                : 'Name'
+  slug                : 'Slug'
+  format              : 'Format'
+  description         : 'Description'
+  possible_values     : 'Possible values (one value per line)'
+  required            : 'Requires a value'
+  text_editor         : 'Enable a text editor'
+  textarea_rows       : 'Textarea rows'
+  text_limit          : 'Character limit'
+  sort_order          : 'Sort order'
+  custom_field_type_id: 'Field type'
 
 tabs:
-  general   : 'General'
-  settings  : 'Settings'
+  general : 'General'
+  settings: 'Settings'
 
 messages:
-  no_fields : 'No custom fields have been added yet.'
+  no_fields: 'No custom fields have been added yet.'
 
 errors:
-  new       : 'Failed to create a new custom field.'
-  save      : 'Failed to modify the custom field.'
-  delete    : 'Failed to delete the custom field with ID #%s.'
-  no_delete : "You haven't specified any custom fields to delete."
+  new          : 'Failed to create a new custom field.'
+  save         : 'Failed to modify the custom field.'
+  delete       : 'Failed to delete the custom field with ID #%s.'
+  no_delete    : "You haven't specified any custom fields to delete."
+  invalid_field: 'The specified custom field is invalid.'
 
 success:
   new     : 'The new custom field has been created.'
@@ -38,15 +39,16 @@ success:
 
 special:
   type_hash:
-    textbox          : 'Textbox'
-    textarea         : 'Textarea'
-    radio            : 'Radio button'
-    checkbox         : 'Checkbox'
-    date             : 'Date'
-    select           : 'Select dropdown'
-    select_multiple  : 'Multi select'
+    textbox        : 'Textbox'
+    textarea       : 'Textarea'
+    radio          : 'Radio button'
+    checkbox       : 'Checkbox'
+    date           : 'Date'
+    select         : 'Select dropdown'
+    select_multiple: 'Multi select'
+    password       : 'Password'
 
 buttons:
-  new     : 'Add custom field'
-  delete  : 'Delete selected fields'
-  save    : 'Save custom field'
+  new   : 'Add custom field'
+  delete: 'Delete selected fields'
+  save  : 'Save custom field'

data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.yml

@@ -21,10 +21,11 @@ success:
   delete: 'De veld groep is verwijderd.'
 
 errors:
-  new      : 'De veld groep kon niet worden aangemaakt.'
-  save     : 'De veld groep kon niet worden aangepast.'
-  delete   : 'De veld groep met ID #%s kon niet worden verwijderd.'
-  no_delete: 'U moet ten minste 1 groep specificeren om te verwijderen.'
+  new          : 'De veld groep kon niet worden aangemaakt.'
+  save         : 'De veld groep kon niet worden aangepast.'
+  delete       : 'De veld groep met ID #%s kon niet worden verwijderd.'
+  no_delete    : 'U moet ten minste 1 groep specificeren om te verwijderen.'
+  invalid_group: 'De opgegeven veld groep is ongeldig.'
 
 buttons:
   new   : 'Groep aanmaken'

data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.yml

@@ -0,0 +1,40 @@
+---
+titles:
+  index: 'Veld types'
+  edit : 'Veld type aanpassen'
+  new  : 'Veld type toevoegen'
+
+labels:
+  id                    : '#'
+  name                  : 'Naam'
+  language_string       : 'Vertaal naam'
+  html_class             : 'CSS klasse'
+  serialize             : 'Serialiseren'
+  allow_markup          : 'Opmaak toegestaan'
+  custom_field_method_id: 'Veld methode'
+
+placeholders:
+  language_string: 'De volledige naam van de vertaling voor dit veld.'
+  html_class     : 'Een set aan HTML klasses voor alle velden van dit type.'
+  serialize      : 'De waarde wel of niet serialiseren.'
+  allow_markup   : 'Opmaak toegestaan of niet.'
+
+messages:
+  no_field_types: 'Er zijn nog geen veld types aangemaakt.'
+
+errors:
+  new         : 'Het veld type kon niet worden aangemaakt.'
+  save        : 'Het veld type kon niet worden aangepast.'
+  delete      : 'Het veld type met ID #%s kon niet worden verwijderd.'
+  no_delete   : 'U moet ten minste 1 veld type specificeren om te verwijderen.'
+  invalid_type: 'Het opgegeven veld type is ongeldig.'
+
+success:
+  new   : 'Het veld type is aangemaakt.'
+  save  : 'Het veld type is aangepast.'
+  delete: 'Alle geselecteerde veld types zijn verwijderd.'
+
+buttons:
+  new   : 'Veld type toevoegen'
+  delete: 'Geselecteerde types verwijderen'
+  save  : 'Veld type opslaan'

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

@@ -5,18 +5,18 @@ titles:
   new  : 'Veld aanmaken'
 
 labels:
-  id             : '#'
-  name           : 'Naam'
-  slug           : 'Slug'
-  type           : 'Type'
-  format         : 'Formaat'
-  description    : 'Beschrijving'
-  possible_values: 'Mogelijke waardes (een per regel)'
-  required       : 'Vereist een waarde'
-  visual_editor  : 'Visuele editor'
-  textarea_rows  : 'Text veld rijen'
-  text_limit     : 'Karakter limiet'
-  sort_order     : 'Sorteer volgorde'
+  id                  : '#'
+  name                : 'Naam'
+  slug                : 'Slug'
+  format              : 'Formaat'
+  description         : 'Beschrijving'
+  possible_values     : 'Mogelijke waardes (een per regel)'
+  required            : 'Vereist een waarde'
+  text_editor         : 'Text verwerker'
+  textarea_rows       : 'Text veld rijen'
+  text_limit          : 'Karakter limiet'
+  sort_order          : 'Sorteer volgorde'
+  custom_field_type_id: 'Veld type'
 
 tabs:
   general : 'Algemeen'
@@ -31,10 +31,11 @@ success:
   delete: 'Alle geselecteerde velden zijn verwijderd.'
 
 errors:
-  new      : 'Het veld kon niet worden aangemaakt.'
-  save     : 'Het veld kon niet worden aangepast.'
-  delete   : 'Het veld met ID #%s kon niet worden verwijderd.'
-  no_delete: 'U moet ten minste 1 veld specificeren om te verwijderen.'
+  new          : 'Het veld kon niet worden aangemaakt.'
+  save         : 'Het veld kon niet worden aangepast.'
+  delete       : 'Het veld met ID #%s kon niet worden verwijderd.'
+  no_delete    : 'U moet ten minste 1 veld specificeren om te verwijderen.'
+  invalid_field: 'Het opgegeven veld is ongeldig.'
 
 special:
   type_hash:
@@ -45,6 +46,7 @@ special:
     date           : 'Datum'
     select         : 'Lijst (enkele waarde)'
     select_multiple: 'Lijst (meerdere waardes)'
+    password       : 'Wachtwoord'
 
 buttons:
   new   : 'Veld toevoegen'

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

@@ -20,26 +20,46 @@ module CustomFields
     #
     class CustomField < Sequel::Model
       one_to_many(
-        :custom_field_values, 
+        :custom_field_values,
         :class => "CustomFields::Model::CustomFieldValue"
       )
-      
+
+      many_to_one(
+        :custom_field_type,
+        :class => 'CustomFields::Model::CustomFieldType',
+        :eager => :custom_field_method
+      )
+
       plugin :sluggable, :source => :name, :freeze => false
-      
+
       ##
       # Validates rules used whenever the model is created or saved.
       #
       # @author Yorick Peterse
       # @since  0.1
-      # 
+      #
       def validate
-        validates_presence              [:name, :type, :format, :required, :visual_editor]
-        validates_max_length 255      , [:name]
-        validates_type       TrueClass, [:required, :visual_editor]
-        validates_integer               [:sort_order, :textarea_rows, :text_limit]
-        
-        validates_presence :slug unless new?
-        validates_unique   :slug
+        validates_presence([
+          :name,
+          :format,
+          :custom_field_group_id,
+          :custom_field_type_id
+        ])
+
+        validates_max_length(255, [:name])
+
+        validates_type(TrueClass, [:required, :text_editor])
+
+        validates_integer([
+          :sort_order,
+          :textarea_rows,
+          :text_limit,
+          :custom_field_group_id,
+          :custom_field_type_id
+        ])
+
+        validates_presence(:slug) unless new?
+        validates_unique(:slug)
       end
     end # CustomField
   end # Model

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

@@ -0,0 +1,15 @@
+#: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