zen 0.2.8 → 0.3b

data/spec/Rakefile

@@ -1,26 +1,30 @@
 module Zen
-  RakeTask = true
+  Zen::RakeTask = true
 end
 
 require File.expand_path('../helper', __FILE__)
+
 import __DIR__('../lib/zen/task/db.rake')
+import __DIR__('../lib/zen/task/package.rake')
 
 namespace :db do
-
   desc 'Creates the user for all the tests'
   task :test_user do
     # Create a default user and group
-    group = Users::Model::UserGroup.new(
-      :name => 'Administrators',
-      :slug => 'administrators', :super_group => true
-    ).save
+    group = Users::Model::UserGroup.create(
+      :name        => 'Administrators',
+      :slug        => 'administrators',
+      :super_group => true
+    )
 
-    user = Users::Model::User.new(
-      :email    => 'spec@domain.tld', :name   => 'Spec',
-      :password => 'spec'           , :status => 'open'
-    ).save
+    user = Users::Model::User.create(
+      :email    => 'spec@domain.tld',
+      :name     => 'Spec',
+      :password => 'spec'
+    )
+
+    user.activate!
 
     user.user_group_pks = [group.id]
   end
-
 end

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

@@ -0,0 +1,13 @@
+class SpecControllerHelper < Zen::Controller::AdminController
+  map   '/admin/spec-controller-helper'
+  title 'categories.titles.%s'
+  csrf_protection :csrf
+
+  def index
+    return 'index method'
+  end
+
+  def csrf
+    return 'csrf method'
+  end
+end

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

@@ -0,0 +1,7 @@
+class SpecLocaleHelper < Zen::Controller::AdminController
+  map '/admin/spec-locale-helper'
+
+  def index
+    date_format
+  end
+end

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

@@ -1,10 +1,6 @@
 class SpecMessageHelper < Zen::Controller::AdminController
   map '/admin/spec-message-helper'
 
-  def index
-    return display_messages
-  end
-
   def success
     message(:success, 'success message')
   end

data/spec/fixtures/zen/language.rb

@@ -0,0 +1,31 @@
+class SpecLanguage < Zen::Controller::FrontendController
+  map '/spec-language'
+
+  def frontend_dutch
+    user.update(:frontend_language => 'nl')
+
+    respond(Zen::Language.current.name, 200)
+  end
+
+  def frontend_english
+    user.update(:frontend_language => 'en')
+
+    respond(Zen::Language.current.name, 200)
+  end
+end
+
+class SpecLanguageBackend < Zen::Controller::AdminController
+  map '/admin/spec-language'
+
+  def backend_dutch
+    user.update(:language => 'nl')
+
+    respond(Zen::Language.current.name, 200)
+  end
+
+  def backend_english
+    user.update(:language => 'en')
+
+    respond(Zen::Language.current.name, 200)
+  end
+end

data/spec/fixtures/zen/language/en/spec.rb

@@ -0,0 +1,11 @@
+Zen::Language::Translation.add do |trans|
+  trans.language = 'en'
+  trans.name     = 'spec'
+
+  trans.translate do |t|
+    t['name'] = 'Name'
+    t['age']  = 'Age'
+
+    t['parent.sub'] = 'Sub item'
+  end
+end

data/spec/fixtures/zen/language/nl/spec.rb

@@ -0,0 +1,11 @@
+Zen::Language::Translation.add do |trans|
+  trans.language = 'nl'
+  trans.name     = 'spec'
+
+  trans.translate do |t|
+    t['name'] = 'Naam'
+    t['age']  = 'Leeftijd'
+
+    t['parent.sub'] = 'Sub element'
+  end
+end

data/spec/fixtures/zen/package.rb

@@ -5,13 +5,3 @@ class SpecPackage < Zen::Controller::AdminController
     Zen::Package.build_menu('spec_menu', extension_permissions)
   end
 end
-
-Zen::Package.add do |p|
-  p.name        = 'spec'
-  p.author      = 'Yorick Peterse'
-  p.about       = 'A spec extension'
-  p.url         = 'http://zen-cms.com/'
-  p.directory   = __DIR__
-  p.menu        = [{:title => 'Spec', :url => '/admin/spec'} ]
-  p.controllers = {'Spec' => SpecPackage}
-end

data/spec/fixtures/zen/package/categories/helper/category_frontend.rb

