zen 0.2.5 → 0.2.6

data/.gems

@@ -0,0 +1,34 @@
+bcrypt-ruby -v2.1.4
+bundler -v1.0.13
+capybara -v0.4.1.2
+celerity -v0.8.9
+childprocess -v0.1.9
+commander -v4.0.4
+crack -v0.1.8
+culerity -v0.2.15
+defensio -v0.9.1
+diff-lcs -v1.1.2
+ffi -v1.0.9
+highline -v1.6.2
+httparty -v0.7.7
+innate -v2011.04
+loofah -v1.0.0
+mime-types -v1.16
+nokogiri -v1.4.4
+rack -v1.2.3
+rack-test -v0.6.0
+rake -v0.9.0
+ramaze -v2011.01.30
+rdiscount -v1.6.8
+RedCloth -v4.2.7
+rspec -v2.6.0
+rspec-core -v2.6.3
+rspec-expectations -v2.6.0
+rspec-mocks -v2.6.0
+rubyzip -v0.9.4
+selenium-webdriver -v0.2.0
+sequel -v3.23.0
+sequel_sluggable -v0.0.6
+sqlite3 -v1.3.3
+xpath -v0.1.4
+yard -v0.7.1

data/.travis.yml

@@ -0,0 +1,7 @@
+script: "rvm gemset import .gems; rake test"
+rvm:
+  - 1.9.2
+
+notifications:
+  recipients:
+    - info@yorickpeterse.com

data/AUTHORS

@@ -0,0 +1,5 @@
+Following persons have contributed to Zen.
+(Sorted by number of submitted patches, then alphabetically)
+
+   115 YorickPeterse <info@yorickpeterse.com>
+     1 Yorick Peterse <info@yorickpeterse.com>

data/CHANGELOG

@@ -0,0 +1,14 @@
+0.2.6 May 29 2011
+
+* Zen is now using RVM for gem management and such.
+* Began working on making Zen compatible with at least JRuby. Rubinius isn't worth the
+effort at this time.
+* Removed Ramaze::Helper::Common.notification in favor of Ramaze::Helper::Message.
+* Dropped Zen::Database, Zen::Settings and most of the options in favor of instance
+variables set in the main Zen module. See commit d40ee1c2e518a323b2983e1bcfb7a0d863bf3b2f
+for more information.
+* Translated Zen to Dutch.
+* Re-organized the application prototypes to make them easier to use/understand.
+* Implemented the anti-spam system as a plugin and added a decent XSS protection system
+using Loofah.
+* Various changes to the Javascript classes.

data/MANIFEST

@@ -1,7 +1,10 @@
-CHANGELOG.md
+.gems
+.travis.yml
+AUTHORS
+CHANGELOG
+LICENSE
 MANIFEST
 README.md
-ROADMAP.md
 Rakefile
 bin/zen
 lib/zen/asset.rb
@@ -10,7 +13,7 @@ lib/zen/controller/admin_controller.rb
 lib/zen/controller/base_controller.rb
 lib/zen/controller/frontend_controller.rb
 lib/zen/controller/main_controller.rb
-lib/zen/database.rb
+lib/zen/controller/preview.rb
 lib/zen/error/language_error.rb
 lib/zen/error/package_error.rb
 lib/zen/error/plugin_error.rb
@@ -20,13 +23,15 @@ lib/zen/ext/string.rb
 lib/zen/helper/acl.rb
 lib/zen/helper/breadcrumb.rb
 lib/zen/helper/common.rb
+lib/zen/helper/message.rb
 lib/zen/helper/theme.rb
 lib/zen/language/en/zen_general.yml
 lib/zen/language/en/zen_models.yml
+lib/zen/language/nl/zen_general.yml
+lib/zen/language/nl/zen_models.yml
 lib/zen/language.rb
 lib/zen/layout/admin.xhtml
 lib/zen/layout/login.xhtml
-lib/zen/logger.rb
 lib/zen/model/methods.rb
 lib/zen/model/settings.rb
 lib/zen/package/all.rb
@@ -35,6 +40,8 @@ lib/zen/package/categories/lib/categories/controller/categories.rb
 lib/zen/package/categories/lib/categories/controller/category_groups.rb
 lib/zen/package/categories/lib/categories/language/en/categories.yml
 lib/zen/package/categories/lib/categories/language/en/category_groups.yml
