zen 0.2.6.1 → 0.2.7

data/.travis.yml

@@ -1,7 +1,6 @@
-script: "rvm gemset import .gems; rake test"
+script: "gem install ramaze; rake test"
 rvm:
   - 1.9.2
-
-notifications:
-  recipients:
-    - info@yorickpeterse.com
+  - rbx
+  - jruby
+  - 1.8.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.7 - June 16th, 2011
+
+* Started using Ramaze.setup for Gem management.
+* Websites can no longer be marked as "offline", this was a rather useless feature anyway.
+* Fixed various bugs
+
 ## 0.2.6.1 - June 1st, 2011
 
 * Dropped Zen.settings and modified the settings plugin so that it works properly when

data/MANIFEST

@@ -1,4 +1,3 @@
-.gems
 .travis.yml
 AUTHORS
 CHANGELOG.md
@@ -145,6 +144,7 @@ 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/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

data/README.md

@@ -74,7 +74,7 @@ easier to read code in terminals or when using split view modes.
 ## Community
 
 * [Website][zen website]
-* Mailing list
+* [Mailing list][mailing list]
 
 Zen does not have it's own IRC channel at this time but you can usually find me in any
 of the following channels on Freenode:
@@ -92,3 +92,4 @@ the file "LICENSE".
 [zen website]: http://zen-cms.com/
 [zen documentation]: http://zen-cms.com/userguide/
 [nvie branch model]: http://nvie.com/posts/a-successful-git-branching-model/
+[mailing list]: https://groups.google.com/forum/#!forum/zen-cms

data/bin/zen

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
+require 'ramaze'
 require File.expand_path('../../lib/zen/version', __FILE__)
 
-require 'commander'
+Ramaze.setup(:verbose => false) do
+  gem 'commander', ['~> 4.0.4']
+end
+
 require 'commander/import'
 
 # Set the extra information message

data/lib/zen.rb

@@ -1,9 +1,14 @@
+require 'rubygems'
 require 'ramaze'
-require 'sequel'
-require 'bcrypt'
-require 'sequel_sluggable'
-require 'loofah'
 require 'yaml'
+
+Ramaze.setup(:verbose => false) do
+  gem 'sequel'          , ['~> 3.24.1']
+  gem 'bcrypt-ruby'     , ['~> 2.1.4'], :lib => 'bcrypt'
+  gem 'sequel_sluggable', ['~> 0.0.6']
+  gem 'loofah'          , ['~> 1.0.0']
+end
+
 require __DIR__('zen/version')
 
 ##

data/lib/zen/controller/main_controller.rb

@@ -17,8 +17,7 @@ module Zen
       # The index method acts as a catch-all method. Based on the requested URI
       # the correct template group/file will be loaded. If no templates are found
       # a 404 template will be loaded. If that's not found either a default error
-      # will be shown. If the website is offline we'll try to load the template
-      # "offline", if it isn't there a regular message will be displayed.
+      # will be shown.
       #
       # @author Yorick Peterse
       # @since  0.1
@@ -53,27 +52,16 @@ module Zen
         group_path    = File.join(theme_path, group)
         template_path = File.join(theme_path, group, "#{template}.xhtml")
         
-        # Is the website down?
-        if plugin(:settings, :get, :website_enabled).value === '0'
-          offline_path = File.join(theme_path, 'offline.xhtml')
-          
-          if File.exist?(offline_path)
-            render_file(offline_path)
-          else
-            respond(lang('zen_general.errors.website_offline'))
-          end
+        # Check if the group exists
+        if File.directory?(group_path) and File.exists?(template_path)
+          render_file(template_path)
         else
-          # Check if the group exists
-          if File.directory?(group_path) and File.exists?(template_path)
-            render_file(template_path)
+          not_found = File.join(theme_path, '404.xhtml')
+          
+          if File.exist?(not_found)
+            respond(render_file(not_found), 404)
           else
-            not_found = File.join(theme_path, '404.xhtml')
-            
-            if File.exist?(not_found)
-              respond(render_file(not_found), 404)
-            else
-              respond(lang('zen_general.errors.no_templates'), 404)
-            end
+            respond(lang('zen_general.errors.no_templates'), 404)
           end
         end
       end

data/lib/zen/language/en/zen_general.yml

@@ -11,7 +11,6 @@ labels:
 errors:
   csrf            : 'The specified request can not be executed without a valid CSRF token.'
   not_authorized  : 'You are not authorized to access the current page.'
-  website_offline : 'This website is currently offline.'
   no_templates    : 'No templates were found for the given action.'
   no_theme        : 'No theme has been specified.'
   invalid_request : 'The request could not be executed as the specified data is incorrect.'