@@ -0,0 +1,16 @@
+class SpecCategoryFrontend < Zen::Controller::FrontendController
+  map '/spec-category-frontend'
+
+  def index
+    categories = get_categories('Spec group', :limit => 1, :paginate => true)
+    html       = ''
+
+    categories.each do |category|
+      html += "<p>#{category.name}</p>"
+    end
+
+    html += categories.navigation
+
+    return html
+  end
+end

data/spec/fixtures/zen/package/comments/helper/comment_frontend.rb

@@ -0,0 +1,16 @@
+class SpecCommentFrontend < Zen::Controller::FrontendController
+  map '/spec-comment-frontend'
+
+  def index
+    comments = get_comments('spec', :limit => 1, :paginate => true)
+    html     = ''
+
+    comments.each do |comment|
+      html += "<p>#{comment.comment}</p>"
+    end
+
+    html += comments.navigation
+
+    return html
+  end
+end

data/spec/fixtures/zen/package/sections/helper/section_frontend.rb

@@ -0,0 +1,16 @@
+class SpecSectionFrontend < Zen::Controller::FrontendController
+  map '/spec-section-frontend'
+
+  def index
+    entries = get_entries('spec', :limit => 1, :paginate => true)
+    html    = ''
+
+    entries.each do |entry|
+      html += "<p>#{entry.title}</p>"
+    end
+
+    html += entries.navigation
+
+    return html
+  end
+end

data/spec/fixtures/zen/package/settings/controller/settings.rb

@@ -0,0 +1,17 @@
+Settings::Setting.add do |setting|
+  setting.name   = :checkbox
+  setting.title  = 'Checkbox setting'
+  setting.group  = :general
+  setting.type   = 'checkbox'
+  setting.values = ['value', 'value1']
+end
+
+Settings::Setting.add do |setting|
+  setting.name   = :select_multiple
+  setting.title  = 'Select multiple setting'
+  setting.group  = :general
+  setting.type   = 'select_multiple'
+  setting.values = {'value' => 'Label', 'value1' => 'Label 1'}
+end
+
+Settings::Setting.migrate

data/spec/fixtures/zen/package/users/helper/access.rb

@@ -0,0 +1,18 @@
+class SpecAccessHelper < Zen::Controller::AdminController
+  map '/admin/spec-access-helper'
+  helper :access
+
+  allow [:allowed, :allowed_1]
+
+  def denied
+    return 'super secret page'
+  end
+
+  def allowed
+    return 'allowed'
+  end
+
+  def allowed_1
+    return 'allowed'
+  end
+end

data/spec/fixtures/zen/package/users/helper/acl.rb

@@ -0,0 +1,23 @@
+class SpecACLHelper < Zen::Controller::AdminController
+  map '/admin/spec-acl-helper'
+
+  def index
+    if user_authorized?(:spec_permission)
+      respond('allowed', 200)
+    else
+      respond('not allowed', 200)
+    end
+  end
+
+  def invalid
+    if user_authorized?(:invalid_permission)
+      respond('allowed', 200)
+    else
+      respond('not allowed', 200)
+    end
+  end
+
+  def respond_message
+    authorize_user!(:invalid_permission)
+  end
+end

data/spec/helper.rb

@@ -1,41 +1,26 @@
-if ENV.key?('COVERAGE') and ENV['COVERAGE'] === 'true'
+if ENV.key?('COVERAGE') and ENV['COVERAGE'] == 'true'
   require File.expand_path('../../lib/zen/spec/simplecov', __FILE__)
 end
 
 require File.expand_path('../../lib/zen', __FILE__)
 
-Ramaze.setup(:verbose => false) do
-  gem 'sqlite3'  , ['~> 1.3.4']
-  gem 'rdiscount', ['~> 1.6.8']
-  gem 'defensio' , ['~> 0.9.1']
-end
-
-# Update all paths
-Ramaze.options.roots = [__DIR__]
-Ramaze.options.mode  = :dev
-Zen.root             = __DIR__
-
-Zen::Language.options.paths.push(__DIR__('fixtures/zen'))
+Ramaze::Log.level   = Logger::ERROR
+Ramaze.options.mode = :dev
 
-# Configure the database
-Zen.database = Sequel.connect(
-  :adapter   => 'sqlite',
-  :database  => __DIR__('database.db'),
+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'
 )
 