+lib/zen/package/categories/lib/categories/language/nl/categories.yml
+lib/zen/package/categories/lib/categories/language/nl/category_groups.yml
 lib/zen/package/categories/lib/categories/model/category.rb
 lib/zen/package/categories/lib/categories/model/category_group.rb
 lib/zen/package/categories/lib/categories/plugin/categories.rb
@@ -52,7 +59,9 @@ lib/zen/package/categories/migrations/1295282303_create_schema.rb
 lib/zen/package/comments/lib/comments/controller/comments.rb
 lib/zen/package/comments/lib/comments/controller/comments_form.rb
 lib/zen/package/comments/lib/comments/language/en/comments.yml
+lib/zen/package/comments/lib/comments/language/nl/comments.yml
 lib/zen/package/comments/lib/comments/model/comment.rb
+lib/zen/package/comments/lib/comments/plugin/anti_spam.rb
 lib/zen/package/comments/lib/comments/plugin/comments.rb
 lib/zen/package/comments/lib/comments/view/admin/comments/edit.xhtml
 lib/zen/package/comments/lib/comments/view/admin/comments/form.xhtml
@@ -64,6 +73,8 @@ lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.r
 lib/zen/package/custom_fields/lib/custom_fields/controller/custom_fields.rb
 lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.yml
 lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.yml
+lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.yml
+lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.yml
 lib/zen/package/custom_fields/lib/custom_fields/model/custom_field.rb
 lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_group.rb
 lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb
@@ -83,6 +94,8 @@ lib/zen/package/menus/lib/menus/controller/menus.rb
 lib/zen/package/menus/lib/menus/helper/menu_item.rb
 lib/zen/package/menus/lib/menus/language/en/menu_items.yml
 lib/zen/package/menus/lib/menus/language/en/menus.yml
+lib/zen/package/menus/lib/menus/language/nl/menu_items.yml
+lib/zen/package/menus/lib/menus/language/nl/menus.yml
 lib/zen/package/menus/lib/menus/model/menu.rb
 lib/zen/package/menus/lib/menus/model/menu_item.rb
 lib/zen/package/menus/lib/menus/plugin/menus.rb
@@ -101,6 +114,8 @@ lib/zen/package/sections/lib/sections/controller/section_entries.rb
 lib/zen/package/sections/lib/sections/controller/sections.rb
 lib/zen/package/sections/lib/sections/language/en/section_entries.yml
 lib/zen/package/sections/lib/sections/language/en/sections.yml
+lib/zen/package/sections/lib/sections/language/nl/section_entries.yml
+lib/zen/package/sections/lib/sections/language/nl/sections.yml
 lib/zen/package/sections/lib/sections/model/section.rb
 lib/zen/package/sections/lib/sections/model/section_entry.rb
 lib/zen/package/sections/lib/sections/plugin/section_entries.rb
@@ -116,8 +131,10 @@ lib/zen/package/sections/lib/sections/view/admin/section-entries/new.xhtml
 lib/zen/package/sections/lib/sections.rb
 lib/zen/package/sections/migrations/.gitkeep
 lib/zen/package/sections/migrations/1295251836_create_schema.rb
+lib/zen/package/sections/migrations/1306772479_remove_unique_slug.rb
 lib/zen/package/settings/lib/settings/controller/settings.rb
 lib/zen/package/settings/lib/settings/language/en/settings.yml
+lib/zen/package/settings/lib/settings/language/nl/settings.yml
 lib/zen/package/settings/lib/settings/model/setting.rb
 lib/zen/package/settings/lib/settings/plugin/group_base.rb
 lib/zen/package/settings/lib/settings/plugin/setting_base.rb
@@ -134,6 +151,9 @@ lib/zen/package/users/lib/users/controller/users.rb
 lib/zen/package/users/lib/users/language/en/access_rules.yml
 lib/zen/package/users/lib/users/language/en/user_groups.yml
 lib/zen/package/users/lib/users/language/en/users.yml
+lib/zen/package/users/lib/users/language/nl/access_rules.yml
+lib/zen/package/users/lib/users/language/nl/user_groups.yml
+lib/zen/package/users/lib/users/language/nl/users.yml
 lib/zen/package/users/lib/users/model/access_rule.rb
 lib/zen/package/users/lib/users/model/user.rb
 lib/zen/package/users/lib/users/model/user_group.rb
