zen 0.2.8 → 0.3b

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

@@ -1,7 +1,6 @@
 /**
  * Markdown driver for the text editor that ships with Zen.
  *
- * @author Yorick Peterse
  * @since  0.2.6
  */
 Zen.Editor.Markdown = new Class(
@@ -11,7 +10,6 @@ Zen.Editor.Markdown = new Class(
     /**
      * Overrides Zen.Editor.bold.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -23,7 +21,6 @@ Zen.Editor.Markdown = new Class(
     /**
      * Overrides Zen.Editor.italic.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -35,7 +32,6 @@ Zen.Editor.Markdown = new Class(
     /**
      * Overrides Zen.Editor.link.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -53,7 +49,6 @@ Zen.Editor.Markdown = new Class(
     /**
      * Overrides Zen.Editor.ul.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -68,7 +63,6 @@ Zen.Editor.Markdown = new Class(
     /**
      * Overrides Zen.Editor.ol. 
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */

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

@@ -1,7 +1,6 @@
 /**
  * Textile driver for the text editor that ships with Zen.
  *
- * @author Yorick Peterse
  * @since  0.2.6
  */
 Zen.Editor.Textile = new Class(
@@ -11,7 +10,6 @@ Zen.Editor.Textile = new Class(
     /**
      * Overrides Zen.Editor.bold.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -23,7 +21,6 @@ Zen.Editor.Textile = new Class(
     /**
      * Overrides Zen.Editor.italic.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -35,7 +32,6 @@ Zen.Editor.Textile = new Class(
     /**
      * Overrides Zen.Editor.link.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -53,7 +49,6 @@ Zen.Editor.Textile = new Class(
     /**
      * Overrides Zen.Editor.ul.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */
@@ -68,7 +63,6 @@ Zen.Editor.Textile = new Class(
     /**
      * Overrides Zen.Editor.ol.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {element} editor The textarea to insert the tags into.
      */

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

@@ -31,7 +31,6 @@
  * For more information on the available options (which can be set in the second
  * parameter just like HtmlTable) see HtmlTable and HtmlTable.Sort.
  *
- * @author Yorick Peterse
  * @since  0.2.8
  */
 Zen.HtmlTable = new Class(
@@ -42,7 +41,6 @@ Zen.HtmlTable = new Class(
      * Creates a new instance of the class and calls the required methods to
      * allow users to check all checkboxes in a table.
      *
-     * @author Yorick Peterse
      * @since  0.2.8
      * @see    HtmlTable.initialize()
      */
@@ -69,7 +67,6 @@ Zen.HtmlTable = new Class(
      *
      * * data-sort-parser: the name of the parser to use for the column.
      *
-     * @author Yorick Peterse
      * @since  0.2.8
      * @param  {element} element An HTML element that represents a single table.
      * @return {object}
@@ -83,7 +80,6 @@ Zen.HtmlTable = new Class(
             classHeadSort   : 'asc',
             classHeadSortRev: 'desc',
             classNoSort     : 'no_sort',
-            classZebra      : 'odd',
             sortable        : true,
             parsers         : []
         };
@@ -115,7 +111,6 @@ Zen.HtmlTable = new Class(
      * the table heading which in turn checks all the checkboxes for that column
      * in each table row.
      *
-     * @author Yorick Peterse
      * @since  0.2.8
      */
     enableCheck: function()

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

@@ -1,11 +1,11 @@
 /**
  * Widget that allows developers to create a tab based navigation menu.
- * The Tabs class supports both normal tabs (fields hidden based on their IDs) 
+ * The Tabs class supports both normal tabs (fields hidden based on their IDs)
  * as well as tabs loaded using Ajax.
  *
- * In order to use the Tab class you only need some very basic markup. You'll 
- * need a list element (either ordered or unordered) that will contain all links 
- * and a few divs in case you're using regular tabs that don't load their content 
+ * In order to use the Tab class you only need some very basic markup. You'll
+ * need a list element (either ordered or unordered) that will contain all links
+ * and a few divs in case you're using regular tabs that don't load their content
  * using Ajax. The most basic example looks like the following:
  *
  *     <ul class="tabs">
@@ -18,11 +18,11 @@
  *         <p>This is the content of tab #1.</p>
  *     </div>
  *
- * When using regular tabs it doesn't matter where you put the divs for the 
- * tabs. However, when using the Ajax tabs it's important to remember that the 
- * content will be inserted just after the closing tags of the unordered/ordered 
+ * When using regular tabs it doesn't matter where you put the divs for the
+ * tabs. However, when using the Ajax tabs it's important to remember that the
+ * content will be inserted just after the closing tags of the unordered/ordered
  * list in a div with a class of "tab_content". Example:
- * 
+ *
  *     <ul class="tabs">
  *         <li>
  *             <a href="#tab1">Tab #1</a>
@@ -35,18 +35,18 @@
  *
  * ## Creating and Configuration
  *
- * Now that we know how the markup works, let's create some tabs. Doing this is 
+ * Now that we know how the markup works, let's create some tabs. Doing this is
  * fairly easy and at a basic level only requires the following code:
  *
  *     Zen.Objects.MyTabs = new Zen.Tabs('css_selector_for_element');
  *
- * In this case we're creating a new instance of the Tabs class for an element 
- * named "css_selector_for_element". The first argument is a simple CSS selector 
- * that defines what element to choose. This means that you can either use a 
- * class or ID name but also a more complicated selector like 
+ * In this case we're creating a new instance of the Tabs class for an element
+ * named "css_selector_for_element". The first argument is a simple CSS selector
+ * that defines what element to choose. This means that you can either use a
+ * class or ID name but also a more complicated selector like
  * "div > ul ul:first-child".
  *
- * Let's create another Tab instance but use some custom configuration options 
+ * Let's create another Tab instance but use some custom configuration options
  * this time.
  *
  *     Zen.Objects.MyTabs = new Zen.Tabs('ul.some_class_name',
@@ -57,34 +57,27 @@
  *
  * As you can see there are  configuration items available.
  *
- * * default: The default tab/tab field to show. Again this is just a CSS 
+ * * default: The default tab/tab field to show. Again this is just a CSS
  *   selector so you can easily customize it.
- * * ajax: Boolean that indicates that the tabs should be loaded from an 
+ * * ajax: Boolean that indicates that the tabs should be loaded from an
  *   external page using Ajax.
  *
  * Special thanks to the guys from #mootools for helping me out :)
- * 
- * @author Yorick Peterse
+ *
  * @since  0.1
  */
 Zen.Tabs = new Class(
 {
     Implements: Options,
 
-    Depends:
-    {
-        stylesheet: ['zen/tabs']
-    },
-
     /**
     * Object containing all options for each tab instance.
     *
-    * @author Yorick Peterse
     * @since  0.1
     * @var    {object}
     */
     options:
-    {    
+    {
         // The default tab/field to display
         'default': 'li:first-child',
 
@@ -96,7 +89,6 @@ Zen.Tabs = new Class(
     * String that contains the CSS selector that specifies which element
     * should be used for creating the tabs.
     *
-    * @author Yorick Peterse
     * @since  0.1
     * @var    {object}
     */
@@ -105,10 +97,9 @@ Zen.Tabs = new Class(
     /**
     * Array that will contain a list of objects for each tab/field for the
     * current element. This array will be used when binding events to each
-    * tab so that we don't have to search for these tabs/fields over and over 
+    * tab so that we don't have to search for these tabs/fields over and over
     * again.
     *
-    * @author Yorick Peterse
     * @since  0.1
     * @var    {array}
     */
@@ -118,7 +109,6 @@ Zen.Tabs = new Class(
     * Constructor method called upon initialization. Options can be
     * set as a JSON object in the first argument.
     *
-    * @author Yorick Peterse
     * @since  0.1
     * @param  {string} element The element to use for creating the tabs.
     * @param  {object} options Custom options used when creating the tabs
@@ -147,12 +137,11 @@ Zen.Tabs = new Class(
     },
 
     /**
-    * Generate a set of normal tabs that will load content that's already on the 
-    * page. In order for these tabs to work your URLs will need to point to an 
+    * Generate a set of normal tabs that will load content that's already on the
+    * page. In order for these tabs to work your URLs will need to point to an
     * element with an ID. These elements will be hidden and shown upon clicking
     * the corresponding tab.
     *
-    * @author Yorick Peterse
     * @since  0.1
     */
     generalTabs: function()
@@ -194,7 +183,7 @@ Zen.Tabs = new Class(
                 // Now we can add the class to the current tab
                 this.getParent('li').addClass('active');
 
-                // Toggle the state of each tab and ignore any non-existing 
+                // Toggle the state of each tab and ignore any non-existing
                 // fields.
                 self.fields.each(function(item)
                 {
@@ -214,51 +203,5 @@ Zen.Tabs = new Class(
                 });
             });
         });
-    },
-
-    /**
-    * Generate a set of tabs of which the content for each tab will be loaded
-    * using an Ajax request. By default the content of these tabs will be 
-    * inserted after the element that contains the tabs. This content will be 
-    * inserted into a div of which the class is "tab_content".
-    *
-    * @author Yorick Peterse
-    * @since  0.1
-    */
-    ajaxTabs: function()
-    {
-        // Create a reference to the current instance so we can
-        // use data in this instance in our events and loops.
-        var self = this;
-
-        // Select our default tab element
-        var default_link  = this.element.getElement(self.options['default']);
-            default_link  = default_link.getElement('a');
-        var links         = this.element.getElements('li a');
-
-        // Create the element that will contain our Ajax response data
-        tab_content = new Element('div', {'class': 'tab_content'});
-        tab_content.inject(this.element, 'after');
-
-        // Load our default tab content
-        this.element.getElement(self.options['default']).addClass('active');
-        this.element.getNext('.tab_content').load(default_link.get('href'));
-
-        links.each(function(link)
-        {
-            // Add an event that will show the corresponding field for each link
-            link.addEvent('click', function(event)
-            {
-                // Prevent normal behavior
-                event.stop();
-
-                self.element.getElement('li.active').removeClass('active');
-
-                // Now we can add the class to the current tab
-                this.getParent('li').addClass('active');
-
-                self.element.getNext('.tab_content').load(this.get('href'));
-            });
-        });
     }
 });

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

@@ -1,13 +1,13 @@
 /**
- * The Window class can be used to create basic windows with a title and a set 
- * of buttons. These windows can be used for a preview of an article, showing an 
+ * The Window class can be used to create basic windows with a title and a set
+ * of buttons. These windows can be used for a preview of an article, showing an
  * image or asking for a confirmation.
  *
  * ## Usage
  *
- * In order to create a new window you simply need to create a new instance of 
- * the class. The first parameter is the content to display and is required, the 
- * second parameter is an object containing all custom options to use such as 
+ * In order to create a new window you simply need to create a new instance of
+ * the class. The first parameter is the content to display and is required, the
+ * second parameter is an object containing all custom options to use such as
  * the title.
  *
  *     var modal = new Zen.Window('Hello, world!');
@@ -20,13 +20,13 @@
  *
  * ## Buttons
  *
- * Buttons can be added by setting the "buttons" key in the options object to an 
+ * Buttons can be added by setting the "buttons" key in the options object to an
  * array of objects. Each object should have the following three keys:
  *
  * * name: the name of the button, also used as the class (should be unique).
  * * label: the text to display in the button.
- * * onClick: a function that will be called whenever the button is clicked. 
- *   This function takes a single parameter which is set to the instance of the 
+ * * onClick: a function that will be called whenever the button is clicked.
+ *   This function takes a single parameter which is set to the instance of the
  *   window the button belongs to.
  *
  * An example of setting a button can be seen below.
@@ -48,23 +48,16 @@
  *         }
  *     );
  *
- * @author Yorick Peterse
  * @since  0.2.6
  */
 Zen.Window = new Class(
 {
     Implements: Options,
 
-    Depends:
-    {
-        stylesheet: ['zen/window']
-    },
-
     /**
-     * Object containing all the custom options as well as the ones specified by 
+     * Object containing all the custom options as well as the ones specified by
      * the user.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      */
     options:
@@ -91,7 +84,6 @@ Zen.Window = new Class(
     /**
      * DOM element for the current window instance.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @var    {element}
      */
@@ -100,10 +92,9 @@ Zen.Window = new Class(
     /**
      * Creates a new instance of the class and displays the window.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      * @param  {string} content The content to display inside the window.
-     * @param  {object} options Object containing a collection of custom options 
+     * @param  {object} options Object containing a collection of custom options
      * for the window.
      */
     initialize: function(content, options)
@@ -187,11 +178,11 @@ Zen.Window = new Class(
             container.makeDraggable();
         }
 
-        // Set a negative margin so that the window can be aligned when 
+        // Set a negative margin so that the window can be aligned when
         // positioning it absolute.
         var margin = this.options.width - ( this.options.width * 1.5 );
         container.setStyle('margin-left', margin);
-        
+
         // Last step: inject the HTML into the DOM
         this.element = container;
         this.element.inject(document.body);
@@ -200,7 +191,6 @@ Zen.Window = new Class(
     /**
      * Removes the window from the DOM.
      *
-     * @author Yorick Peterse
      * @since  0.2.6
      */
     destroy: function()

data/lib/zen/spec/bacon/color_output.rb

@@ -29,7 +29,7 @@ module Bacon
 
     #:nodoc:
     def spaces
-      if Counter[:context_depth] === 0
+      if Counter[:context_depth] == 0
         Counter[:context_depth] = 1
       end
 

data/lib/zen/spec/helper.rb

@@ -1,17 +1,16 @@
 require 'ramaze'
 require 'stringio'
 
-Ramaze.setup(:verobse => false) do
-  gem 'capybara', ['~> 1.0.0']
-  gem 'bacon'   , ['~> 1.1.0']
-  gem 'webmock' , ['~> 1.6.4']
+Ramaze.setup(:verbose => false) do
+  gem 'capybara', ['>= 1.1.1']
+  gem 'bacon'   , ['>= 1.1.0']
+  gem 'webmock' , ['>= 1.6.4']
 end
 
 require 'capybara/dsl'
 require 'ramaze/spec/bacon'
-require __DIR__('bacon/color_output')
 
-Bacon.extend(Bacon::ColorOutput)
+Bacon.extend(Bacon::TapOutput)
 
 # Configure Capybara
 Capybara.configure do |config|
@@ -22,7 +21,6 @@ end
 ##
 # Logs the user in using the spec user.
 #
-# @author Yorick Peterse
 # @since  0.2.8
 #
 def capybara_login
@@ -50,9 +48,8 @@ end
 #    puts 'hello'
 #  end
 #
-# puts out # => {:stdout => "hello\n", :stderr => ""}
+#  puts out # => {:stdout => "hello\n", :stderr => ""}
 #
-# @author Yorick Peterse
 # @since  0.2.8
 # @return [Hash]
 #
@@ -85,7 +82,6 @@ end
 #  obj = stub(:language => 'Ruby')
 #  puts obj.language # => "Ruby"
 #
-# @author Yorick Peterse
 # @since  0.2.8
 # @param  [Hash] attributes A hash containing all the attributes to set and
 # their values.
@@ -104,7 +100,6 @@ end
 ##
 # Returns a hash with a stubbed custom field and a stubbed custom field value.
 #
-# @author Yorick Peterse
 # @since  0.2.8
 # @param  [String] field_type_name The name of the field type.
 # @param  [Hash] options Additional options to pass to the stub() call for the