zen 0.2.4.1 → 0.2.5

data/MANIFEST

@@ -2,9 +2,10 @@ CHANGELOG.md
 MANIFEST
 README.md
 ROADMAP.md
-Thorfile
+Rakefile
 bin/zen
-lib/zen/bin/base.rb
+lib/zen/asset.rb
+lib/zen/bin/app.rb
 lib/zen/controller/admin_controller.rb
 lib/zen/controller/base_controller.rb
 lib/zen/controller/frontend_controller.rb
@@ -14,30 +15,29 @@ lib/zen/error/language_error.rb
 lib/zen/error/package_error.rb
 lib/zen/error/plugin_error.rb
 lib/zen/error/theme_error.rb
+lib/zen/error/validation_error.rb
+lib/zen/ext/string.rb
 lib/zen/helper/acl.rb
-lib/zen/helper/asset.rb
 lib/zen/helper/breadcrumb.rb
 lib/zen/helper/common.rb
+lib/zen/helper/theme.rb
 lib/zen/language/en/zen_general.yml
 lib/zen/language/en/zen_models.yml
 lib/zen/language.rb
 lib/zen/layout/admin.xhtml
 lib/zen/layout/login.xhtml
-lib/zen/liquid/controller_behavior.rb
-lib/zen/liquid/general.rb
-lib/zen/liquid/redirect.rb
-lib/zen/liquid/strip.rb
 lib/zen/logger.rb
 lib/zen/model/methods.rb
 lib/zen/model/settings.rb
 lib/zen/package/all.rb
+lib/zen/package/base.rb
 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/liquid/categories.rb
 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
 lib/zen/package/categories/lib/categories/view/admin/categories/edit.xhtml
 lib/zen/package/categories/lib/categories/view/admin/categories/form.xhtml
 lib/zen/package/categories/lib/categories/view/admin/categories/index.xhtml
@@ -52,9 +52,8 @@ 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/liquid/comment_form.rb
-lib/zen/package/comments/lib/comments/liquid/comments.rb
 lib/zen/package/comments/lib/comments/model/comment.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
 lib/zen/package/comments/lib/comments/view/admin/comments/index.xhtml
@@ -84,9 +83,9 @@ 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/liquid/menus.rb
 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
 lib/zen/package/menus/lib/menus/view/admin/menu-items/edit.xhtml
 lib/zen/package/menus/lib/menus/view/admin/menu-items/form.xhtml
 lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml
@@ -102,10 +101,10 @@ 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/liquid/section_entries.rb
-lib/zen/package/sections/lib/sections/liquid/sections.rb
 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
+lib/zen/package/sections/lib/sections/plugin/sections.rb
 lib/zen/package/sections/lib/sections/view/admin/edit.xhtml
 lib/zen/package/sections/lib/sections/view/admin/form.xhtml
 lib/zen/package/sections/lib/sections/view/admin/index.xhtml
@@ -119,21 +118,22 @@ lib/zen/package/sections/migrations/.gitkeep
 lib/zen/package/sections/migrations/1295251836_create_schema.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/liquid/setting.rb
 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
+lib/zen/package/settings/lib/settings/plugin/settings.rb
 lib/zen/package/settings/lib/settings/view/admin/settings/index.xhtml
 lib/zen/package/settings/lib/settings.rb
 lib/zen/package/settings/migrations/.gitkeep
 lib/zen/package/settings/migrations/1295597111_create_schema.rb
 lib/zen/package/settings/migrations/1299538742_add_language_key.rb
+lib/zen/package/settings/migrations/1303196915_settings_plugin.rb
 lib/zen/package/users/lib/users/controller/access_rules.rb
 lib/zen/package/users/lib/users/controller/user_groups.rb
 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/liquid/user.rb
-lib/zen/package/users/lib/users/liquid/users.rb
 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
@@ -154,10 +154,15 @@ lib/zen/package/users/lib/users/view/admin/users/new.xhtml
 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.rb
-lib/zen/plugin/markup.rb
+lib/zen/plugin/base.rb
+lib/zen/plugin/controller.rb
+lib/zen/plugin/helper.rb
+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/boilerplate.css
 lib/zen/public/admin/css/buttons.css
 lib/zen/public/admin/css/datepicker.css
 lib/zen/public/admin/css/editor.css
@@ -167,9 +172,9 @@ 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/general/noise.jpg
 lib/zen/public/admin/images/icons/accept.png
 lib/zen/public/admin/images/icons/add.png
 lib/zen/public/admin/images/icons/back.png
@@ -193,11 +198,8 @@ lib/zen/public/admin/images/icons/user.png
 lib/zen/public/admin/images/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/Picker.Attach.js