@@ -155,6 +175,7 @@ lib/zen/package/users/lib/users.rb
 lib/zen/package/users/migrations/.gitkeep
 lib/zen/package/users/migrations/1295281013_create_schema.rb
 lib/zen/package/users/migrations/1303510943_class_rules.rb
+lib/zen/package/users/migrations/1304939855_user_settings.rb
 lib/zen/package.rb
 lib/zen/plugin/base.rb
 lib/zen/plugin/controller.rb
@@ -163,51 +184,51 @@ lib/zen/plugin/markup/lib/markup/language/en/markup.yml
 lib/zen/plugin/markup/lib/markup/markup.rb
 lib/zen/plugin/markup/lib/markup.rb
 lib/zen/plugin.rb
-lib/zen/public/admin/css/buttons.css
-lib/zen/public/admin/css/datepicker.css
-lib/zen/public/admin/css/editor.css
-lib/zen/public/admin/css/forms.css
-lib/zen/public/admin/css/general.css
-lib/zen/public/admin/css/grid.css
-lib/zen/public/admin/css/layout.css
-lib/zen/public/admin/css/modals.css
-lib/zen/public/admin/css/notifications.css
-lib/zen/public/admin/css/reset.css
-lib/zen/public/admin/css/tables.css
-lib/zen/public/admin/css/tabs.css
-lib/zen/public/admin/images/icons/accept.png
-lib/zen/public/admin/images/icons/add.png
-lib/zen/public/admin/images/icons/back.png
-lib/zen/public/admin/images/icons/bold.png
-lib/zen/public/admin/images/icons/close.png
-lib/zen/public/admin/images/icons/delete.png
-lib/zen/public/admin/images/icons/edit.png
-lib/zen/public/admin/images/icons/error.png
-lib/zen/public/admin/images/icons/help.png
-lib/zen/public/admin/images/icons/info.png
-lib/zen/public/admin/images/icons/italic.png
-lib/zen/public/admin/images/icons/large/error.png
-lib/zen/public/admin/images/icons/large/notice.png
-lib/zen/public/admin/images/icons/large/success.png
-lib/zen/public/admin/images/icons/link.png
-lib/zen/public/admin/images/icons/logout.png
-lib/zen/public/admin/images/icons/ol.png
-lib/zen/public/admin/images/icons/pdf.png
-lib/zen/public/admin/images/icons/ul.png
-lib/zen/public/admin/images/icons/user.png
-lib/zen/public/admin/images/icons/view.png
+lib/zen/public/admin/css/zen/buttons.css
+lib/zen/public/admin/css/zen/datepicker.css
+lib/zen/public/admin/css/zen/editor.css
+lib/zen/public/admin/css/zen/forms.css
+lib/zen/public/admin/css/zen/general.css
+lib/zen/public/admin/css/zen/grid.css
+lib/zen/public/admin/css/zen/layout.css
+lib/zen/public/admin/css/zen/messages.css
+lib/zen/public/admin/css/zen/notifications.css
+lib/zen/public/admin/css/zen/reset.css
+lib/zen/public/admin/css/zen/tables.css
+lib/zen/public/admin/css/zen/tabs.css
+lib/zen/public/admin/css/zen/window.css
+lib/zen/public/admin/images/zen/icons/accept.png
+lib/zen/public/admin/images/zen/icons/add.png
+lib/zen/public/admin/images/zen/icons/back.png
+lib/zen/public/admin/images/zen/icons/bold.png
+lib/zen/public/admin/images/zen/icons/close.png
+lib/zen/public/admin/images/zen/icons/delete.png
+lib/zen/public/admin/images/zen/icons/edit.png
+lib/zen/public/admin/images/zen/icons/error.png
+lib/zen/public/admin/images/zen/icons/help.png
+lib/zen/public/admin/images/zen/icons/info.png
+lib/zen/public/admin/images/zen/icons/italic.png
+lib/zen/public/admin/images/zen/icons/large/error.png
+lib/zen/public/admin/images/zen/icons/large/notice.png
+lib/zen/public/admin/images/zen/icons/large/success.png
+lib/zen/public/admin/images/zen/icons/link.png
+lib/zen/public/admin/images/zen/icons/logout.png
+lib/zen/public/admin/images/zen/icons/ol.png
+lib/zen/public/admin/images/zen/icons/pdf.png
+lib/zen/public/admin/images/zen/icons/preview.png
+lib/zen/public/admin/images/zen/icons/ul.png
+lib/zen/public/admin/images/zen/icons/user.png
+lib/zen/public/admin/images/zen/icons/view.png
 lib/zen/public/admin/js/mootools/core.js
 lib/zen/public/admin/js/mootools/more.js
 lib/zen/public/admin/js/vendor/datepicker.js
