zen 0.1a → 0.2

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

@@ -0,0 +1,82 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    <form method="post" action="#{@form_delete_url}">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        
+        <?r if @entries and !@entries.empty? ?>
+        
+        <table class="table">
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th>
+                        <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]) ?>
+                    <td>
+                        <input type="checkbox" name="section_entry_ids[]" value="#{entry.id}" />
+                    </td>
+                    <?r end ?>
+                    
+                    <td>#{entry.id}</td>
+                    
+                    <?r if user_authorized?([:update]) ?>
+                    <td>
+                        #{anchor_to(
+                          entry.title, 
+                          Sections::Controllers::SectionEntries.r(:edit, @section_id, entry.id)
+                        )}
+                    </td>
+                    <?r else ?>
+                    <td>#{entry.title}</td>
+                    <?r end ?>
+                    
+                    <td>#{entry.slug}</td>
+                    <td>#{@status_hash[entry.status]}</td>
+                    <td>#{entry.created_at}</td>
+                    <td>#{entry.updated_at}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+        
+        <?r else ?>
+        <p>#{lang('section_entries.messages.no_entries')}</p>
+        <?r end ?>
+        
+        <div class="clearfix">
+            
+            <?r if user_authorized?([:create]) ?>
+            <div class="button">
+                #{anchor_to(
+                  lang('section_entries.buttons.new'), 
+                  Sections::Controllers::SectionEntries.r(:new, @section_id)
+                )}
+            </div>
+            <?r end ?>
+            
+            <?r if user_authorized?([:delete]) and @entries and !@entries.empty? ?>
+            <div class="button">
+                <input type="submit" value="#{lang('section_entries.buttons.delete')}" />
+            </div>
+            <?r end ?>
+        </div>
+    </form>
+    
+</article>

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

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/{packages → package}/sections/migrations/1295251836_create_schema.rb

@@ -10,20 +10,20 @@ Sequel.migration do
       TrueClass :comment_allow,           :null => false, :default => true
       TrueClass :comment_require_account, :null => false, :default => false
       TrueClass :comment_moderate,        :null => false, :default => false
-      TrueClass :comment_antispam,        :null => false, :default => true
-      Enum      :comment_format,          :elements => ['plain', 'html', 'textile', 'markdown'], :null => false, :default => 'plain'
+      String    :comment_format,          :null => false, :default => 'plain'
     end
     
     create_table :section_entries do
       primary_key :id
       
-      String  :title , :default => 'Untitled'
-      String  :slug  , :null => false, :unique => true
-      Enum    :status, :elements => ['published', 'draft'], :null => false, :default => 'draft'
+      String  :title   , :default => 'Untitled'
+      String  :slug    , :null => false, :index   => true
+      String  :status  , :null => false, :default => 'draft'
       Time    :created_at
       Time    :updated_at
       
       foreign_key :section_id, :sections, :on_delete => :cascade, :on_update => :cascade, :key => :id
+      foreign_key :user_id   , :users   , :on_delete => :cascade, :on_update => :cascade, :key => :id 
     end
   end
   
@@ -32,4 +32,4 @@ Sequel.migration do
     drop_table :sections
   end
 
-end
+end

data/lib/zen/{packages → package}/settings/lib/settings/controller/settings.rb

@@ -1,4 +1,6 @@
+#:nodoc:
 module Settings
+  #:nodoc:
   module Controllers
     ##
     # Controller for managing settings. Each setting is saved as a separate
@@ -8,36 +10,38 @@ module Settings
     # @since  0.1
     #
     class Settings < Zen::Controllers::AdminController
-      map "/admin/settings"
-      
-      trait :extension_identifier => 'com.zen.settings'
       include ::Settings::Models
+
+      map   "/admin/settings"
+      trait :extension_identifier => 'com.zen.settings'
       
       before_all do
-        csrf_protection :save, :delete do
-          respond(@zen_general_lang.errors[:csrf], 401)
+        csrf_protection(:save, :delete) do
+          respond(lang('zen_general.errors.csrf'), 403)
         end
       end
       
       ##
       # Load our language packs, set the form URLs and define our page title.
       #
+      # This method loads the following language files:
+      #
+      # * settings
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
       def initialize
         super
         
-        @form_save_url   = '/admin/settings/save'
-        @settings_lang   = Zen::Language.load 'settings'
+        @form_save_url = Settings.r(:save)
+
+        Zen::Language.load('settings')
         
         # Set the page title
         if !action.method.nil?