-lib/zen/public/admin/js/vendor/datepicker/Picker.Date.js
-lib/zen/public/admin/js/vendor/datepicker/Picker.js
-lib/zen/public/admin/js/vendor/datepicker/README.md
-lib/zen/public/admin/js/vendor/datepicker/locale.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
@@ -206,18 +208,24 @@ 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/strict_struct.rb
-lib/zen/task/build.rb
-lib/zen/task/clean.rb
-lib/zen/task/db.rb
-lib/zen/task/package.rb
-lib/zen/task/proto.rb
-lib/zen/task/theme.rb
+lib/zen/public/favicon.ico
+lib/zen/task/build.rake
+lib/zen/task/clean.rake
+lib/zen/task/db.rake
+lib/zen/task/package.rake
+lib/zen/task/plugin.rake
+lib/zen/task/proto.rake
+lib/zen/task/theme.rake
+lib/zen/task.rb
+lib/zen/theme/base.rb
 lib/zen/theme.rb
+lib/zen/validation.rb
 lib/zen/version.rb
+lib/zen/view/bottom.xhtml
+lib/zen/view/main.xhtml
 lib/zen.rb
 license.txt
-proto/app/Thorfile
+proto/app/Rakefile
 proto/app/app.rb
 proto/app/config/config.rb
 proto/app/config/database.rb
@@ -227,8 +235,9 @@ 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/themes/.gitkeep
+proto/app/vendor/theme/.gitkeep
 proto/migration.rb
 proto/package/lib/package/controller/controllers.rb
 proto/package/lib/package/language/en/languages.yml

data/README.md

@@ -2,32 +2,19 @@
 
 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.
+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
 
-The following Gems are always required:
-
-* Ramaze
-* Sequel
-* Liquid
-* BCrypt
-* JSON
-* Ruby 1.9
-* Defensio
-* Thor
-* Sequel Sluggable
-
-These Gems are only required when developing/hacking Zen itself:
-
-* RDiscount
-* YARD
-* RSpec 2
-* Webrat
+* Ramaze 2011.01.30 or newer 
+* Ruby 1.9 or newer
+* A Defensio API key (for the comments system)
+* A database (MySQL, PostgreSQL, etc)
+* A HDD with some space left, mostly for the log files
 
 ## Installation
 
@@ -40,7 +27,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
-    $ thor build:gem_clean
+    $ rake build:gem_clean
 
 ## Database Support
 
@@ -97,12 +84,12 @@ to read code in terminals or when using split view modes.
 * Mailing list
 
 Zen does not have it's own IRC channel at this time but you can usually find me in any
-of the following channels on Freenode (all are prefixed with a hash sign):
+of the following channels on Freenode:
 
-* forrst-chat
-* ramaze
-* codeigniter
-* mootools
+* \#forrst-chat
+* \#ramaze
+* \#codeigniter
+* \#mootools
 
 ## License
 
@@ -110,5 +97,5 @@ Zen is licensed under the MIT license. For more information about this license o
 the file "license.txt".
 
 [zen website]: http://zen-cms.com/
-[zen documentation]: http://zen-cms.com/documentation/
+[zen documentation]: http://zen-cms.com/userguide/
 [nvie branch model]: http://nvie.com/posts/a-successful-git-branching-model/

data/ROADMAP.md

@@ -10,8 +10,26 @@ to be unverified/undecided and might not be added/completed at all.
 ### 0.3 - June 2011
 
 * Website completely up and running. (!)
-* Translation system for the Javascript used in the backend
-* Documentation/Userguide online
+* Translation system for the Javascript used in the backend.
+* Documentation online.
+
+### 0.2.6 - May 2011
+
+* Implement something like Sprockets that can combine CSS/Javascript files and ditch the
+rather crappy helper Ramaze::Helper::Asset.
+* Add some sort of UI framework making it easier to create modal windows, tables, etc.
+* Improve/overhaul the text editor used in the backend, it's rather basic at the moment.
+* Improve the comment system so that people can save their data in some way (perhaps 
+allow people to register). 
+
+### 0.2.5 - April 2011
+
+* Replaced Liquid by a combination of Etanni and a set of plugins.
+* Allow developers to register and load Javascript and CSS files globally.
+* Replace all CSS files by Less CSS if this turns out to have an advantage over regular
+css files. (?)
+* Remove the methods from Settings::Model::Setting that are used to generate the possible
+values for system settings. These should go in a plugin or something similar.
 
 ### 0.2.4 - March 2011
 

data/{Thorfile → Rakefile}

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

data/bin/zen

@@ -1,8 +1,30 @@
 #!/usr/bin/env ruby
-zen_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'zen'))
 
-require 'thor'
-require zen_path
-require zen_path + "/bin/base"
+require File.expand_path('../../lib/zen/version', __FILE__)
+require 'commander'
+require 'commander/import'
 
