zen 0.2.7 → 0.2.8

data/lib/zen/task/test.rake

@@ -1,6 +1,9 @@
-desc 'Runs all the RSpec specifications'
+desc 'Runs all the Bacon specifications'
 task :test do
   spec_dir = __DIR__('../../../spec')
-  sh("cd #{spec_dir}; rake db:delete; rm resources/database.db; rake db:migrate; \
-rake db:test_user; rspec zen/all.rb")
+  db_path  = File.join(spec_dir, 'database.db')
+
+  File.unlink(db_path) if File.exist?(db_path)
+
+  sh("cd #{spec_dir}; rake db:migrate; rake db:test_user; ruby zen/all.rb")
 end

data/lib/zen/task/theme.rake

@@ -1,21 +1,14 @@
-##
 # Task group for managing themes.
-#
-# @author Yorick Peterse
-# @since  0.2.5
-#
 namespace :theme do
 
   desc 'Lists all installed themes'
   task :list do
     Zen::Theme::Registered.each do |name, pkg|
       message = <<-MSG
---------------------------
-Name: #{name}
-Author: #{pkg.author}
-Template directory: #{pkg.template_dir}
-
+#{name}
+--------------------
 #{pkg.about}
+
 MSG
 
       puts message
@@ -43,7 +36,7 @@ MSG
 
     theme = Zen::Theme::Registered[name]
     table = 'migrations_theme_' + theme.name.to_s
-    
+
     # Fetch the migrations directory
     if theme.respond_to?(:migration_dir) and !theme.migration_dir.nil?
       dir = theme.migration_dir

data/lib/zen/theme.rb

@@ -5,23 +5,27 @@ require 'pathname'
 #:nodoc:
 module Zen
   ##
-  # Themes in many ways are similar to plugins and packages but with a few differences.
-  # Unlike packages themes aren't able to update the entire Ramaze root, this prevents
-  # them from loading controllers and other classes unless the developer updates these
-  # paths manually. However, themes can set the following paths:
+  # Themes in many ways are similar to plugins and packages but with a few
+  # differences. Unlike packages themes aren't able to update the entire Ramaze
+  # root, this prevents them from loading controllers and other classes unless
+  # the developer updates these paths manually. However, themes can set the
+  # following paths:
   #
-  # * template_dir: the directory where all Liquid templates are located, always required.
+  # * template_dir: the directory where all Liquid templates are located,
+  #   always required.
   # * partial_dir: the directory where all Liquid partials are located.
-  # * public_dir: the public directory containing assets such as CSS and Javascript files.
-  # * migration_dir: themes can use migrations to automatically add the required fields to
-  # the database, this setting should point to the directory where all migrations are
-  # located.
+  # * public_dir: the public directory containing assets such as CSS and
+  #   Javascript files.
+  # * migration_dir: themes can use migrations to automatically add the required
+  #   fields to the database, this setting should point to the directory where
+  #   all migrations are located.
   #
   # ## Adding Themes
   #
-  # Just like plugins and packages a theme can be added by calling Zen::Theme#add and
-  # passing a block to it. Once a theme has been loaded it will *not* be used until the
-  # user sets it as the active theme in the settings module.
+  # Just like plugins and packages a theme can be added by calling
+  # Zen::Theme#add and passing a block to it. Once a theme has been loaded it
+  # will *not* be used until the user sets it as the active theme in the
+  # settings module.
   #
   # Example:
   #
@@ -35,8 +39,8 @@ module Zen
   #
   module Theme
     ##
-    # Hash containing all registered themes. The keys are the names of the themes and
-    # the values instances of Zen::Theme::Base.
+    # Hash containing all registered themes. The keys are the names of the
+    # themes and the values instances of Zen::Theme::Base.
     #
     # @author Yorick Peterse
     # @since  0.2.5
@@ -44,8 +48,8 @@ module Zen
     Registered = {}
 
     ##
-    # Adds a new theme to Zen. Note that the theme won't be used unless it has been set
-    # as the active theme in the settings package.
+    # Adds a new theme to Zen. Note that the theme won't be used unless it has
+    # been set as the active theme in the settings package.
     #
     # @author Yorick Peterse
     # @since  0.2.4
@@ -83,15 +87,9 @@ module Zen
     # @return [Zen::Theme::Base]
     #
     def self.[](name)
-      if name.class != Symbol
-        name = name.to_sym
-      end
-
-      if Registered.nil?
-        raise(Zen::ThemeError, "No themes have been added yet.")
-      end
+      name = name.to_sym if name.class != Symbol
 