data/lib/zen/language/nl/zen_general.yml

@@ -11,7 +11,6 @@ labels:
 errors:
   csrf           : 'De actie kan niet worden uitgevoerd zonder een geldige CSRF token.'
   not_authorized : 'U bent niet toegestaan om de huidige pagina te bekijken.'
-  website_offline: 'Deze website is momenteel offline.'
   no_templates   : 'Er konden geen sjablonen worden gevonden voor de huidige actie.'
   no_theme       : 'Er is geen thema ingesteld.'
   invalid_request: 'De actie kon niet worden uitgevoerd omdat de data onjuist is.'

data/lib/zen/package/menus/lib/menus/plugin/menus.rb

@@ -49,12 +49,14 @@ module Menus
           :limit  => 20,
           :offset => 0,
           :menu   => nil,
-          :sub    => true
+          :sub    => true,
+          :order  => :asc
         }.merge(options)
 
         validate_type(@options[:limit] , :limit , [Integer, Fixnum])
         validate_type(@options[:offset], :offset, [Integer, Fixnum])
-        validate_type(@options[:menu]  , :menu  , [String, Integer, Fixnum])
+        validate_type(@options[:menu]  , :menu  , [String , Integer, Fixnum])
+        validate_type(@options[:order] , :order , [String , Symbol])
       end
 
       ##
@@ -77,6 +79,7 @@ module Menus
         # Get all menu items
         menu_items = MenuItem.filter(:menu_id => menu.id, :parent_id => nil) \
           .limit(@options[:limit], @options[:offset]) \
+          .order(:order.send(@options[:order])) \
           .all
         
         @g         = Ramaze::Gestalt.new
@@ -85,11 +88,11 @@ module Menus
 
         # Set the attributes for the main <ul> elements
         if !menu.css_class.nil?
-          attributes[:class] = menu.css_class
+          attributes[:class] = menu.css_class if !menu.css_class.empty?
         end
 
         if !menu.css_id.nil?
-          attributes[:id] = menu.css_id
+          attributes[:id] = menu.css_id if !menu.css_id.empty?
         end
 
         # Time to build the HTML
@@ -117,11 +120,11 @@ module Menus
         attributes = {}
 
         if !item.css_class.nil?
-          attributes[:class] = item.css_class
+          attributes[:class] = item.css_class if !item.css_class.empty?
         end
 
         if !item.css_id.nil?
-          attributes[:id] = item.css_id
+          attributes[:id] = item.css_id if !item.css_id.empty?
         end
 
         # Get all child elements

data/lib/zen/package/settings/lib/settings.rb

@@ -34,8 +34,6 @@ Zen::Theme::Registered.each do |name, theme|
   theme_hash[name] = name
 end
 
-# ------
-
 # Register the plugin
 Zen::Plugin.add do |plugin|
   plugin.name       = 'settings'
@@ -74,19 +72,6 @@ plugin(:settings, :register) do |setting|
   setting.type        = 'textarea'
 end
 
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.website_enabled')
-  setting.description = lang('settings.placeholders.website_enabled')
-  setting.name        = 'website_enabled'
-  setting.group       = 'general'
-  setting.type        = 'radio'
-  setting.default     = '1'
-  setting.values      = {
-    lang('zen_general.special.boolean_hash.true')  => '1',
-    lang('zen_general.special.boolean_hash.false') => '0'
-  }
-end
-
 plugin(:settings, :register) do |setting|
   setting.title       = lang('settings.labels.language')
   setting.description = lang('settings.placeholders.language')

data/lib/zen/package/settings/lib/settings/language/en/settings.yml

@@ -5,7 +5,6 @@ titles:
 labels:
   website_name         : 'Website name'
   website_description  : 'Website description'
-  website_enabled      : 'Website enabled'
   language             : 'Language'
   frontend_language    : 'Frontend language'
   default_section      : 'Default section'
@@ -16,7 +15,6 @@ labels:
 placeholders:
   website_name        : 'The name of the website.'
   website_description : 'The description of the website.'
-  website_enabled     : 'Whether or not the website is available to non admins.'
   language            : 'The language to use for the system.'
   default_section     : 'The default section to use on the homepage.'
   theme               : 'The frontend theme to use.'

data/lib/zen/package/settings/lib/settings/language/nl/settings.yml

@@ -5,7 +5,6 @@ titles:
 labels:
   website_name       : 'Website naam'
   website_description: 'Website beschrijving'
