zen 0.3 → 0.4

data/proto/app/theme/partials/head.xhtml

@@ -0,0 +1,9 @@
+<meta charset="utf-8" />
+
+#{Zen.asset.build_html(:css)}
+
+<!--[if lt IE 9]>
+<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+
+<title>#{get_setting(:website_name).value}</title>

data/proto/app/theme/partials/sidebar.xhtml

@@ -0,0 +1,40 @@
+<aside id="sidebar" role="complementary">
+    <header>
+        <h1>
+            <a href="/">#{get_setting(:website_name).value}</a>
+        </h1>
+    </header>
+
+    <nav id="admin_navigation" role="navigation">
+        <ul class="clearfix left">
+            <li>
+                <a href="http://zen-cms.com" title="Zen Website">Zen Website</a>
+            </li>
+
+            <li>
+                <a href="http://zen-cms.com/documentation/index.html"
+                title="Documentation">
+                    Documentation
+                </a>
+            </li>
+
+            <li>
+                <a href="/admin/users/login" title="Log in">Log in</a>
+            </li>
+
+            <li>
+                <a href="https://groups.google.com/forum/#!forum/zen-cms"
+                title="Mailing List">
+                    Mailing List
+                </a>
+            </li>
+
+            <li>
+                <a href="https://github.com/zen-cms/zen-core/"
+                title="GitHub Account">
+                    GitHub Account
+                </a>
+            </li>
+        </ul>
+    </nav>
+</aside>

data/proto/app/theme/theme.rb

@@ -16,4 +16,7 @@ Zen::Theme.add do |theme|
 
   # The directory containing all the templates (required).
   theme.templates = __DIR__
+
+  # The directory containing all template partials.
+  theme.partials = __DIR__('partials')
 end

data/spec/Rakefile

@@ -1,5 +1,5 @@
 module Zen
-  Zen::RakeTask = true
+  RakeTask = true
 end
 
 require File.expand_path('../helper', __FILE__)
@@ -24,7 +24,6 @@ namespace :db do
     )
 
     user.activate!
-
     user.user_group_pks = [group.id]
   end
 end

data/spec/fixtures/zen/helper/stacked_aspect.rb

@@ -0,0 +1,54 @@
+class SpecStackedAspect < Zen::Controller::FrontendController
+  map '/spec-stacked-aspect'
+
+  NUMBERS = {
+    :before_all => 0,
+    :before     => 0,
+    :after_all  => 0,
+    :after      => 0
+  }
+
+  stacked_before_all(:a) do
+    NUMBERS[:before_all] += 5
+  end
+
+  stacked_before_all(:b) do
+    NUMBERS[:before_all] += 10
+  end
+
+  stacked_before(:c, [:before]) do
+    NUMBERS[:before] += 2
+  end
+
+  stacked_before(:d, [:before]) do
+    NUMBERS[:before] += 2
+  end
+
+  stacked_after_all(:a) do
+    NUMBERS[:after_all] += 5
+  end
+
+  stacked_after_all(:b) do
+    NUMBERS[:after_all] += 10
+  end
+
+  stacked_after(:c, [:after]) do
+    NUMBERS[:after] += 2
+  end
+
+  stacked_after(:d, [:after]) do
+    NUMBERS[:after] += 2
+  end
+
+  def before_all
+    return NUMBERS[:before_all]
+  end
+
+  def before
+    return NUMBERS[:before]
+  end
+
+  def after
+    return NUMBERS[:after]
+  end
+end

data/spec/fixtures/zen/package/dashboard/controller/widget.rb

@@ -0,0 +1,15 @@
+class SpecWidget < Zen::Controller::AdminController
+  map '/admin/spec-widget'
+
+  def index
+    return Dashboard::Widget.html
+  end
+
+  def columns
+    return Dashboard::Widget.columns_html
+  end
+
+  def checkbox
+    return Dashboard::Widget.checkbox_html
+  end
+end # SpecWidget