-      if !Registered[name]
+      if !Registered.key?(name)
         raise(Zen::ThemeError, "The theme #{name} doesn't exist.")
       end
 

data/lib/zen/validation.rb

@@ -3,15 +3,15 @@ require __DIR__('error/validation_error')
 #:nodoc:
 module Zen
   ##
-  # The Validation module is a very basic validation framework that's used by various
-  # internal modules/classes such as Zen::Plugin and Zen::Package.
+  # The Validation module is a very basic validation framework that's used by 
+  # various internal modules/classes such as Zen::Plugin and Zen::Package.
   #
   # ## Usage
   #
-  # Using the module is pretty simple. Include it, specify the validation rules in a
-  # method and call it. All official modules and classes use a method called "validate"
-  # but you're free to name it whatever you want. A basic example looks like the
-  # following:
+  # Using the module is pretty simple. Include it, specify the validation rules 
+  # in a method and call it. All official modules and classes use a method 
+  # called "validate" but you're free to name it whatever you want. A basic 
+  # example looks like the following:
   #
   #     class Something
   #       include Zen::Validation
@@ -35,9 +35,10 @@ module Zen
     #
     # @author Yorick Peterse
     # @since  0.2.5
-    # @param  [Array/Symbol/String] attributes Either a single or multiple attributes to
-    # validate.
-    # @raise  [ValidationError] Raised whenever a attribute is missing or is set to nil.
+    # @param  [Array/Symbol/String] attributes Either a single or multiple 
+    # attributes to validate.
+    # @raise  [ValidationError] Raised whenever a attribute is missing or is 
+    # set to nil.
     #
     def validates_presence(attributes)
       if attributes.class != Array
@@ -52,8 +53,8 @@ module Zen
     end
 
     ##
-    # Checks if the length of a string matches the given length. You can specify a minimum
-    # length, a maximum one as well as both.
+    # Checks if the length of a string matches the given length. You can specify 
+    # a minimum length, a maximum one as well as both.
     #
     # @example
     #  validates_length(:foobar, :min => 5, :max => 10)
@@ -61,12 +62,12 @@ module Zen
     # @author Yorick Peterse
     # @since  0.2.5
     # @param  [String/Symbol] attribute The attribute to validate.
-    # @param  [Hash] options Hash containing the options to use for determining how long
-    # the attribute's value should be.
+    # @param  [Hash] options Hash containing the options to use for determining 
+    # how long the attribute's value should be.
     # @option options [Fixnum] :min The minimum length of the attribute's value.
     # @option options [Fixnum] :max The maximum length of the value.
-    # @raise  [ValidationError] Raised then the value of the attribute isn't long or short
-    # enough.
+    # @raise  [ValidationError] Raised then the value of the attribute isn't 
+    # long or short enough.
     #
     def validates_length(attribute, options)
       value = send(attribute)
@@ -74,8 +75,8 @@ module Zen
       if !value.respond_to?(:length)
         raise(
           ValidationError,
-          "The length of \"#{attribute}\" can't be checked as the method \"length\" " +
-          "doesn't exist."
+          "The length of \"#{attribute}\" can't be checked as the method " + \
+            "\"length\" doesn't exist."
         )
       end
 
@@ -93,8 +94,8 @@ module Zen
 
     ##
     # Checks if the given attributes match the specified regular expressions.
-    # When a hash is specified the keys should be the names of the attributes to validate
-    # and the values the regular expressions to use.
+    # When a hash is specified the keys should be the names of the attributes to 
+    # validate and the values the regular expressions to use.
     #
     # @example
     #  validates_format(:name, /[\w\-]+/)
@@ -102,12 +103,12 @@ module Zen
     #
     # @author Yorick Peterse
     # @since  0.2.5
-    # @param  [Hash/Symbol] attribute The name of the attribute to validate or a hash
-    # containing all the attributes and their regular expressions.
-    # @param  [Regexp] regexp The regular expression to use when validating a single
-    # attribute.
-    # @raise [ValidationError] Raised when one of the attributes doesn't matches the
-    # regular expression.
+    # @param  [Hash/Symbol] attribute The name of the attribute to validate or 
+    # a hash containing all the attributes and their regular expressions.
+    # @param  [Regexp] regexp The regular expression to use when validating a 
+    # single attribute.
+    # @raise [ValidationError] Raised when one of the attributes doesn't matches 
+    # the regular expression.
     #
     def validates_format(attribute, regexp = nil)
       if attribute.class != Hash