-  website_enable     : 'Website beschikbaar'
   language           : 'Taal'
   frontend_langauge  : 'Taal voor bezoekers'
   default_section    : 'Standaard sectie'
@@ -16,7 +15,6 @@ labels:
 placeholders:
   website_name       : 'De naam van de website.'
   website_description: 'De beschrijving van de website.'
-  website_enabled    : 'Is de website wel of niet beschikbaar?'
   language           : 'De taal die gebruikt moet worden voor het admin gedeelte.'
   default_section    : 'De standaard sectie die moet worden gebruikt.'
   theme              : 'Het thema dat bezoekers zullen zien.'

data/lib/zen/package/settings/migrations/1307796295_remove_website_enabled.rb

@@ -0,0 +1,13 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    Zen.database[:settings].filter(:name => 'website_enabled').delete 
+  end
+  
+  # Reverts the changes made in the up() block.
+  down do
+    Zen.database[:settings].insert(
+      :name => 'website_enabled', :group => 'general', :default => true, :type => 'radio'
+    )
+  end
+end

data/lib/zen/plugin/markup/lib/markup/markup.rb

@@ -148,7 +148,6 @@ module Zen
       def html(markup)
         return markup
       end
-
-    end
-  end
-end
+    end # Markup
+  end # Plugin
+end # Zen

data/lib/zen/public/admin/js/zen/editor.js

@@ -251,7 +251,7 @@ Zen.Editor = new Class(
         {
             if ( current_class.options[attr] !== null )
             {
-                element.setStyle(attr, current_class.options[attr]);
+                element.setStyle('min-' + attr, current_class.options[attr]);
             }
         });
 

data/lib/zen/theme/base.rb

@@ -43,6 +43,7 @@ module Zen
       #
       def validate
         validates_presence([:name, :author, :about, :template_dir])
+        validates_format(:name, /[a-z0-9_\-]+/)
 
         # Validate all the directories
         validates_filepath(:template_dir)

data/lib/zen/version.rb

@@ -7,5 +7,5 @@ module Zen
   # @author Yorick Peterse
   # @since  0.1
   #
-  Version = '0.2.6.1'
+  Version = '0.2.7'
 end

metadata

@@ -2,7 +2,7 @@
 name: zen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.6.1
+  version: 0.2.7
 platform: ruby
 authors: 
 - Yorick Peterse
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.20.0
+        version: 3.24.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 2011.01.30
   type: :runtime
@@ -41,7 +41,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 2.1.4
   type: :runtime
@@ -52,7 +52,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.0.6
   type: :runtime
@@ -63,7 +63,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 4.0.4
   type: :runtime
@@ -74,9 +74,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        version: 0.9.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -85,7 +85,7 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :runtime
@@ -96,7 +96,7 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.6.8
   type: :development
@@ -107,7 +107,7 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 4.2.7
   type: :development
@@ -118,9 +118,9 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -129,9 +129,9 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.5
+        version: 0.7.1
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -140,7 +140,7 @@ dependencies:
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.4.1.2
   type: :development
@@ -151,9 +151,9 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.7
+        version: 0.6.0
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -162,7 +162,7 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.3
   type: :development
@@ -173,7 +173,7 @@ dependencies:
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.1
   type: :development
@@ -184,7 +184,7 @@ dependencies:
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.7.1
   type: :development
@@ -200,7 +200,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gems
 - .travis.yml
 - AUTHORS
 - CHANGELOG.md
@@ -347,6 +346,7 @@ files:
 - 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/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

data/.gems

@@ -1,34 +0,0 @@
-bcrypt-ruby -v2.1.4
-bundler -v1.0.13
-capybara -v0.4.1.2
-celerity -v0.8.9
-childprocess -v0.1.9
-commander -v4.0.4
-crack -v0.1.8
-culerity -v0.2.15
-defensio -v0.9.1
-diff-lcs -v1.1.2
-ffi -v1.0.9
-highline -v1.6.2
-httparty -v0.7.7
-innate -v2011.04
-loofah -v1.0.0
-mime-types -v1.16
-nokogiri -v1.4.4
-rack -v1.2.3
-rack-test -v0.6.0
-rake -v0.9.0
-ramaze -v2011.01.30
-rdiscount -v1.6.8
-RedCloth -v4.2.7
-rspec -v2.6.0
-rspec-core -v2.6.3
-rspec-expectations -v2.6.0
-rspec-mocks -v2.6.0
-rubyzip -v0.9.4
-selenium-webdriver -v0.2.0
-sequel -v3.23.0
-sequel_sluggable -v0.0.6
-sqlite3 -v1.3.3
-xpath -v0.1.4
-yard -v0.7.1