data/spec/fixtures/zen/package/dashboard/widget.rb

@@ -0,0 +1,5 @@
+Dashboard::Widget.add do |w|
+  w.name  = :spec
+  w.title = 'Spec'
+  w.data  = lambda { |instance| return 'spec widget' }
+end

data/spec/fixtures/zen/theme/theme.rb

@@ -5,7 +5,7 @@ Zen::Theme.add do |theme|
   theme.about  = 'A theme for all the tests'
 
   # Add all directories
-  theme.template_dir  = __DIR__
-  theme.partial_dir   = __DIR__('partials')
+  theme.templates = __DIR__
+  theme.partials  = __DIR__('partials')
 end
 

data/spec/helper.rb

@@ -1,4 +1,4 @@
-if ENV.key?('COVERAGE') and ENV['COVERAGE'] == 'true'
+if ENV.key?('COVERAGE') and !ENV['COVERAGE'].empty?
   require File.expand_path('../../lib/zen/spec/simplecov', __FILE__)
 end
 
@@ -9,18 +9,27 @@ Ramaze.options.mode = :dev
 
 Zen::FIXTURES = __DIR__('fixtures/zen')
 Zen.root      = __DIR__
-Zen.database  = Sequel.connect(
-  :adapter   => ENV['ADAPTER']  || 'sqlite',
-  :database  => ENV['DATABASE'] || __DIR__('database.db'),
-  :username  => ENV['USERNAME'],
-  :password  => ENV['PASSWORD'],
-  :test      => true,
-  :encoding  => 'utf8'
-)
+
+if !ENV['DSN'].nil? and !ENV['DSN'].empty?
+  Zen.database = Sequel.connect(ENV['DSN'])
+else
+  Zen.database  = Sequel.connect(
+    :adapter   => ENV['ADAPTER']  || 'sqlite',
+    :database  => ENV['DATABASE'] || __DIR__('database.db'),
+    :username  => ENV['USERNAME'],
+    :password  => ENV['PASSWORD'],
+    :test      => true,
+    :encoding  => 'utf8'
+  )
+end
+
+if ENV['LRU'] and !ENV['LRU'].empty?
+  Ramaze::Cache.options.session = Ramaze::Cache::LRU
+end
 
 Zen::Language.options.paths.push(__DIR__('fixtures/zen/language'))
 
 Zen.start
 
 # Load Capybara?
-require __DIR__('../lib/zen/spec/helper') if !Zen.const_defined?(:RakeTask)
+require __DIR__('../lib/zen/spec/helper') unless Zen.const_defined?(:RakeTask)

data/spec/zen/controller/admin_controller.rb

@@ -1,10 +1,10 @@
 require File.expand_path('../../../helper', __FILE__)
 require 'rdiscount'
 
-describe('Zen::Controller::AdminController') do
+describe 'Zen::Controller::AdminController' do
   behaves_like :capybara
 
-  it('Deny access to an admin URL when not logged in') do
+  it 'Deny access to an admin URL when not logged in' do
     logout = Users::Controller::Users.r(:logout).to_s
     url    = Categories::Controller::CategoryGroups.r(:index).to_s
 
@@ -14,7 +14,7 @@ describe('Zen::Controller::AdminController') do
     current_path.should == Users::Controller::Users.r(:login).to_s
   end
 
-  it('Access an admin URL when logged in') do
+  it 'Access an admin URL when logged in' do
     url = Categories::Controller::CategoryGroups.r(:index).to_s
 
     capybara_login

data/spec/zen/controller/main_controller.rb

@@ -2,12 +2,12 @@ require File.expand_path('../../../helper', __FILE__)
 require __DIR__('../../fixtures/zen/theme/theme')
 require 'fileutils'
 
-describe('Zen::Controller::MainController') do
+describe 'Zen::Controller::MainController' do
   behaves_like :capybara
 
   after do
     # Let's make sure the 404 template is back where it belongs.