@@ -120,7 +121,10 @@ module Zen
         match = val =~ regexp
 
         if !match
-          raise(ValidationError, "The attribute \"#{attr}\" doesn't match #{regexp}.")
+          raise(
+            ValidationError, 
+            "The attribute \"#{attr}\" doesn't match #{regexp}"
+          )
         end
       end
     end
@@ -140,7 +144,10 @@ module Zen
       path = send(attribute)
 
       if !File.exist?(path)
-        raise(ValidationError, "The path #{path} in \"#{attribute}\" doesn't exist.")
+        raise(
+          ValidationError, 
+          "The path #{path} in \"#{attribute}\" doesn't exist."
+        )
       end
     end
   end # Validation

data/lib/zen/version.rb

@@ -1,11 +1,5 @@
 #:nodoc:
 module Zen
-  ##
-  # Defines the current version of Zen as a string. This constant is used to set the Gem 
-  # version when generating a new Rubygems package.
-  #
-  # @author Yorick Peterse
-  # @since  0.1
-  #
-  Version = '0.2.7'
+  # :nodoc:
+  Version = '0.2.8'
 end

data/lib/zen/view/head.xhtml

@@ -0,0 +1,7 @@
+<meta charset="utf-8" />
+
+<link rel="shortcut icon" href="/admin/favicon.ico" />
+
+#{Zen::Asset.build(:stylesheet)}
+
+<title>#{@page_title}</title>

data/lib/zen/view/main.xhtml

@@ -1,9 +1,5 @@
 #{display_messages}
 
-<!--
-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}
@@ -12,23 +8,12 @@ are no silly sidebars.
 
 <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>
+        <p>
+            #{lang('zen_general.labels.powered_by')}
+
+            <a href="http://zen-cms.com/">
+                Zen #{Zen::Version}
+            </a>
+        </p>
     </div>
 </footer>

data/proto/app/app.rb

@@ -1,4 +1,5 @@
 require 'zen'
+require 'ramaze/log/rotatinginformer'
 
 # Load the configuration files
 require __DIR__('config/config')

data/proto/app/config/config.rb

@@ -1,5 +1,6 @@
-# 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.
+# 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.root = __DIR__('../')
 
 # Set the application's mode. Available modes are "dev" and "live"
@@ -8,8 +9,8 @@ Ramaze.options.mode  = :dev
 # The session identifier to use for cookies.
 Ramaze.options.session.key = 'zen.sid'
 
-# Cache settings. These are turned off for the development server to make it easier
-# to debug potential errors.
+# 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
 

data/proto/app/config/database.rb

@@ -1,14 +1,11 @@
-##
-# Database group to use for developing the website.
-#
-# IMPORTANT: it's recommended to create a separate database user for your Zen application 
-# and prevent it from being able to access other databases. Zen is new and may allow 
-# hackers to exploit the system.
+# It's recommended to create a separate database user for your Zen application
+# and prevent it from being able to access other databases. Zen is new and may
+# allow hackers to exploit the system.
 #
 # The following items can be set:
 #
-# * adapter: the adapter to use. When using MySQL it's best to use the mysql2 gem as it's 
-#   a lot faster than the mysql gem.
+# * adapter: the adapter to use. When using MySQL it's best to use the mysql2
+#   gem as it's a lot faster than the mysql gem.
 # * host: the hostname where the database is located.
 # * username: the username to use for connecting to the database.
 # * password: the password to use for connecting to the database.
@@ -17,42 +14,23 @@
 # * encoding: the encoding type to use.
 # * logger: the logger used for logging queries and such.
 #
-# Fore more information see the Sequel documentation: 
+# Fore more information see the Sequel documentation:
 # http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html