-          method = action.method.to_sym
-        
-          if @settings_lang.titles.key? method 
-            @page_title = @settings_lang.titles[method]
-          end
+          method      = action.method.to_sym
+          @page_title = lang("settings.titles.#{method}") rescue nil
         end
       end
       
@@ -47,15 +51,20 @@ module Settings
       # the descriptions, names and possible values are stored in
       # the language packs that come with this module.
       #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * update
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
       def index
         if !user_authorized?([:read, :update])
-          respond(@zen_general_lang.errors[:not_authorized], 403)
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
         
-        set_breadcrumbs @settings_lang.titles[:index]
+        set_breadcrumbs(lang('settings.titles.index'))
         
         settings  = Setting.all
         @settings = {}
@@ -75,33 +84,33 @@ module Settings
       # Saves the values of each setting. Since each setting
       # is a new row we'll have to loop through them and execute quite
       # a few queries.
+      #
+      # This method requires the following permissions:
+      #
+      # * update
       # 
       # @author Yorick Peterse
       # @since  0.1
       #      
       def save
         if !user_authorized?([:update])
-          respond(@zen_general_lang.errors[:not_authorized], 403)
+          respond(lang('zen_general.errors.not_authorized'), 403)
         end
         
         post = request.params.dup
         post.delete('csrf_token')
-       
-        post.each do |key, value|
-          post.delete(key) if value.empty?
-        end
-        
-        flash_success = @settings_lang.success[:save]
-        flash_error   = @settings_lang.errors[:save]
+
+        flash_success = lang('settings.success.save')
+        flash_error   = lang('settings.errors.save')
         
         begin
           post.each do |key, value|
             @setting = Setting[:key => key].update(:value => value)  
           end
           
-          notification(:success, @settings_lang.titles[:index], flash_success)
+          notification(:success, lang('settings.titles.index'), flash_success)
         rescue
-          notification(:error, @settings_lang.titles[:index], flash_error)
+          notification(:error, lang('settings.titles.index'), flash_error)
           
           flash[:form_errors] = @setting.errors
         end

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

@@ -0,0 +1,26 @@
+---
+titles:
+  index: 'Settings'
+
+labels:
+  website_name         : 'Website name'
+  website_description  : 'Website description'
+  website_enabled      : 'Website enabled'
+  language             : 'Language'
+  default_section      : 'Default section'
+  theme                : 'Theme'
+  enable_antispam      : 'Enable anti-spam'
+  defensio_key         : 'Defensio API key'
+
+tabs:
+  general   : 'General'
+  security  : 'Security'
+
+buttons:
+  save: 'Save'
+
+success:
+  save: 'The settings have been saved.'
+
+errors:
+  save: 'The settings could not be saved.'

data/lib/zen/{packages → package}/settings/lib/settings/liquid/setting.rb

@@ -1,10 +1,12 @@
+#:nodoc:
 module Settings
+  #:nodoc:
   module Liquid
     ##
     # Tag that can be used to retrieve the values of the given setting.
     # Using this tag couldn't be easier:
     #
-    # bc. {% settings "website_name" %}
+    #     {% settings "website_name" %}
     #
     # It's not required to specify quotes as setting keys don't contain
     # spaces but it's generally considered a good practice to do so anyway.
@@ -26,7 +28,7 @@ module Settings
       # @param  [String] html The HTML inside the block.
       # @since  0.1
       #
-      def initialize tag_name, key, markup
+      def initialize(tag_name = 'setting', key = '', markup = '')
         super
         
         @key = key.gsub('"', '').gsub("'", '')
@@ -38,7 +40,7 @@ module Settings
       # @author Yorick Peterse
       # @since  0.1
       #
-      def render context
+      def render(context)
         setting = ::Settings::Models::Setting[:key => @key]
 
         if !setting.nil?

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

