zen 0.2.4.1 → 0.2.5

data/lib/zen/version.rb

@@ -8,5 +8,5 @@ module Zen
   # @author Yorick Peterse
   # @since  0.1
   #
-  Version = '0.2.4.1'
+  Version = '0.2.5'
 end

data/lib/zen/view/bottom.xhtml

@@ -0,0 +1,6 @@
+<script>
+Zen       = {};
+Zen.Flash = #{flash.combined.to_json};
+</script>
+
+#{Zen::Asset.build(:javascript)}

data/lib/zen/view/main.xhtml

@@ -0,0 +1,32 @@
+<!--
+Main area of the admin panel. The content stretches across the entire screen and there
+are no silly sidebars.
+-->
+<div id="container" class="container">
+    <div id="content" class="grid_12">
+        #{@content}
+    </div>
+</div>
+
+<footer id="main_footer" class="container">
+    <div class="grid_12">
+        <p>#{lang('zen_general.labels.zen_version') % Zen::Version}</p>
+        <ul class="clearfix">
+            <li>
+                <a href="http://zen-cms.com/">
+                    #{lang('zen_general.labels.zen_website')}
+                </a>
+            </li>
+            <li>
+                <a href="http://zen-cms.com/userguide">
+                    #{lang('zen_general.labels.zen_docs')}
+                </a>
+            </li>
+            <li>
+                <a href="https://github.com/zen-cms/">
+                    #{lang('zen_general.labels.zen_github')}
+                </a>
+            </li>
+        </ul>
+    </div>
+</footer>

data/proto/app/Rakefile

@@ -0,0 +1,12 @@
+require File.expand_path('../app.rb', __FILE__)
+require 'zen/task'
+
+task_dir = File.expand_path('../task', __FILE__)
+
+# Load all tasks from ./task if the directory exists
+if File.directory?(task_dir)
+  Dir.glob("#{task_dir}/**/*.rake").each do |task|
+    import task
+  end
+end
+

data/proto/app/app.rb

@@ -2,19 +2,19 @@
 require 'zen'
 
 # Load the configuration files
-require __DIR__ 'config/config'
+require __DIR__('config/config')
 
 # Load all our custom Rack middlewares
-require __DIR__ 'config/middlewares'
+require __DIR__('config/middlewares')
 
 # Load the database configuration file
-require __DIR__ 'config/database'
+require __DIR__('config/database')
 
 # Make sure that Ramaze knows where you are
-Ramaze.options.roots << Zen.options.root
+Ramaze.options.roots.push(Zen.options.root)
 
-# Initialize Zen
+# Load the database
 Zen.init
 
 # Require all the custom gems/modules we need
-require __DIR__ 'config/requires'
+require __DIR__('config/requires')

data/proto/app/config/config.rb

@@ -1,30 +1,23 @@
-##
 # Specify the root directory. This is required since there are multiple directories
 # to load resources from. This directory will be used for the database logger, modes, etc.
-#
 Zen.options.root     = __DIR__('../')
 
-##
 # UTF-8 bitches.
-#
 Zen.options.encoding = 'utf8'
 
-##
 # Sets the language to use in the event of the database settings not being set correctly.
-#
 Zen.options.language = 'en'
 
-##
 # Set the application's mode. Available modes are "dev" and "live"
-#
 Ramaze.options.mode  = :dev
 
-##
 # The session identifier to use for cookies.
-#
 Ramaze.options.session.key = 'zen.sid'
 
-##
-# View caching.
-#
-Ramaze::View.options.cache = false
+# Cache settings. These are turned off for the development server to make it easier
+# to debug potential errors.
+Ramaze::View.options.cache      = false
+Ramaze::View.options.read_cache = false
+
+# Use LRU instead of the memory cache as the latter leaks memory over time
+Ramaze::Cache.options.session = Ramaze::Cache::LRU

data/proto/app/config/database.rb

@@ -16,29 +16,19 @@
 # all databases.
 #
 Zen::Database.mode :dev do |db|
-  ##
   # Example: mysql2
-  #
   db.adapter  = ''
 
-  ##
   # Example: localhost
-  #
   db.host     = ''
 
-  ##
   # Example: zen-app
-  #
   db.username = ''
   
-  ##
   # Example: 23x190jj38123x
-  #
   db.password = ''
 
-  ##
   # Example: blog
-  #
   db.database = ''
 end
 
@@ -47,28 +37,18 @@ end
 # This group accepts the same settings as the block above.
 #
 Zen::Database.mode :live do |db|
-  ##
   # Example: mysql2
-  #
   db.adapter  = ''
 
-  ##
   # Example: localhost
-  #
   db.host     = ''
 
-  ##
   # Example: zen-app
-  #
   db.username = ''
   
