zen 0.2.8 → 0.3b

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

@@ -1,4 +1,8 @@
-<article>
+<section>
+    #{render_search_form(
+      ::Sections::Controller::SectionEntries.r(:index, @section_id)
+    )}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -12,7 +16,7 @@
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_section_entry) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -29,7 +33,7 @@
             <tbody>
                 <?r @entries.each do |entry| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_section_entry) ?>
                     <td>
                         <input type="checkbox" name="section_entry_ids[]"
                         value="#{entry.id}" />
@@ -38,15 +42,18 @@
 
                     <td>#{entry.id}</td>
 
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{Sections::Controller::SectionEntries.a(
-                          entry.title, :edit, @section_id, entry.id
-                        )}
+                        #{if user_authorized?(:edit_section_entry)
+                          Sections::Controller::SectionEntries.a(
+                            entry.title,
+                            :edit,
+                            @section_id,
+                            entry.id
+                          )
+                        else
+                          entry.title
+                        end}
                     </td>
-                    <?r else ?>
-                    <td>#{entry.title}</td>
-                    <?r end ?>
 
                     <td>#{entry.slug}</td>
                     <td>
@@ -55,30 +62,22 @@
                           section_entry_status.name}"
                         )}
                     </td>
-                    <td>
-                        #{entry.created_at.strftime(session[:user].date_format)}
-                    </td>
-                    <td>
-                        #{if entry.updated_at
-                            entry.updated_at.strftime(session[:user].date_format)
-                          end}
-                    </td>
+                    <td>#{format_date(entry.created_at)}</td>
+                    <td>#{format_date(entry.updated_at)}</td>
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
 
-        #{
-        if @entries.respond_to?(:navigation) and @entries.page_count > 1
+        #{if @entries.respond_to?(:navigation) and @entries.page_count > 1
           @entries.navigation
-        end
-        }
+        end}
 
         <?r else ?>
         <p>#{lang('section_entries.messages.no_entries')}</p>
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_section_entry) ?>
         <div class="button">
             #{Sections::Controller::SectionEntries.a(
               lang('section_entries.buttons.new'), :new, @section_id
@@ -86,11 +85,11 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@entries.empty? ?>
+        <?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>
-</article>
+</section>

data/lib/zen/package/sections/migrations/1308672298_use_id_for_default_section.rb

@@ -2,7 +2,7 @@ Sequel.migration do
   # Updates the database with the changes specified in the block.
   up do
     # Make sure the settings table has been migrated
-    ::Zen::Plugin.plugin(:settings, :migrate)
+    ::Settings::Setting.migrate
 
     if !Zen.database[:sections].all.empty?
       default_section = Zen.database[:settings] \
@@ -23,18 +23,22 @@ Sequel.migration do
   down do
     default_section = Zen.database[:settings] \
       .filter(:name => 'default_section') \
-      .all[0][:value]
+      .all
 
-    section = Zen.database[:sections] \
-      .filter(:id => default_section) \
-      .all[0]
+    unless default_section.empty?
+      default_section = default_section[0][:value]
 
-    if !section.nil?
-      default_section = section[:slug]
+      section = Zen.database[:sections] \
+        .filter(:id => default_section) \
+        .all[0]
 
-      # Change the ID back to a slug
-      Zen.database[:settings].filter(:name => 'default_section') \
-        .update(:value => default_section)
+      if !section.nil?
+        default_section = section[:slug]
+
+        # Change the ID back to a slug
+        Zen.database[:settings].filter(:name => 'default_section') \
+          .update(:value => default_section)
+      end
     end
   end
 end

data/lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb

@@ -15,8 +15,8 @@ Sequel.migration do
 
     alter_table(:section_entries) do
       add_foreign_key(
-        :section_entry_status_id, 
-        :section_entry_statuses, 
+        :section_entry_status_id,
+        :section_entry_statuses,
         :on_delete => :cascade,
         :on_update => :cascade,
         :key       => :id
@@ -28,14 +28,14 @@ Sequel.migration do
       status_id = Zen.database[:section_entry_statuses].insert(:name => status)
 
       entries.each do |entry|
-        if entry[:status] === status
+        if entry[:status] == status
           Zen.database[:section_entries].filter(:id => entry[:id]) \
             .update(:section_entry_status_id => status_id)
         end
       end
     end
   end
-  
+
   # Reverts the changes made in the up() block.
   down do
     statuses = {}
@@ -45,8 +45,14 @@ Sequel.migration do
       statuses[status[:id]] = status[:name]
     end
 
-    drop_column(:section_entries, :section_entry_status_id)
-    add_column(:section_entries, :status, String, :default => 'draft')
+    alter_table(:section_entries) do
+      if Zen.database.adapter_scheme.to_s.include?('mysql')
+        drop_constraint(:section_entries_ibfk_3, :type => :foreign_key)
+      end
+
+      drop_column(:section_entry_status_id)
+      add_column(:status, String, :default => 'draft')
+    end
 
     entries.each do |entry|
       Zen.database.filter(:id => entry[:id]) \

data/lib/zen/package/settings/lib/settings.rb

@@ -1,128 +1,33 @@
-require __DIR__('settings/model/setting')
-require __DIR__('settings/controller/settings')
-require __DIR__('settings/plugin/settings')
-
-Zen::Language.options.paths.push(__DIR__('settings'))
-Zen::Language.load('settings')
-
-# Register the package
 Zen::Package.add do |p|
-  p.name          = 'settings'
-  p.author        = 'Yorick Peterse'
-  p.url           = 'http://yorickpeterse.com/'
-  p.about         = 'Module for managing settings such as the default module, whether or 
-not to allow registration, etc.'
-
-  p.directory     = __DIR__('settings')
-  p.migration_dir = __DIR__('../migrations')
-  
-  p.menu = [{
-    :title => lang('settings.titles.index'),
-    :url   => 'admin/settings'
-  }] 
-
-  p.controllers = {
-    lang('settings.titles.index') => Settings::Controller::Settings
-  }
-end
-
-# Create all variables required for the settings
-theme_hash = {}
-
-Zen::Theme::Registered.each do |name, theme|
-  name             = name.to_s
-  theme_hash[name] = name
-end
+  p.name       = :settings
+  p.title      = 'settings.titles.index'
+  p.author     = 'Yorick Peterse'
+  p.url        = 'http://zen-cms.com/'
+  p.about      = 'settings.description'
+  p.root       = __DIR__('settings')
+  p.migrations = __DIR__('../migrations')
 
-# Register the plugin
-Zen::Plugin.add do |plugin|
-  plugin.name       = 'settings'
-  plugin.author     = 'Yorick Peterse'
-  plugin.url        = 'http://yorickpeterse.com/'
-  plugin.about      = 'Plugin that can be used to register, retrieve and migrate settings.'
-  plugin.plugin     = Settings::Plugin::Settings
-end
-
-# Register all setting groups
-plugin(:settings, :register_group) do |group|
-  group.title = 'General'
-  group.name  = 'general'
-end
+  p.menu(
+    'settings.titles.index',
+    '/admin/settings',
+    :permission => :show_setting
+  )
 
-plugin(:settings, :register_group) do |group|
-  group.title = 'Security'
-  group.name  = 'security'
+  p.permission :show_setting, 'settings.permissions.show'
+  p.permission :edit_setting, 'settings.permissions.edit'
 end
 
-# Register all settings
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.website_name')
-  setting.description = lang('settings.placeholders.website_name')
-  setting.name        = 'website_name'
-  setting.group       = 'general'
-  setting.default     = 'Zen'
-  setting.type        = 'textbox'
-end
-
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.website_description')
-  setting.description = lang('settings.placeholders.website_description')
-  setting.name        = 'website_description'
-  setting.group       = 'general'
-  setting.type        = 'textarea'
-end
-
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.language')
-  setting.description = lang('settings.placeholders.language')
-  setting.name        = 'language'
-  setting.group       = 'general'
-  setting.default     = 'en'
-  setting.type        = 'select'
-  setting.values      = Zen::Language::Languages
-end
-
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.frontend_language')
-  setting.description = lang('settings.placeholders.frontend_language')
-  setting.name        = 'frontend_language'
-  setting.group       = 'general'
-  setting.default     = 'en'
-  setting.type        = 'select'
-  setting.values      = Zen::Language::Languages
-end
+Zen::Language.load('settings')
 
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.theme')
-  setting.description = lang('settings.placeholders.theme')
-  setting.name        = 'theme'
-  setting.group       = 'general'
-  setting.type        = 'select'
-  setting.values      = theme_hash
-end
+require __DIR__('settings/model/setting')
+require __DIR__('settings/controller/settings')
+require __DIR__('settings/settings_group')
+require __DIR__('settings/setting')
+require __DIR__('settings/singleton_methods')
+require __DIR__('settings/blue_form_parameters')
 
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.date_format')
-  setting.description = lang('settings.placeholders.date_format')
-  setting.name        = 'date_format'
-  setting.group       = 'general'
-  setting.type        = 'select'
-  setting.default     = '%Y-%m-%d %H:%I:%S'
-  setting.values      = {
-    '%Y-%m-%d %H:%I:%S' => '2011-05-10 13:30:12',
-    '%d-%m-%Y %H:%I:%S' => '10-05-2011 13:30:12',
-    '%A, %B %d, %Y'     => 'Tuesday, May 10, 2011'
-  }
-end
+# Load all the setting groups and settings.
+require __DIR__('settings/setting_groups')
+require __DIR__('settings/settings')
 
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.enable_antispam')
-  setting.description = lang('settings.placeholders.enable_antispam')
-  setting.name        = 'enable_antispam'
-  setting.group       = 'security'
-  setting.type        = 'radio'
-  setting.values      = {
-    lang('zen_general.special.boolean_hash.true')  => '1',
-    lang('zen_general.special.boolean_hash.false') => '0'
-  }
-end
+include Settings::SingletonMethods

data/lib/zen/package/settings/lib/settings/blue_form_parameters.rb

@@ -0,0 +1,157 @@
+module Settings
+  ##
+  # {Settings::BlueFormParameters} is a module used to build the required
+  # parameters for various settings. These parameters will be passed to
+  # ``Ramaze::Helper::BlueForm`` similar to how
+  # {CustomFields::BlueFormParameters} does this.
+  #
+  # Similar to the custom fields module mentioned above adding methods to this
+  # module is relatively easy (though you usually don't need to add your own
+  # methods). This can be done by simply re-opening the module and adding a
+  # class method to it:
+  #
+  #     module Settings
+  #       module BlueFormParameters
+  #         def self.custom_method(setting)
+  #
+  #         end
+  #       end
+  #     end
+  #
+  # Each method receives an instance of {Settings::Setting} and should return an
+  # array. This array contains the required parameters that will be sent to the
+  # BlueForm helper.
+  #
+  # @since 0.3
+  #
+  module BlueFormParameters
+    class << self
+      ##
+      # Generates the required parameters for a textbox (``input type="text"``).
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for which to generate the
+      #  parameters
+      # @return [Array]
+      #
+      def textbox(setting)
+        return [
+          :input_text,
+          setting.title,
+          setting.name,
+          :value => setting.value,
+          :title => setting.description
+        ]
+      end
+
+      ##
+      # Generates the required parameters for a text area.
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for which to generate the
+      #  parameters.
+      # @return [Array]
+      #
+      def textarea(setting)
+        return [
+          :textarea,
+          setting.title,
+          setting.name,
+          :value => setting.value,
+          :rows  => 8,
+          :title => setting.description
+        ]
+      end
+
+      ##
+      # Generates the required parameters for a radio button.
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for which to generate the
+      #  parameters.
+      # @return [Array]
+      #
+      def radio(setting)
+        return [
+          :input_radio,
+          setting.title,
+          setting.name,
+          setting.value,
+          :values => setting.values,
+          :title  => setting.description
+        ]
+      end
+
+      ##
+      # Generates the required parameters for a checkbox.
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for which to generate the
+      #  parameters.
+      # @return [Array]
+      #
+      def checkbox(setting)
+        return [
+          :input_checkbox,
+          setting.title,
+          setting.name,
+          setting.value,
+          :values => setting.values,
+          :title  => setting.description
+        ]
+      end
+
+      ##
+      # Generates the required parameters for a select box.
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for whcih to generate the
+      #  parameters.
+      # @return [Array]
+      #
+      def select(setting)
+        return [
+          :select,
+          setting.title,
+          setting.name,
+          :values   => setting.values,
+          :size     => 1,
+          :selected => setting.value,
+          :title    => setting.description
+        ]
+      end
+
+      ##
+      # Generates the parameters for a select box that allows users to select
+      # multiple values.
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for which to generate the
+      #  parameters.
+      # @return [Array]
+      #
+      def select_multiple(setting)
+        params                = select(setting)
+        params[-1][:multiple] = :multiple
+        params[-1].delete(:size)
+
+        return params
+      end
+
+      ##
+      # Generates the parameters for a date field.
+      #
+      # @since 0.3
+      # @param [Settings::Setting] setting The setting for which to generate the
+      #  parameters.
+      # @return [Array]
+      #
+      def date(setting)
+        params             = textbox(setting)
+        params[-1][:class] = 'date'
+
+        return params
+      end
+    end
+  end # BlueFormParameters
+end # Settings