zen 0.2.8 → 0.3b

data/spec/zen/theme.rb

@@ -2,11 +2,11 @@ require File.expand_path('../../helper', __FILE__)
 
 describe("Zen::Theme") do
 
-  it("No themes should exist") do
+  it('Error when retrieving a theme when no themes exist') do
     should.raise?(Zen::ThemeError) { Zen::Theme[:spec] }
   end
 
-  it("Add a new theme") do
+  it('Add a new theme') do
     Zen::Theme.add do |t|
       t.name         = 'spec'
       t.author       = 'Yorick Peterse'
@@ -18,7 +18,7 @@ describe("Zen::Theme") do
     should.not.raise?(Zen::ThemeError) { Zen::Theme[:spec] }
   end
 
-  it('Add an existing theme') do
+  it('Add an already existing theme') do
     should.raise?(Zen::ValidationError) do
       Zen::Theme.add do |t|
         t.name         = 'spec'
@@ -29,13 +29,11 @@ describe("Zen::Theme") do
     end
   end
 
-  it("Retrieve our theme") do
+  it('Retrieve a theme using Zen::Theme') do
     theme = Zen::Theme[:spec]
 
-    theme.name.should         === :spec
-    theme.author.should       === 'Yorick Peterse'
-    theme.template_dir.should === __DIR__
+    theme.name.should         == :spec
+    theme.author.should       == 'Yorick Peterse'
+    theme.template_dir.should == __DIR__
   end
-
 end
-

data/spec/zen/validation.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../helper', __FILE__)
-require File.join(Zen::Fixtures, 'validation')
+require File.join(Zen::FIXTURES, 'validation')
 require 'fileutils'
 
 describe('Zen::Validation') do
@@ -59,5 +59,4 @@ describe('Zen::Validation') do
 
     File.unlink('/tmp/zen_validation')
   end
-
 end

data/zen.gemspec

@@ -1,36 +1,39 @@
 require File.expand_path('../lib/zen/version', __FILE__)
 