-Zen::Bin::Base.start
+# Set the extra information message
+information = <<-MSG
+* Website: http://zen-cms.com/
+    * Github: https://github.com/zen-cms
+    * License: MIT License (found in "license.txt")
+MSG
+
+# Set the details of the application
+program :name       , 'Zen'
+program :version    , Zen::Version
+program :description, 'Zen is a modular CMS written using Ramaze.'
+
+program :help, 'Example'    , '$ zen [COMMAND] [OPTIONS]'
+program :help, 'Information', information.strip
+
+program :help_formatter, Commander::HelpFormatter::TerminalCompact
+
+# Load all the commands
+commands = File.expand_path('../../lib/zen/bin/*.rb', __FILE__)
+commands = Dir.glob(commands)
+
+commands.each do |cmd|
+  require cmd
+end

data/lib/zen.rb

@@ -1,3 +1,12 @@
+require 'sequel'
+require 'ramaze'
+require 'bcrypt'
+require 'json'
+require 'defensio'
+require 'sequel_sluggable'
+require 'yaml'
+require __DIR__('zen/version')
+
 ##
 # Main module for Zen, all other modules and classes will be placed inside this module.
 # This module loads all required classes and is used for starting the application.
@@ -8,21 +17,7 @@
 # files stored as hashes.
 #
 module Zen
-  require 'sequel'
-  require 'ramaze'
-  require 'bcrypt'
-  require 'liquid'
-  require 'json'
-  require 'defensio'
-  require 'sequel_sluggable'
-  require 'yaml'
-  require __DIR__('zen/version')
-  
   include Innate::Optioned
-
-  class << self
-    attr_reader :languages
-  end
   
   # Update several paths so we can load helpers/layouts from the Zen gem
   Innate::HelpersHelper.options.paths.push(__DIR__('zen'))
@@ -31,42 +26,19 @@ module 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 base directory of Zen.',                           :root,         ''
+    o 'The root directory of Zen.',                           :root,         ''
   end
-  
-  # Load all classes/modules provided by Zen itself.
-  require __DIR__ 'zen/strict_struct'
-  require __DIR__ 'zen/logger'
-  require __DIR__ 'zen/database'
-  require __DIR__ 'zen/package'
-  require __DIR__ 'zen/language'
-  require __DIR__ 'zen/plugin'
-  require __DIR__ 'zen/theme'
 
-  # Load all required plugins
-  require __DIR__ 'zen/plugin/markup'
-  
-  # Load all the base controllers
-  require __DIR__ 'zen/controller/base_controller'
-  require __DIR__ 'zen/controller/frontend_controller'
-  require __DIR__ 'zen/controller/admin_controller'
-  require __DIR__ 'zen/controller/main_controller'
-  
-  # Load all default Liquid tags
-  require __DIR__ 'zen/liquid/general'
-  require __DIR__ 'zen/liquid/controller_behavior'
-  require __DIR__ 'zen/liquid/redirect'
-  require __DIR__ 'zen/liquid/strip'
-  
-  # Update the language paths
-  Zen::Language.options.paths.push(__DIR__('zen'))
-  
-  # Register our Liquid tags
-  ::Liquid::Template.register_tag('strip'   , Liquid::Strip)
-  ::Liquid::Template.register_tag('redirect', Liquid::Redirect)
+  ##
+  # Hash containing all system settings.
+  #
+  # @author Yorick Peterse
+  # @since  0.2.5
+  #
+  Settings = {}
 
   ##
-  # Intitializes Zen by connecting the database and setting up various other things.
+  # Loads the database and the required models.
   #
   # @author Yorick Peterse
   # @since  0.1
@@ -76,11 +48,57 @@ module Zen
     Zen::Database.init
     Zen::Language.load('zen_general')
     
-    require __DIR__ 'zen/model/settings'
-    require __DIR__ 'zen/model/methods'
-    
-    @languages = {
-      'en' => lang('zen_general.special.language_hash.en')
-    }
+    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)
+      end
+    end
   end
+
 end
+
+# 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 
+include Zen::Plugin::SingletonMethods
+include Zen::Language::SingletonMethods
+
+# Update the language path
+Zen::Language.options.paths.push(__DIR__('zen'))
+
+# Load all additional files
+require __DIR__('zen/plugin/helper')
+require __DIR__('zen/plugin/controller')
+require __DIR__('zen/plugin/markup/lib/markup')
+
+require __DIR__('zen/package')
+require __DIR__('zen/theme')
+
+# Load all the base controllers
+require __DIR__('zen/controller/base_controller')
+require __DIR__('zen/controller/frontend_controller')
+require __DIR__('zen/controller/admin_controller')
+require __DIR__('zen/controller/main_controller')