-lib/zen/public/admin/js/vendor/yepnope.js
-lib/zen/public/admin/js/zen/editor/base.js
-lib/zen/public/admin/js/zen/editor/drivers/html.js
-lib/zen/public/admin/js/zen/editor/drivers/markdown.js
-lib/zen/public/admin/js/zen/editor/drivers/textile.js
+lib/zen/public/admin/js/zen/core.js
+lib/zen/public/admin/js/zen/editor/markdown.js
+lib/zen/public/admin/js/zen/editor/textile.js
+lib/zen/public/admin/js/zen/editor.js
 lib/zen/public/admin/js/zen/init.js
-lib/zen/public/admin/js/zen/modal.js
-lib/zen/public/admin/js/zen/notification.js
 lib/zen/public/admin/js/zen/tabs.js
+lib/zen/public/admin/js/zen/window.js
 lib/zen/public/favicon.ico
 lib/zen/task/build.rake
 lib/zen/task/clean.rake
@@ -215,6 +236,7 @@ lib/zen/task/db.rake
 lib/zen/task/package.rake
 lib/zen/task/plugin.rake
 lib/zen/task/proto.rake
+lib/zen/task/test.rake
 lib/zen/task/theme.rake
 lib/zen/task.rb
 lib/zen/theme/base.rb
@@ -224,27 +246,21 @@ lib/zen/version.rb
 lib/zen/view/bottom.xhtml
 lib/zen/view/main.xhtml
 lib/zen.rb
-license.txt
 proto/app/Rakefile
 proto/app/app.rb
 proto/app/config/config.rb
 proto/app/config/database.rb
 proto/app/config/middlewares.rb
-proto/app/config/requires.rb
 proto/app/config.ru
 proto/app/log/.gitkeep
 proto/app/public/.gitkeep
 proto/app/start.rb
 proto/app/task/.gitkeep
-proto/app/vendor/.gitkeep
-proto/app/vendor/theme/.gitkeep
+proto/app/theme/.gitkeep
 proto/migration.rb
 proto/package/lib/package/controller/controllers.rb
 proto/package/lib/package/language/en/languages.yml
 proto/package/lib/package/model/model.rb
-proto/package/lib/package/view/admin/package/edit.xhtml
-proto/package/lib/package/view/admin/package/form.xhtml
 proto/package/lib/package/view/admin/package/index.xhtml
-proto/package/lib/package/view/admin/package/new.xhtml
 proto/package/lib/package.rb
 proto/package/migrations/.gitkeep

data/README.md

@@ -1,20 +1,18 @@
 # README
 
-Zen is a modular CMS written on top of the awesome Ramaze framework.
-Zen was built out of the frustration with Expression Engine, a popular CMS built on top of
-the Codeigniter framework which in turn is written using PHP. While I really like 
-Codeigniter, ExpressionEngine and EllisLab there were several problems that bothered me.
-So I set out to write a system that's loosely based on ExpressionEngine but fits my needs.
-Because of this certain features may seem similar to those provided by EE and while at
-certain points there are similarities there are also pretty big differences.
+Zen is a modular CMS written on top of the awesome Ramaze framework. Zen was built out of 
+the frustration with Expression Engine, a popular CMS built on top of the Codeigniter 
+framework which in turn is written using PHP. While I really like Codeigniter, 
+ExpressionEngine and EllisLab there were several problems that bothered me. So I set out 
+to write a system that's loosely based on ExpressionEngine but fits my needs. Because of 
+this certain features may seem similar to those provided by EE and while at certain 
+points there are similarities there are also pretty big differences.
 
 ## Requirements
 
 * Ramaze 2011.01.30 or newer 
-* Ruby 1.9 or newer
-* A Defensio API key (for the comments system)
+* Ruby 1.9.2
 * A database (MySQL, PostgreSQL, etc)
-* A HDD with some space left, mostly for the log files
 
 ## Installation
 
@@ -27,7 +25,7 @@ If you like to hack with the core of Zen it's best to install it using Git:
 
     $ git clone git://github.com/zen-cms/zen-core.git
     $ cd zen-core