-# Get all the files from the manifest
 path = File.expand_path('../', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'zen'
-  s.version     = Zen::Version
-  s.date        = '03-08-2011'
+  s.version     = Zen::VERSION
+  s.date        = '2011-11-23'
   s.authors     = ['Yorick Peterse']
   s.email       = 'info@yorickpeterse.com'
   s.summary     = 'Zen is a modular CMS written using Ramaze.'
   s.homepage    = 'http://zen-cms.com/'
-  s.description = 'Zen is a modular CMS written using Ramaze. Unlike traditional
-CMS\' you are completely free to build whatever you want.'
+  s.description = 'Zen is a modular CMS written using Ramaze. ' \
+    'Zen gives you complete freedom to build whatever you want in whatever ' \
+    'way you might want to build it.'
 
-  s.files       = `cd #{path}; git ls-files`.split("\n").sort
-  s.has_rdoc    = 'yard'
-  s.executables = ['zen']
+  s.files                 = `cd #{path}; git ls-files`.split("\n").sort
+  s.has_rdoc              = 'yard'
+  s.executables           = ['zen']
+  s.required_ruby_version = '>= 1.9.2'
 
-  s.add_dependency('sequel'          , ['~> 3.26'])
-  s.add_dependency('ramaze'          , ['~> 2011.07.25'])
-  s.add_dependency('bcrypt-ruby'     , ['~> 2.1.4'])
-  s.add_dependency('sequel_sluggable', ['~> 0.0.6'])
-  s.add_dependency('rake'            , ['~> 0.9.2'])
-  s.add_dependency('loofah'          , ['~> 1.0.0'])
+  s.add_dependency('sequel'      , ['~> 3.28.0'])
+  s.add_dependency('ramaze'      , ['~> 2011.10.23'])
+  s.add_dependency('bcrypt-ruby' , ['~> 3.0.1'])
+  s.add_dependency('rake'        , ['~> 0.9.2'])
+  s.add_dependency('loofah'      , ['~> 1.2.0'])
+  s.add_dependency('ramaze-asset', ['~> 0.2.3'])
+  s.add_dependency('shebang'     , ['~> 0.1'])
 
-  s.add_development_dependency('rdiscount', ['~> 1.6.8'])
-  s.add_development_dependency('bacon'    , ['~> 1.1.0'])
-  s.add_development_dependency('yard'     , ['~> 0.7.2'])
-  s.add_development_dependency('capybara' , ['~> 1.0.0'])
-  s.add_development_dependency('sqlite3'  , ['~> 1.3.4'])
-  s.add_development_dependency('defensio' , ['~> 0.9.1'])
-  s.add_development_dependency('simplecov', ['~> 0.4.2'])
-  s.add_development_dependency('webmock'  , ['~> 1.6.4'])
+  s.add_development_dependency('rdiscount', ['>= 1.6.8'])
+  s.add_development_dependency('RedCloth' , ['>= 4.2.8'])
+  s.add_development_dependency('bacon'    , ['>= 1.1.0'])
+  s.add_development_dependency('yard'     , ['>= 0.7.2'])
+  s.add_development_dependency('capybara' , ['>= 1.1.1'])
+  s.add_development_dependency('sqlite3'  , ['>= 1.3.4'])
+  s.add_development_dependency('defensio' , ['>= 0.9.1'])
+  s.add_development_dependency('simplecov', ['>= 0.4.2'])
+  s.add_development_dependency('webmock'  , ['>= 1.6.4'])
 end

metadata

@@ -1,235 +1,301 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zen
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.8
+version: !ruby/object:Gem::Version
+  version: 0.3b
+  prerelease: 3
 platform: ruby
-authors: 
+authors:
 - Yorick Peterse
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160155880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.26"
+      - !ruby/object:Gem::Version
+        version: 3.28.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ramaze
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160155880
+- !ruby/object:Gem::Dependency
+  name: ramaze
+  requirement: &2160155400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2011.07.25
+      - !ruby/object:Gem::Version
+        version: 2011.10.23
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160155400
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: &2160154920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.1.4
+      - !ruby/object:Gem::Version
+        version: 3.0.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sequel_sluggable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160154920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160154440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.0.6
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160154440
+- !ruby/object:Gem::Dependency
+  name: loofah
+  requirement: &2160153960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: loofah
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160153960
+- !ruby/object:Gem::Dependency
+  name: ramaze-asset
+  requirement: &2160153480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160153480
+- !ruby/object:Gem::Dependency
+  name: shebang
+  requirement: &2160153000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160153000
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &2152757080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.8
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2152757080
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &2152755980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.8
+  type: :development
+  prerelease: false
+  version_requirements: *2152755980
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &2152754480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2152754480
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2152753060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2152753060
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &2160204560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2160204560
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2160204080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: defensio
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2160204080
+- !ruby/object:Gem::Dependency
+  name: defensio
+  requirement: &2160203600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *2160203600
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2160203120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *2160203120
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2160202640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id014
-description: |-
-  Zen is a modular CMS written using Ramaze. Unlike traditional
-  CMS' you are completely free to build whatever you want.
+  prerelease: false
+  version_requirements: *2160202640
+description: Zen is a modular CMS written using Ramaze. Zen gives you complete freedom
+  to build whatever you want in whatever way you might want to build it.
 email: info@yorickpeterse.com
-executables: 
+executables:
 - zen
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gems
 - .gitignore
 - .mailmap
 - .rvmrc
 - .travis.yml
+- .yardopts
 - AUTHORS
-- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
 - bin/zen
+- guide/_static/categories/categories.png
+- guide/_static/categories/category_groups.png
+- guide/_static/categories/new_category.png
+- guide/_static/categories/new_category_group.png
+- guide/_static/comments/comments.png
+- guide/_static/comments/edit_comment.png
+- guide/_static/custom_fields/custom_field_groups.png
+- guide/_static/custom_fields/custom_field_types.png
+- guide/_static/custom_fields/custom_fields.png
+- guide/_static/custom_fields/edit_custom_field_general.png
+- guide/_static/custom_fields/edit_custom_field_group.png
+- guide/_static/custom_fields/edit_custom_field_settings.png
+- guide/_static/custom_fields/edit_custom_field_type.png
+- guide/_static/menus/edit_menu.png
+- guide/_static/menus/edit_menu_item.png
+- guide/_static/menus/menu_items.png
+- guide/_static/menus/menus.png
+- guide/_static/sections/edit_entry.png
+- guide/_static/sections/edit_entry_categories.png
+- guide/_static/sections/edit_entry_general.png
+- guide/_static/sections/edit_entry_meta.png
+- guide/_static/sections/edit_section_comments.png
+- guide/_static/sections/edit_section_general.png
+- guide/_static/sections/edit_section_groups.png
+- guide/_static/sections/entries.png
+- guide/_static/sections/sections.png
+- guide/_static/settings/overview_general.png
+- guide/_static/settings/overview_security.png
+- guide/_static/settings/overview_user.png
+- guide/_static/users/edit_user.png
+- guide/_static/users/edit_user_group.png
+- guide/_static/users/edit_user_group_permissions.png
+- guide/_static/users/edit_user_permissions.png
+- guide/_static/users/overview.png
+- guide/_static/users/user_groups_overview.png
+- guide/asset_management.md
+- guide/changelog.md
+- guide/css/common.css
+- guide/getting_started.md
+- guide/hacking.md
+- guide/installation.md
+- guide/javascript.md
+- lib/vendor/sequel_sluggable.rb
+- lib/yard/tags.rb
 - lib/zen.rb
-- lib/zen/asset.rb
+- lib/zen/asset_groups.rb
 - lib/zen/bin/create.rb
-- lib/zen/bin/runner.rb
+- lib/zen/bin/default.rb
 - 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/controller/preview.rb
-- 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/helper/acl.rb
-- lib/zen/helper/blue_form_vendor.rb
+- lib/zen/controller/translations.rb
+- lib/zen/error.rb
+- lib/zen/event.rb
+- lib/zen/helper/asset.rb
 - lib/zen/helper/breadcrumb.rb
+- lib/zen/helper/controller.rb
+- lib/zen/helper/locale.rb
 - lib/zen/helper/message.rb
+- lib/zen/helper/search.rb
+- lib/zen/helper/stacked_aspect.rb
 - lib/zen/helper/theme.rb
 - lib/zen/language.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/en/zen_general.rb
+- lib/zen/language/en/zen_models.rb
+- lib/zen/language/nl/zen_general.rb
+- lib/zen/language/nl/zen_models.rb
+- lib/zen/language/translation.rb
+- lib/zen/languages.rb
 - lib/zen/layout/admin.xhtml
 - lib/zen/layout/login.xhtml
+- lib/zen/markup.rb
+- lib/zen/model/helper.rb
+- lib/zen/model/init.rb
 - lib/zen/model/methods.rb
-- lib/zen/model/settings.rb
 - lib/zen/package.rb
 - lib/zen/package/all.rb
-- lib/zen/package/base.rb
 - lib/zen/package/categories/lib/categories.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/helper/category.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/helper/category_frontend.rb
+- lib/zen/package/categories/lib/categories/language/en/categories.rb
+- lib/zen/package/categories/lib/categories/language/en/category_groups.rb
+- lib/zen/package/categories/lib/categories/language/nl/categories.rb
+- lib/zen/package/categories/lib/categories/language/nl/category_groups.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/form.xhtml
 - lib/zen/package/categories/lib/categories/view/admin/categories/index.xhtml
 - lib/zen/package/categories/lib/categories/view/admin/category-groups/form.xhtml
@@ -237,32 +303,33 @@ files:
 - lib/zen/package/categories/migrations/.gitkeep
 - lib/zen/package/categories/migrations/1295282303_create_schema.rb
 - lib/zen/package/comments/lib/comments.rb
+- lib/zen/package/comments/lib/comments/anti_spam.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/helper/comment.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/helper/comment_frontend.rb
+- lib/zen/package/comments/lib/comments/language/en/comments.rb
+- lib/zen/package/comments/lib/comments/language/nl/comments.rb
 - lib/zen/package/comments/lib/comments/model/comment.rb
 - lib/zen/package/comments/lib/comments/model/comment_status.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/form.xhtml
 - lib/zen/package/comments/lib/comments/view/admin/comments/index.xhtml
 - lib/zen/package/comments/migrations/.gitkeep
 - lib/zen/package/comments/migrations/1295282202_create_schema.rb
 - lib/zen/package/comments/migrations/1308774099_comment_status.rb
+- lib/zen/package/comments/migrations/1313851786_remove_defensio_signature.rb
 - lib/zen/package/custom_fields/lib/custom_fields.rb
 - lib/zen/package/custom_fields/lib/custom_fields/blue_form_parameters.rb
 - lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb
 - lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_types.rb
 - lib/zen/package/custom_fields/lib/custom_fields/controller/custom_fields.rb
 - lib/zen/package/custom_fields/lib/custom_fields/helper/custom_field.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_field_types.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_field_types.yml
-- lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.yml
+- lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.rb
+- lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.rb
+- lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.rb
+- lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.rb
+- lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.rb
+- lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.rb
 - 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_method.rb
@@ -278,17 +345,23 @@ files:
 - lib/zen/package/custom_fields/migrations/1295255665_create_schema.rb
 - lib/zen/package/custom_fields/migrations/1310659580_custom_field_types.rb
 - lib/zen/package/custom_fields/migrations/1311694920_rename_css_class.rb
+- lib/zen/package/extensions/lib/extensions.rb
+- lib/zen/package/extensions/lib/extensions/controller/extensions.rb
+- lib/zen/package/extensions/lib/extensions/language/en/extensions.rb
+- lib/zen/package/extensions/lib/extensions/language/nl/extensions.rb
+- lib/zen/package/extensions/lib/extensions/view/admin/extensions/index.xhtml
+- lib/zen/package/menu.rb
 - lib/zen/package/menus/lib/menus.rb
 - lib/zen/package/menus/lib/menus/controller/menu_items.rb
 - lib/zen/package/menus/lib/menus/controller/menus.rb
 - lib/zen/package/menus/lib/menus/helper/menu.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/helper/menu_frontend.rb
+- lib/zen/package/menus/lib/menus/language/en/menu_items.rb
+- lib/zen/package/menus/lib/menus/language/en/menus.rb
+- lib/zen/package/menus/lib/menus/language/nl/menu_items.rb
+- lib/zen/package/menus/lib/menus/language/nl/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/form.xhtml
 - lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml
 - lib/zen/package/menus/lib/menus/view/admin/menus/form.xhtml
@@ -301,15 +374,14 @@ files:
 - 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/helper/section.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/helper/section_frontend.rb
+- lib/zen/package/sections/lib/sections/language/en/section_entries.rb
+- lib/zen/package/sections/lib/sections/language/en/sections.rb
+- lib/zen/package/sections/lib/sections/language/nl/section_entries.rb
+- lib/zen/package/sections/lib/sections/language/nl/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/model/section_entry_status.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/form.xhtml
 - lib/zen/package/sections/lib/sections/view/admin/index.xhtml
 - lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml
@@ -320,52 +392,56 @@ files:
 - lib/zen/package/sections/migrations/1308672298_use_id_for_default_section.rb
 - lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb
 - lib/zen/package/settings/lib/settings.rb
+- lib/zen/package/settings/lib/settings/blue_form_parameters.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/language/en/settings.rb
+- lib/zen/package/settings/lib/settings/language/nl/settings.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/setting.rb
+- lib/zen/package/settings/lib/settings/setting_groups.rb
+- lib/zen/package/settings/lib/settings/settings.rb
+- lib/zen/package/settings/lib/settings/settings_group.rb
+- lib/zen/package/settings/lib/settings/singleton_methods.rb
 - lib/zen/package/settings/lib/settings/view/admin/settings/index.xhtml
 - 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/settings/migrations/1307796295_remove_website_enabled.rb
+- lib/zen/package/settings/migrations/1321197919_remove_unused_columns.rb
 - lib/zen/package/users/lib/users.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/helper/access.rb
+- lib/zen/package/users/lib/users/helper/acl.rb
 - lib/zen/package/users/lib/users/helper/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/language/en/permissions.rb
+- lib/zen/package/users/lib/users/language/en/user_groups.rb
+- lib/zen/package/users/lib/users/language/en/users.rb
+- lib/zen/package/users/lib/users/language/nl/permissions.rb
+- lib/zen/package/users/lib/users/language/nl/user_groups.rb
+- lib/zen/package/users/lib/users/language/nl/users.rb
+- lib/zen/package/users/lib/users/model/permission.rb
 - lib/zen/package/users/lib/users/model/user.rb
 - lib/zen/package/users/lib/users/model/user_group.rb
-- lib/zen/package/users/lib/users/public/admin/js/users/access_rules.js
-- lib/zen/package/users/lib/users/public/admin/js/users/lib/access_rules.js
-- lib/zen/package/users/lib/users/view/admin/access-rules/form.xhtml
-- lib/zen/package/users/lib/users/view/admin/access-rules/index.xhtml
+- lib/zen/package/users/lib/users/model/user_status.rb
+- lib/zen/package/users/lib/users/public/admin/css/users/permissions.css
+- lib/zen/package/users/lib/users/public/admin/js/users/permissions.js
+- lib/zen/package/users/lib/users/settings.rb
 - lib/zen/package/users/lib/users/view/admin/user-groups/form.xhtml
 - lib/zen/package/users/lib/users/view/admin/user-groups/index.xhtml
 - lib/zen/package/users/lib/users/view/admin/users/form.xhtml
 - lib/zen/package/users/lib/users/view/admin/users/index.xhtml
 - lib/zen/package/users/lib/users/view/admin/users/login.xhtml
+- lib/zen/package/users/lib/users/view/admin/users/permissions.xhtml
+- lib/zen/package/users/lib/users/view/admin/users/register.xhtml
 - 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/plugin.rb
-- lib/zen/plugin/base.rb
-- lib/zen/plugin/helper.rb
-- lib/zen/plugin/markup/lib/markup.rb
-- lib/zen/plugin/markup/lib/markup/language/en/markup.yml
-- lib/zen/plugin/markup/lib/markup/markup.rb
+- lib/zen/package/users/migrations/1313786058_update_default_date.rb
+- lib/zen/package/users/migrations/1316432327_permissions.rb
+- lib/zen/package/users/migrations/1320272365_status_ids.rb
 - lib/zen/public/admin/css/zen/buttons.css
 - lib/zen/public/admin/css/zen/datepicker.css
 - lib/zen/public/admin/css/zen/editor.css
@@ -404,7 +480,6 @@ files:
 - lib/zen/public/admin/js/vendor/mootools/core.js
 - lib/zen/public/admin/js/vendor/mootools/more.js
 - lib/zen/public/admin/js/zen/index.js
-- lib/zen/public/admin/js/zen/lib/asset.js
 - lib/zen/public/admin/js/zen/lib/editor.js
 - lib/zen/public/admin/js/zen/lib/editor/markdown.js
 - lib/zen/public/admin/js/zen/lib/editor/textile.js
@@ -419,44 +494,55 @@ files:
 - 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/setup.rake
 - lib/zen/task/test.rake
 - lib/zen/task/theme.rake
 - lib/zen/theme.rb
-- lib/zen/theme/base.rb
 - lib/zen/validation.rb
 - lib/zen/version.rb
 - lib/zen/view/bottom.xhtml
 - lib/zen/view/head.xhtml
 - lib/zen/view/main.xhtml
+- lib/zen/view/search.xhtml
 - pkg/.gitkeep
 - proto/app/Rakefile
 - proto/app/app.rb
 - proto/app/config.ru
-- proto/app/config/config.rb
-- proto/app/config/database.rb
+- proto/app/config/config.rb.erb
+- proto/app/config/database.rb.erb
 - proto/app/config/middlewares.rb
 - proto/app/log/.gitkeep
-- proto/app/log/database/dev/.gitkeep
-- proto/app/log/database/live/.gitkeep
 - proto/app/public/.gitkeep
 - proto/app/start.rb
 - proto/app/task/.gitkeep
 - proto/app/theme/.gitkeep
+- proto/app/theme/default/index.xhtml
+- proto/app/theme/theme.rb
+- proto/app/tmp/.gitkeep
 - proto/migration.rb
+- proto/rack/thin.yml
+- proto/rack/unicorn.rb
 - spec/Rakefile
 - spec/fixtures/zen/asset.rb
 - spec/fixtures/zen/helper/acl.rb
+- spec/fixtures/zen/helper/controller.rb
+- spec/fixtures/zen/helper/locale.rb
 - spec/fixtures/zen/helper/message.rb
-- spec/fixtures/zen/language/en/spec.yml
-- spec/fixtures/zen/language/nl/spec.yml
+- spec/fixtures/zen/language.rb
+- spec/fixtures/zen/language/en/spec.rb
+- spec/fixtures/zen/language/nl/spec.rb
 - spec/fixtures/zen/package.rb
+- spec/fixtures/zen/package/categories/helper/category_frontend.rb
 - spec/fixtures/zen/package/comments/controller/comments_form.rb
-- spec/fixtures/zen/package/settings/plugin/settings.rb
+- spec/fixtures/zen/package/comments/helper/comment_frontend.rb
+- spec/fixtures/zen/package/sections/helper/section_frontend.rb
+- spec/fixtures/zen/package/settings/controller/settings.rb
+- spec/fixtures/zen/package/users/helper/access.rb
+- spec/fixtures/zen/package/users/helper/acl.rb
 - spec/fixtures/zen/plugin.rb
 - spec/fixtures/zen/theme/404.xhtml
-- spec/fixtures/zen/theme/default-section/index.xhtml
+- spec/fixtures/zen/theme/default/index.xhtml
 - spec/fixtures/zen/theme/helper/404.xhtml
 - spec/fixtures/zen/theme/helper/partial.xhtml
 - spec/fixtures/zen/theme/helper/wrong_partial.xhtml
@@ -464,81 +550,76 @@ files:
 - spec/fixtures/zen/theme/theme.rb
 - spec/fixtures/zen/validation.rb
 - spec/helper.rb
+- spec/public/.gitkeep
 - spec/zen/all.rb
-- spec/zen/asset.rb
-- spec/zen/bin/create.rb
-- spec/zen/bin/runner.rb
 - spec/zen/controller/admin_controller.rb
 - spec/zen/controller/main_controller.rb
 - spec/zen/controller/preview.rb
-- spec/zen/helper/acl.rb
+- spec/zen/event.rb
 - spec/zen/helper/breadcrumb.rb
+- spec/zen/helper/controller.rb
+- spec/zen/helper/locale.rb
 - spec/zen/helper/message.rb
 - spec/zen/helper/theme.rb
 - spec/zen/language.rb
+- spec/zen/markup.rb
 - spec/zen/package.rb
 - spec/zen/package/categories/controller/categories.rb
 - spec/zen/package/categories/controller/category_groups.rb
 - spec/zen/package/categories/helper/category.rb
-- spec/zen/package/categories/plugin/categories.rb
+- spec/zen/package/categories/helper/category_frontend.rb
+- spec/zen/package/comments/anti_spam.rb
 - spec/zen/package/comments/controller/comments.rb
 - spec/zen/package/comments/controller/comments_form.rb
 - spec/zen/package/comments/helper/comment.rb
-- spec/zen/package/comments/plugin/anti_spam.rb
-- spec/zen/package/comments/plugin/comments.rb
+- spec/zen/package/comments/helper/comment_frontend.rb
 - spec/zen/package/custom_fields/blue_form_parameters.rb
 - spec/zen/package/custom_fields/controller/custom_field_groups.rb
 - spec/zen/package/custom_fields/controller/custom_field_types.rb
 - spec/zen/package/custom_fields/controller/custom_fields.rb
 - spec/zen/package/custom_fields/helper/custom_field.rb
+- spec/zen/package/extensions/controller/extensions.rb
 - spec/zen/package/menus/controller/menu_items.rb
 - spec/zen/package/menus/controller/menus.rb
 - spec/zen/package/menus/helper/menu.rb
-- spec/zen/package/menus/plugin/menus.rb
+- spec/zen/package/menus/helper/menu_frontend.rb
 - spec/zen/package/sections/controller/section_entries.rb
 - spec/zen/package/sections/controller/sections.rb
 - spec/zen/package/sections/helper/section.rb
-- spec/zen/package/sections/plugin/section_entries.rb
-- spec/zen/package/sections/plugin/sections.rb
+- spec/zen/package/sections/helper/section_frontend.rb
 - spec/zen/package/settings/controller/settings.rb
-- spec/zen/package/settings/plugin/settings.rb
-- spec/zen/package/users/controller/access_rules.rb
+- spec/zen/package/settings/settings.rb
 - spec/zen/package/users/controller/user_groups.rb
 - spec/zen/package/users/controller/users.rb
+- spec/zen/package/users/helper/access.rb
+- spec/zen/package/users/helper/acl.rb
 - spec/zen/package/users/helper/users.rb
-- spec/zen/plugin.rb
-- spec/zen/plugin/helper.rb
-- spec/zen/plugin/markup.rb
 - spec/zen/theme.rb
 - spec/zen/validation.rb
 - zen.gemspec
-has_rdoc: yard
 homepage: http://zen-cms.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Zen is a modular CMS written using Ramaze.
 test_files: []
-
+has_rdoc: yard