@@ -0,0 +1,113 @@
+#:nodoc:
+module Settings
+  #:nodoc:
+  module Models
+    ##
+    # Model that represents a single setting. This model is also used to retrieve
+    # all possible values for a certain settngs. This is done by calling a method
+    # that matches the format get_SETTING-NAME_values. For example, a setting named "theme"
+    # would result in a call to Settings::Models::Setting#get_theme_values.
+    #
+    # In order to add new method you'll have to monkey patch this model as following:
+    #
+    #     class Setting < Sequel::Model
+    #       def self.get_my_setting_values
+    #         # Do something and return it...
+    #       end
+    #     end
+    #
+    # @author Yorick Peterse
+    # @since  0.1
+    # @todo   Monkey patching a model in order to get possible values isn't the nicest way
+    # of solving this problem but it does allow for extra flexibility. It might be a good
+    # idea to refactor this and put it in it's own class/plugin/whatever.
+    #
+    class Setting < Sequel::Model
+      include ::Zen::Language
+
+      ##
+      # Retrieves all settings and returns them as a key/value hash.
+      #
+      # @author Yorick Peterse
+      # @since  0.1
+      # @return [Hash] key/value hash containing all settings and their values.
+      #
+      def self.get_settings
+        settings = {}
+        
+        self.all.each do |s|
+          if s.value.nil?
+            value = s.default
+          else
+            value = s.value
+          end
+          
+          settings[s.key.to_sym] = value
+        end
+        
+        return settings
+      end
+
+      ##
+      # Generates the possible values for the setting "website_enabled".
+      #
+      # @author Yorick Peterse
+      # @since  0.2
+      # @return [Hash]
+      #
+      def self.get_website_enabled_values
+        hash = {
+          lang('zen_general.special.boolean_hash.true')  => '1',
+          lang('zen_general.special.boolean_hash.false') => '0'
+        }
+
+        return hash
+      end
+
+      ##
+      # Generates the possible values for the setting "language".
+      #
+      # @author Yorick Peterse
+      # @since  0.2
+      # @return [Hash]
+      #
+      def self.get_language_values
+        return ::Zen.languages
+      end
+
+      ##
+      # Generates the possible values for the setting "default_section".
+      #
+      # @author Yorick Peterse
+      # @since  0.2
+      # @return [Hash]
+      #
+      def self.get_default_section_values 
+        section_hash = {}
+
+        ::Sections::Models::Section.select(:name, :slug).each do |s|
+          section_hash[s.slug] = s.name
+        end
+
+        return section_hash
+      end
+
+      ##
+      # Generates the possible values for the setting "theme".
+      #
+      # @author Yorick Peterse
+      # @since  0.2
+      # @return [Hash]
+      #
+      def self.get_theme_values
+        theme_hash = {}
+
+        Zen::Package.themes.each do |ident, theme|
+          theme_hash[ident] = theme.name
+        end
+
+        return theme_hash
+      end
+    end
+  end
+end

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

@@ -0,0 +1,111 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+  
+    <div class="tabs">
+        <ul>
+            <?r @settings.each do |group, items| ?>
+            <?r
+            begin
+              group_label = lang(items[0].language_group_key)
+            rescue
+              group_label = group
+            end
+            ?>
+            <li>
+                <a href="#group_#{group}">#{group_label}</a>
+            </li>
+            <?r end ?>
+        </ul>
+    </div>
+
+  #{
+    form_for(@settings, :method => :post, :action => @form_save_url, :id => :setting_form) do |f|
+      f.input_hidden(:csrf_token, get_csrf_token)
+
+      @settings.each do |group, items|
+      
+        f.g.div(:id => "group_#{group}") do
+
+          items.each do |s|
+            # Get the label from the language pack
+            name = s.key.to_sym
+
+            begin
+              label = lang(s.language_key)
+            rescue
+              label = s.key
+            end
+            
+            # Get the value from either the value or default getter
+            if s.value.nil?
+              value = s.default
+            else
+              value = s.value
+            end
+            
+            # Get all possible values for the current setting from the language pack
+            begin
+              values = Settings::Models::Setting.send("get_#{s.key}_values")
+            rescue
+              values = {}
+            end
+            
+            case s.type
+              when 'textbox'
+                f.input_text(
+                  label, 
+                  name, 
+                  :value => value
+                )
+
+              when 'textarea'
+                f.textarea(
+                  label, 
+                  name, 
+                  :value => value, 
+                  :rows  => 8
+                )
+
+              when 'radio'
+                f.input_radio(
+                  label, 
+                  name, 
+                  value, 
+                  :values => values
+                )
+
+              when 'checkbox'
+                f.input_checkbox(
+                  label, 
+                  name, 
+                  value, 
+                  :values => values
+                )
+
+              when 'select'
+                f.select(
+                  label, 
+                  name, 
+                  :values   => values, 
+                  :size     => 1, 
+                  :selected => value
+                ) 
+
+            end
+          end
+
+        end
+
+      end
+    
+      f.g.div(:class => 'clearfix') do
+        f.g.div(:class => 'button') do
+          f.g.input(:type => 'submit', :value => lang('settings.buttons.save'))
+        end
+      end
+    end
+  }
+
+</article>