-    $ rake build:gem_clean
+    $ rake build:gem
 
 ## Database Support
 
@@ -42,8 +40,8 @@ PostgreSQL will be tested in the near future.
 ## Running Zen
 
 Zen can be run using any webserver as long as it supports Rack. Thin, Unicorn or Passenger,
-they should all work. The main website of Zen is served using Unicorn and Nginx, development
-is done using WEBRick and Unicorn.
+they should all work. The main website of Zen is served using Unicorn and Nginx, 
+development is done using WEBRick and Unicorn.
 
 ## Documentation
 
@@ -60,23 +58,18 @@ is used to contain less stable (but not unstable) commits that will be pushed in
 from time to time. All other branches, e.g. "rspec2" will be used for individual features.
 
 Besides following this model developers are also expected to write tests using either
-RSpec or Webrat for their features. Webrat is used to test controllers and browser based
-tests while RSpec is used to test libraries, helpers, etc.
-
-If you have a cool idea, implemented it and think it's worth merging into Zen itself feel
-free to submit a pull request and I'll take a look at it.
+RSpec or Capybara for their features. Capybara is used to test controllers and browser 
+based tests while RSpec is used to test libraries, helpers, etc.
 
 ## Coding Standards
 
 * 2 spaces per indentation level for Ruby code.
 * 4 spaces per indentation level for Javascript, CSS and HTML.
 * Document your code, that includes CSS and Javascript files.
-* No tabs at all times
-* Markdown is used for all markup
-* Comments should be in English 
-* The maximum width of each line should be no more than 90 columns, this makes it easier
-to read code in terminals or when using split view modes.
-* Big changes should always be added to the file "CHANGELOG.md".
+* No tabs at all times.
+* Markdown is used for all markup.
+* The maximum width of each line should be no more than 90 characters, this makes it 
+easier to read code in terminals or when using split view modes.
 
 ## Community
 
@@ -94,7 +87,7 @@ of the following channels on Freenode:
 ## License
 
 Zen is licensed under the MIT license. For more information about this license open
-the file "license.txt".
+the file "LICENSE".
 
 [zen website]: http://zen-cms.com/
 [zen documentation]: http://zen-cms.com/userguide/

data/Rakefile

@@ -1,7 +1,6 @@
 require File.expand_path('../lib/zen', __FILE__)
 
-task_dir = File.expand_path('../lib/zen/task', __FILE__)
-
-Dir.glob("#{task_dir}/*.rake").each do |f|
+# Load all tasks
+Dir.glob(File.expand_path('../lib/zen/task/*.rake', __FILE__)).each do |f|
   import(f)
 end

data/bin/zen

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-
 require File.expand_path('../../lib/zen/version', __FILE__)
+
 require 'commander'
 require 'commander/import'
 
@@ -8,7 +8,7 @@ require 'commander/import'
 information = <<-MSG
 * Website: http://zen-cms.com/
     * Github: https://github.com/zen-cms
-    * License: MIT License (found in "license.txt")
+    * License: MIT License
 MSG
 
 # Set the details of the application

data/lib/zen.rb

@@ -1,9 +1,8 @@
-require 'sequel'
 require 'ramaze'
+require 'sequel'
 require 'bcrypt'
-require 'json'
-require 'defensio'
 require 'sequel_sluggable'
+require 'loofah'
 require 'yaml'
 require __DIR__('zen/version')
 
@@ -13,81 +12,117 @@ require __DIR__('zen/version')
 #
 # @author Yorick Peterse
 # @since  0.1
-# @attr_reader [Array] languages An array containing all the currently loaded language
-# files stored as hashes.
 #
 module Zen
-  include Innate::Optioned
-  
   # Update several paths so we can load helpers/layouts from the Zen gem
   Innate::HelpersHelper.options.paths.push(__DIR__('zen'))
   Ramaze.options.roots.push(__DIR__('zen'))