-#
-# Sets the connection for the development mode
-if Ramaze.options.mode === :dev
-  Zen.database = Sequel.connect(
-    :adapter  => '',
-    :host     => 'localhost',
-    :username => '',
-    :password => '',
-    :database => '',
-    :test     => true,
-    :encoding => 'utf8',
-    :logger   => Ramaze::Logger::RotatingInformer.new(
-      __DIR__("../log/database/dev"), '%d-%m-%Y.log'
-    )
+Zen.database = Sequel.connect(
+  :adapter  => '',
+  :host     => 'localhost',
+  :username => '',
+  :password => '',
+  :database => '',
+  :test     => true,
+  :encoding => 'utf8',
+  :logger   => Ramaze::Logger::RotatingInformer.new(
+    __DIR__("../log/database/dev"), '%d-%m-%Y.log'
   )
+)
 
-# Does the same but for the live mode
-elsif Ramaze.options.mode === :live
-  Zen.database = Sequel.connect(
-    :adapter  => 'mysql2',
-    :host     => '',
-    :username => '',
-    :password => '',
-    :database => '',
-    :test     => true,
-    :encoding => 'utf8',
-    :logger   => Ramaze::Logger::RotatingInformer.new(
-      __DIR__("../log/database/live"), '%d-%m-%Y.log'
-    )
-  )
-end
-
-# IMPORTANT, when running MySQL the engine should be set to InnoDB in order for foreign 
-# keys to work properly.
+# IMPORTANT, when running MySQL the engine should be set to InnoDB in order for
+# foreign keys to work properly.
 if Zen.database.adapter_scheme.to_s.include?('mysql')
   Sequel::MySQL.default_engine = 'InnoDB'
 end

data/proto/app/config/middlewares.rb

@@ -1,48 +1,51 @@
-# All Rack middlewares should go in a block like the one below. Different combinations
-# can be used for different versions by setting the first argument of the middleware!
-# method to a symbol containing the name of the environment (e.g. :live).
+# All Rack middlewares should go in a block like the one below. Different
+# combinations can be used for different versions by setting the first argument
+# of the middleware!  method to a symbol containing the name of the environment
+# (e.g. :live).
 #
-# For development purposes we'll be loading various middlewares to make it easier to
-# detect errors, reloading the code and so on.
+# For development purposes we'll be loading various middlewares to make it
+# easier to detect errors, reloading the code and so on.
 #
 Ramaze.middleware! :dev do |m|
   # Rack::Lint is used to validate all code according to the Rack specification.
-  # It's not recommended to use this middleware in a production environment as it will
-  # slow your application down a bit.
+  # It's not recommended to use this middleware in a production environment as
+  # it will slow your application down a bit.
   m.use Rack::Lint
 
-  # Shows an error page whenever an exception was raised. It's not recommended to use
-  # this middleware on a production server as it may reveal sensitive details to the
-  # visitor.
+  # Shows an error page whenever an exception was raised. It's not recommended
+  # to use this middleware on a production server as it may reveal sensitive
+  # details to the visitor.
   m.use Rack::ShowExceptions
 
   # Pretty much the same as Rack::ShowExceptions.
   m.use Rack::ShowStatus
-  
-  # Routes exceptions to different actions, can be useful for catching 404's and such.
+
+  # Routes exceptions to different actions, can be useful for catching 404's and
+  # such.
   # m.use Rack::RouteExceptions
-  
-  # Middleware that enables conditional GET using If-None-Match and If-Modified-Since.
-  # Currently Zen doesn't respond to conditional GET requests so it's fairly useless
-  # out of the box, it can be useful for custom extensions and such.
+
+  # Middleware that enables conditional GET using If-None-Match and
+  # If-Modified-Since. Currently Zen doesn't respond to conditional GET
+  # requests so it's fairly useless out of the box, it can be useful for custom
+  # extensions and such.
   # m.use Rack::ConditionalGet
-  
-  # Automatically sets the ETag header on all string bodies. Etags can be useful for
-  # checking if a certain page has been modified or not.
+
+  # Automatically sets the ETag header on all string bodies. Etags can be useful
+  # for checking if a certain page has been modified or not.
   #
-  # IMPORTANT: Prior to Rack 1.2.2 Rack::ETag required the second argument of use() to
-  # be set to 'public'. Newer versions no longer require this.
+  # IMPORTANT: Prior to Rack 1.2.2 Rack::ETag required the second argument of
+  # use() to be set to 'public'. Newer versions no longer require this.
   m.use Rack::ETag
-  
-  # Allows HEAD requests. HEAD requests are identical to GET requests but shouldn't
-  # return the body.
+
+  # Allows HEAD requests. HEAD requests are identical to GET requests but
+  # shouldn't return the body.
   m.use Rack::Head
-  
-  # Automatically reloads your application whenever it detects changes. Note that this
-  # middleware isn't always as accurate so there may be times when you have to manually
-  # restart your server.
+
+  # Automatically reloads your application whenever it detects changes. Note
+  # that this middleware isn't always as accurate so there may be times when you
+  # have to manually restart your server.
   m.use Ramaze::Reloader
-  
+
   # Runs Ramaze based on all mappings and such.
   m.run Ramaze::AppMap
 end