-    template = File.join(Zen::Theme[:spec_theme].template_dir, '404.xhtml')
+    template = File.join(Zen::Theme[:spec_theme].templates, '404.xhtml')
     old      = template + '.old'
 
     if File.exist?(old) and !File.exist?(template)
@@ -26,13 +26,13 @@ describe('Zen::Controller::MainController') do
 
   get_setting(:theme).value = 'spec_theme'
 
-  it('Visit the homepage') do
+  it 'Visit the homepage' do
     visit('/')
 
     page.body.include?('This is the homepage.').should == true
   end
 
-  it('Request a page without a theme set') do
+  it 'Request a page without a theme set' do
     get_setting(:theme).value = ''
 
     visit('/')
@@ -42,7 +42,7 @@ describe('Zen::Controller::MainController') do
     get_setting(:theme).value = 'spec_theme'
   end
 
-  it('Request a non existing template') do
+  it 'Request a non existing template' do
     visit('/does-not-exist')
 
     page.body.include?('The requested page could not be found!') \
@@ -51,9 +51,9 @@ describe('Zen::Controller::MainController') do
     page.status_code.should == 404
   end
 
-  it('Request a non existing template without a 404 template') do
+  it 'Request a non existing template without a 404 template' do
     template = File.join(
-      Zen::Theme[:spec_theme].template_dir,
+      Zen::Theme[:spec_theme].templates,
       '404.xhtml'
     )
 

data/spec/zen/controller/preview.rb

@@ -4,7 +4,7 @@ require 'rdiscount'
 describe "Zen::Controller::Preview" do
   behaves_like :capybara
 