-  ##
   # Example: 23x190jj38123x
-  #
   db.password = ''
 
-  ##
   # Example: blog
-  #
   db.database = ''
 end

data/proto/app/start.rb

@@ -14,4 +14,3 @@ Ramaze.start(
   :adapter => Ramaze::Adapter.options.handler,
   :port    => Ramaze::Adapter.options.port
 )
-

data/proto/package/lib/package.rb

@@ -1,31 +1,22 @@
 Zen::Package.add do |p|
-  # The name of the package
-  p.name        = '' 
+  # The name of the package, should match /[a-z0-9_\-]+/
+  p.name = '' 
 
   # The person/company that made the package
-  p.author      = ''
+  p.author = ''
 
   # A URL to a page about the package
-  p.url         = ''
+  p.url = ''
 
   # Describe what your theme or extension does.
-  p.about       = ''
+  p.about = ''
 
-  ## 
-  # An identifier is a unique string for your package in the following format: 
-  # 
-  #     com.VENDOR.NAME
-  #
-  p.identifier  = 'com.vendor.module'
-
-  ##
   # Path to the directory containing the controllers, models, etc.
-  #
-  p.directory   = __DIR__('package')
+  p.directory = __DIR__('package')
   
   # Note that themes can not have menu items (they'll be ignored).
   p.menu = [{
-    :title => "",
-    :url   => ""
+    :title => 'Prototype',
+    :url   => '/admin/prototype'
   }]
 end

data/proto/package/lib/package/controller/controllers.rb

@@ -1,5 +1,5 @@
 module EXTENSION
-  module Controllers
+  module Controller
     ##
     #
     # @author
@@ -8,8 +8,7 @@ module EXTENSION
     class CONTROLLER < Zen::Controllers::AdminController
       include ::EXTENSION::Models
 
-      map   "/admin/module"
-      trait :extension_identifier => ''
+      map('/admin/module')
       
       before_all do
         csrf_protection :save, :delete do
@@ -25,7 +24,7 @@ module EXTENSION
       def initialize
         super
         
-        Zen::Language.load 'language'
+        Zen::Language.load('language')
         
         # Set the page title
         if !action.method.nil?
@@ -78,6 +77,7 @@ module EXTENSION
       def delete
         
       end
+
     end
   end
 end

data/proto/package/lib/package/language/en/languages.yml

@@ -1,4 +1,4 @@
 titles:
-  index :''
-  edit  : ''
-  new   : ''
+  index: ''
+  edit : ''
+  new  : ''

data/proto/package/lib/package/model/model.rb

@@ -1,5 +1,5 @@
 module EXTENSION
-  module Models
+  module Model
     ##
     #
     # @author

metadata

@@ -2,7 +2,7 @@
 name: zen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4.1
+  version: 0.2.5
 platform: ruby
 authors: 
 - Yorick Peterse
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 +01:00
+date: 2011-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,149 +47,140 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: liquid
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 1.5.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: defensio
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 0.9.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: sequel_sluggable
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.14.6
+        version: 0.0.6
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: defensio
+  name: commander
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 4.0.4
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sequel_sluggable
+  name: rake
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        version: 0.8.7
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: ruby-extensions
+  name: rdiscount
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
-  type: :runtime
+        version: 1.6.8
+  type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: redcloth
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.8
+        version: 4.2.7
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: redcloth
+  name: rspec
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.2.7
+        version: 2.5.0
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 0.6.5
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: capybara
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.5
+        version: 0.4.1.2
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: rack-test
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1.2
+        version: 0.5.7
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: sqlite3
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.3
   type: :development
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id016
-description: Zen is a fully modular CMS written using Ramaze. Unlike traditional Content Management Systems you are completely free to build whatever you want.
+description: |-
+  Zen is a modular CMS written using Ramaze. Unlike traditional CMS' you 
+   are completely free to build whatever you want.
 email: info@yorickpeterse.com
 executables: 
 - zen
@@ -202,9 +193,10 @@ files:
 - 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
@@ -214,30 +206,29 @@ files:
 - 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
@@ -252,9 +243,8 @@ files:
 - 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
@@ -284,9 +274,9 @@ files:
 - 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
@@ -302,10 +292,10 @@ files:
 - 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
@@ -319,21 +309,22 @@ files:
 - 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
@@ -354,10 +345,15 @@ files:
 - 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
@@ -367,9 +363,9 @@ files:
 - 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
@@ -393,11 +389,8 @@ files:
 - 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
@@ -406,18 +399,24 @@ files:
 - 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
@@ -427,8 +426,9 @@ files:
 - 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
@@ -466,6 +466,6 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Zen is a fully modular CMS written using Ramaze.
+summary: Zen is a modular CMS written using Ramaze.
 test_files: []