-  
-  options.dsl do
-    o 'The character encoding to use when dealing with data', :encoding,     'utf8'
-    o 'The date format to use for log files and such.',       :date_format,  '%d-%m-%Y'
-    o 'The root directory of Zen.',                           :root,         ''
-  end
-
-  ##
-  # Hash containing all system settings.
-  #
-  # @author Yorick Peterse
-  # @since  0.2.5
-  #
-  Settings = {}
-
-  ##
-  # Loads the database and the required models.
-  #
-  # @author Yorick Peterse
-  # @since  0.1
-  #
-  def self.init
-    # Initialize the database
-    Zen::Database.init
-    Zen::Language.load('zen_general')
-    
-    require __DIR__('zen/model/settings')
-    require __DIR__('zen/model/methods')
-
-    # Load the global stylesheet and Javascript file if they're located in 
-    # ROOT/public/css/admin/global.css and ROOT/public/js/admin/global.js
-    publics = ::Ramaze.options.publics
-
-    publics.each do |p|
-      p   = File.join(Zen.options.root, p)
-      css = File.join(p, 'admin/css/global.css')
-      js  = File.join(p, 'admin/js/global.js')
-
-      # Load the CSS file if it's there
-      if File.exist?(css)
-        ::Zen::Asset.stylesheet(['global'], :global => true)
-      end
 
-      # Load the JS file if it's there
-      if File.exist?(js)
-        ::Zen::Asset.javascript(['global'], :global => true)
+  class << self
+    ##
+    # Variable that will contain a database connection that was established using
+    # Sequel.connect.
+    #
+    # @author Yorick Peterse
+    # @since  0.2.6
+    #
+    attr_accessor :database
+
+    ##
+    # Hash containing all system settings.
+    #
+    # @author Yorick Peterse
+    # @since  0.2.6
+    #
+    attr_accessor :settings
+
+    ##
+    # String containing the path to the root directory of the Zen application.
+    #
+    # @author Yorick Peterse
+    # @since  0.2.6
+    #
+    attr_accessor :root
+
+    ##
+    # Loads the database and the required models.
+    #
+    # @author Yorick Peterse
+    # @since  0.1
+    #
+    def init
+      @settings ||= {}
+
+      # Initialize the database
+      Zen::Language.load('zen_general')
+
+      require __DIR__('zen/model/settings')
+      require __DIR__('zen/model/methods')
+
+      # Load the global stylesheet and Javascript file if they're located in
+      # ROOT/public/css/admin/global.css and ROOT/public/js/admin/global.js
+      publics = ::Ramaze.options.publics
+
+      publics.each do |p|
+        p   = File.join(Zen.root, p)
+        css = File.join(p, 'admin/css/global.css')
+        js  = File.join(p, 'admin/js/global.js')
+
+        # Load the CSS file if it's there
+        if File.exist?(css)
+          ::Zen::Asset.stylesheet(['global'], :global => true)
+        end
+
+        # Load the JS file if it's there
+        if File.exist?(js)
+          ::Zen::Asset.javascript(['global'], :global => true)
+        end
       end
     end
-  end
 
-end
+    ##
+    # Method executed after everything has been set up and loaded.
+    #
+    # @author Yorick Peterse
+    # @since  0.2.6
+    #
+    def post_init
+      # Migrate all settings
+      begin
+        plugin(:settings, :migrate)
+      rescue
+        Ramaze::Log.warn(
+          "Failed to migrate the settings, make sure the database table is up to date"
+        )
+      end
+
+      begin
+        ::Settings::Model::Setting.get_settings.each do |k, v|
+          Zen.settings[k] = v
+        end
+      rescue => e
+        Ramaze::Log.warn(
+          "Failed to retrieve the settings, are you sure the database is migrated?\n" + 
+          "Error: #{e.message}"
+        )
+      end
+    end
+  end # class << self
+end # Zen
 
 # Load all classes/modules provided by Zen itself.
 require __DIR__('zen/validation')
-require __DIR__('zen/database')
 require __DIR__('zen/plugin')
 require __DIR__('zen/language')
-require __DIR__('zen/logger')
 require __DIR__('zen/asset')
 
-# Load a set of modules into the global namespace 
+# Load a set of modules into the global namespace
 include Zen::Plugin::SingletonMethods
 include Zen::Language::SingletonMethods
 
 # Update the language path
 Zen::Language.options.paths.push(__DIR__('zen'))
+Zen::Language.load('zen_general')
 
 # Load all additional files
 require __DIR__('zen/plugin/helper')
@@ -102,3 +137,4 @@ require __DIR__('zen/controller/base_controller')
 require __DIR__('zen/controller/frontend_controller')
 require __DIR__('zen/controller/admin_controller')
 require __DIR__('zen/controller/main_controller')
+require __DIR__('zen/controller/preview')