-# Start Zen
-Zen.init
+Zen::Language.options.paths.push(__DIR__('fixtures/zen/language'))
 
-# Require all packages
-require __DIR__('../lib/zen/package/all')
-
-Zen.post_init
-
-module Zen
-  Fixtures = __DIR__('fixtures/zen')
-end
+Zen.start
 
 # Load Capybara?
 require __DIR__('../lib/zen/spec/helper') if !Zen.const_defined?(:RakeTask)

data/spec/zen/controller/admin_controller.rb

@@ -1,26 +1,25 @@
 require File.expand_path('../../../helper', __FILE__)
 require 'rdiscount'
 
-describe('Zen::Controller::Preview') do
+describe('Zen::Controller::AdminController') do
   behaves_like :capybara
 
-  it('Access a non authorized URL') 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
 
     visit(logout)
     visit(url)
 
-    current_path.should === Users::Controller::Users.r(:login).to_s
+    current_path.should == Users::Controller::Users.r(:login).to_s
   end
 
-  it('Access an authorized URL') do
+  it('Access an admin URL when logged in') do
     url = Categories::Controller::CategoryGroups.r(:index).to_s
 
     capybara_login
     visit(url)
 
-    current_path.should === url
+    current_path.should == url
   end
-
 end

data/spec/zen/controller/main_controller.rb

@@ -5,49 +5,50 @@ require 'fileutils'
 describe('Zen::Controller::MainController') do
   behaves_like :capybara
 
-  # Set the default section/template group to use.
-  it('Create the test data') do
-    section = Sections::Model::Section.create(
-      :name                    => 'Default section',
-      :slug                    => 'default-section',
-      :comment_allow           => false,
-      :comment_require_account => false,
-      :comment_moderate        => false,
-      :comment_format          => 'plain'
-    )
-
-    plugin(:settings, :get, :default_section).value = section.id
-    plugin(:settings, :get, :theme).value           = 'spec_theme'
+  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')
+    old      = template + '.old'
+
+    if File.exist?(old) and !File.exist?(template)
+      FileUtils.mv(old, template)
+    end
+  end
 
-    section.name.should === 'Default section'
-    section.slug.should === 'default-section'
+  section = Sections::Model::Section.create(
+    :name                    => 'Default section',
+    :slug                    => 'default-section',
+    :comment_allow           => false,
+    :comment_require_account => false,
+    :comment_moderate        => false,
+    :comment_format          => 'plain'
+  )
 
-    plugin(:settings, :get, :theme).value.should === 'spec_theme'
-  end
+  get_setting(:theme).value = 'spec_theme'
 
-  it('Request the homepage') do
+  it('Visit the homepage') do
     visit('/')
 
-    page.body.include?('This is the homepage.').should === true
+    page.body.include?('This is the homepage.').should == true
   end
 
   it('Request a page without a theme set') do
-    plugin(:settings, :get, :theme).value = nil
+    get_setting(:theme).value = ''
 
     visit('/')
 
-    page.body.include?(lang('zen_general.errors.no_theme')).should === true
+    page.body.include?(lang('zen_general.errors.no_theme')).should == true
 
-    plugin(:settings, :get, :theme).value = 'spec_theme'
+    get_setting(:theme).value = 'spec_theme'
   end
 
   it('Request a non existing template') do
     visit('/does-not-exist')
 
     page.body.include?('The requested page could not be found!') \
-      .should === true
+      .should == true
 
-    page.status_code.should === 404
+    page.status_code.should == 404
   end
 
   it('Request a non existing template without a 404 template') do
@@ -61,21 +62,14 @@ describe('Zen::Controller::MainController') do
     visit('/does-not-exist')
 
     page.body.include?(lang('zen_general.errors.no_templates')) \
-      .should === true
+      .should == true
 
-    page.status_code.should === 404
+    page.status_code.should == 404
 
     FileUtils.mv(template + '.old', template)
   end
 
-  # Reset the default section and remove it
-  it('Remove all the test data') do
-    Sections::Model::Section.destroy
-
-    plugin(:settings, :get, :default_section).value = nil
-    plugin(:settings, :get, :theme).value           = nil
-
-    Sections::Model::Section[:slug => 'default-section'].nil?.should === true
-  end
+  Sections::Model::Section.destroy
 
+  get_setting(:theme).value = nil
 end