-  it('Convert Markdown to HTML via a POST request') do
+  it 'Convert Markdown to HTML via a POST request' do
     markdown = 'Hello, **world**'
     response = page.driver.post(
       '/admin/preview', :engine => 'markdown', :markup => markdown
@@ -14,7 +14,7 @@ describe "Zen::Controller::Preview" do
     response.status.should     == 200
   end
 
-  it('Convert an non existing markup type using a POST request') do
+  it 'Convert an non existing markup type using a POST request' do
     response = page.driver.post(
       '/admin/preview', :engine => 'foobar', :markup => 'foobar'
     )
@@ -23,7 +23,7 @@ describe "Zen::Controller::Preview" do
     response.status.should     == 400
   end
 
-  it('Fail to convert markup without any POST parameters') do
+  it 'Fail to convert markup without any POST parameters' do
     response = page.driver.post('/admin/preview')
 
     response.body.strip.should == lang('zen_general.errors.invalid_request')

data/spec/zen/event.rb

@@ -1,17 +1,17 @@
 require File.expand_path('../../helper', __FILE__)
 
-describe('Zen::Event') do
+describe 'Zen::Event' do
   after do
     Zen::Event::REGISTERED.delete(:test)
   end
 
-  it('Register an event') do
+  it 'Register an event' do
     Zen::Event.listen(:test) {}
 
     Zen::Event::REGISTERED.key?(:test).should == true
   end
 
-  it('Run a single event') do
+  it 'Run a single event' do
     data = 0
 
     Zen::Event.listen(:test) do |number|
@@ -25,7 +25,7 @@ describe('Zen::Event') do
     data.should == 12
   end
 
-  it('Run multiple events') do
+  it 'Run multiple events' do
     data = 0
 
     Zen::Event.listen(:test) do |number|

data/spec/zen/helper/breadcrumb.rb

@@ -1,9 +1,9 @@
 require File.expand_path('../../../helper', __FILE__)
 
-describe('Ramaze::Helper::Breadcrumb') do
+describe 'Ramaze::Helper::Breadcrumb' do
   extend Ramaze::Helper::Breadcrumb
 
-  it('Build a set of breadcrumbs') do
+  it 'Build a set of breadcrumbs' do
     respond_to?('set_breadcrumbs').should == true
     respond_to?('get_breadcrumbs').should == true
 
@@ -14,10 +14,10 @@ describe('Ramaze::Helper::Breadcrumb') do
     breadcrumbs.include?('foo').should == true
     breadcrumbs.include?('bar').should == true
     breadcrumbs.include?('baz').should == true
-    breadcrumbs.include?('»').should == true
+    breadcrumbs.include?('/').should   == true
   end
 
-  it('Build a set of breadcrumbs with a custom separator') do
+  it 'Build a set of breadcrumbs with a custom separator' do
     respond_to?('set_breadcrumbs').should == true
     respond_to?('get_breadcrumbs').should == true
 
@@ -30,8 +30,4 @@ describe('Ramaze::Helper::Breadcrumb') do
     breadcrumbs.include?('baz').should == true
     breadcrumbs.include?('--').should == true
   end
-
-  it('Return nil when no breadcrumb parameters are specified') do
-    get_breadcrumbs.nil?.should == true
-  end
 end

data/spec/zen/helper/controller.rb

@@ -1,21 +1,64 @@
 require File.expand_path('../../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'helper', 'controller')
 
-describe('Ramaze::Helper::Controller') do
+describe 'Ramaze::Helper::Controller' do
   behaves_like :capybara
+  extend Ramaze::Helper::Controller
 
-  it('Set the title of a controller method') do
+  it 'Set the title of a controller method' do
     visit('/admin/spec-controller-helper')
 
     page.body.include?('index method').should == true
     page.find('title').text.should            == lang('categories.titles.index')
   end
 
-  it('Protect a controller method against CSRF attacks') do
+  it 'Protect a controller method against CSRF attacks' do
     visit('/admin/spec-controller-helper/csrf')
 
     page.body.include?('csrf method').should                   == false
-    page.status_code.should                                    == 403
     page.body.include?(lang('zen_general.errors.csrf')).should == true
   end
+
+  it 'Generate a link to manage sub data' do
+    manage_link('a', 'b').should == '<a href="a" class="icon pages">b</a>'
+  end
+
+  it 'Generate a link to edit data' do
+    edit_link('a', 'b').should == '<a href="a" class="icon edit">b</a>'
+  end
+
+  it 'Generate a button to create new data' do
+    new_button('a', 'b').should == '<a href="a" class="button">b</a>'
+  end
+
+  it 'Generate a button to delete data' do
+    delete_button('a').should == '<input type="submit" value="a" ' \
+      'class="button danger" />'
+  end
+
+  it 'Generate a short name for various browsers' do
+    chrome = browser_name(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.7 ' \
+        '(KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7'
+    )
+
+    firefox = browser_name(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0.1) ' \
+        'Gecko/20100101 Firefox/8.0.1'
+    )
+
+    ie = browser_name(
+      'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0;'
+    )
+
+    safari  = browser_name(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.51.22 ' \
+        '(KHTML, like Gecko) Version/5.1.1 Safari/534.51.22'
+    )
+
+    chrome.should  == 'chrome'
+    firefox.should == 'firefox'
+    ie.should      == 'internet_explorer'
+    safari.should  == 'safari'
+  end
 end

data/spec/zen/helper/locale.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'helper', 'locale')
 
-describe('Ramaze::Helper::Locale') do
+describe 'Ramaze::Helper::Locale' do
   behaves_like :capybara
   extend       Ramaze::Helper::Locale
 
-  it('Get the date format from the database') do
+  it 'Get the date format from the database' do
     visit('/admin/spec-locale-helper')
 
     format = get_setting(:date_format).value
@@ -16,7 +16,7 @@ describe('Ramaze::Helper::Locale') do
     page.body.include?(format).should == true
   end
 
-  it('Format a date using using the date_format setting') do
+  it 'Format a date using using the date_format setting' do
     format = get_setting(:date_format).value
     date   = Time.new