org-ruby 0.5.1 → 0.5.2

data/lib/org-ruby/regexp_helper.rb

@@ -1,156 +1,156 @@
-require 'logger'
-
-module Orgmode
-
-  # = Summary
-  # 
-  # This class contains helper routines to deal with the Regexp "black
-  # magic" you need to properly parse org-mode files.
-  #
-  # = Key methods
-  #
-  # * Use +rewrite_emphasis+ to replace org-mode emphasis strings (e.g.,
-  #   \/italic/) with the suitable markup for the output.
-  #
-  # * Use +rewrite_links+ to get a chance to rewrite all org-mode
-  #   links with suitable markup for the output.
-  class RegexpHelper
-
-    ######################################################################
-    # EMPHASIS
-    #
-    # I figure it's best to stick as closely to the elisp implementation
-    # as possible for emphasis. org.el defines the regular expression that
-    # is used to apply "emphasis" (in my terminology, inline formatting
-    # instead of block formatting). Here's the documentation from org.el.
-    #
-    # Terminology: In an emphasis string like " *strong word* ", we
-    # call the initial space PREMATCH, the final space POSTMATCH, the
-    # stars MARKERS, "s" and "d" are BORDER characters and "trong wor"
-    # is the body.  The different components in this variable specify
-    # what is allowed/forbidden in each part:
-    #
-    # pre          Chars allowed as prematch.  Line beginning allowed, too.
-    # post         Chars allowed as postmatch.  Line end will be allowed too.
-    # border       The chars *forbidden* as border characters.
-    # body-regexp  A regexp like \".\" to match a body character.  Don't use
-    #              non-shy groups here, and don't allow newline here.
-    # newline      The maximum number of newlines allowed in an emphasis exp.
-    #
-    # I currently don't use +newline+ because I've thrown this information
-    # away by this point in the code. TODO -- revisit?
-    attr_reader   :pre_emphasis
-    attr_reader   :post_emphasis
-    attr_reader   :border_forbidden
-    attr_reader   :body_regexp
-    attr_reader   :markers
-
-    attr_reader   :org_emphasis_regexp
-
-    def initialize
-      # Set up the emphasis regular expression.
-      @pre_emphasis = " \t\\('\""
-      @post_emphasis = "- \t.,:!?;'\"\\)"
-      @border_forbidden = " \t\r\n,\"'"
-      @body_regexp = ".*?"
-      @markers = "*/_=~+"
-      @logger = Logger.new(STDERR)
-      @logger.level = Logger::WARN
-      build_org_emphasis_regexp
-      build_org_link_regexp
-    end
-
-    # Finds all emphasis matches in a string.
-    # Supply a block that will get the marker and body as parameters.
-    def match_all(str)
-      str.scan(@org_emphasis_regexp) do |match|
-        yield $2, $3
-      end
-    end
-
-    # Compute replacements for all matching emphasized phrases.
-    # Supply a block that will get the marker and body as parameters;
-    # return the replacement string from your block.
-    #
-    # = Example
-    #
-    #   re = RegexpHelper.new
-    #   result = re.rewrite_emphasis("*bold*, /italic/, =code=") do |marker, body|
-    #       "<#{map[marker]}>#{body}</#{map[marker]}>"
-    #   end
-    #
-    # In this example, the block body will get called three times:
-    #
-    # 1. Marker: "*", body: "bold"
-    # 2. Marker: "/", body: "italic"
-    # 3. Marker: "=", body: "code"
-    #
-    # The return from this block is a string that will be used to
-    # replace "*bold*", "/italic/", and "=code=",
-    # respectively. (Clearly this sample string will use HTML-like
-    # syntax, assuming +map+ is defined appropriately.)
-    def rewrite_emphasis(str)
-      str.gsub(@org_emphasis_regexp) do |match|
-        inner = yield $2, $3
-        "#{$1}#{inner}#{$4}"
-      end
-    end
-
-    # = Summary
-    #
-    # Rewrite org-mode links in a string to markup suitable to the
-    # output format.
-    #
-    # = Usage
-    # 
-    # Give this a block that expect the link and optional friendly
-    # text. Return how that link should get formatted.
-    #
-    # = Example
-    #
-    #   re = RegexpHelper.new
-    #   result = re.rewrite_links("[[http://www.bing.com]] and [[http://www.hotmail.com][Hotmail]]") do |link, text}
-    #       text ||= link
-    #       "<a href=\"#{link}\">#{text}</a>"
-    #    end
-    #
-    # In this example, the block body will get called two times. In the
-    # first instance, +text+ will be nil (the org-mode markup gives no
-    # friendly text for the link +http://www.bing.com+. In the second
-    # instance, the block will get text of *Hotmail* and the link
-    # +http://www.hotmail.com+. In both cases, the block returns an
-    # HTML-style link, and that is how things will get recorded in
-    # +result+.
-    def rewrite_links(str)
-      i = str.gsub(@org_link_regexp) do |match|
-        yield $1, nil
-      end
-      i.gsub(@org_link_text_regexp) do |match|
-        yield $1, $2
-      end
-    end
-
-    private
-
-    def build_org_emphasis_regexp
-      @org_emphasis_regexp = Regexp.new("([#{@pre_emphasis}]|^)\n" +
-                                        "(  [#{@markers}]  )\n" + 
-                                        "(  [^#{@border_forbidden}]  | " +
-                                        "  [^#{@border_forbidden}]#{@body_regexp}[^#{@border_forbidden}]  )\n" +
-                                        "\\2\n" +
-                                        "([#{@post_emphasis}]|$)\n", Regexp::EXTENDED)
-      @logger.debug "Just created regexp: #{@org_emphasis_regexp}"
-    end
-
-    def build_org_link_regexp
-      @org_link_regexp = /\[\[
-                             ([^\]]*) # This is the URL
-                          \]\]/x
-      @org_link_text_regexp = /\[\[
-                                 ([^\]]*) # This is the URL
-                               \]\[
-                                 ([^\]]*) # This is the friendly text
-                               \]\]/x
-    end
-  end                           # class Emphasis
-end                             # module Orgmode
+require 'logger'
+
+module Orgmode
+
+  # = Summary
+  # 
+  # This class contains helper routines to deal with the Regexp "black
+  # magic" you need to properly parse org-mode files.
+  #
+  # = Key methods
+  #
+  # * Use +rewrite_emphasis+ to replace org-mode emphasis strings (e.g.,
+  #   \/italic/) with the suitable markup for the output.
+  #
+  # * Use +rewrite_links+ to get a chance to rewrite all org-mode
+  #   links with suitable markup for the output.
+  class RegexpHelper
+
+    ######################################################################
+    # EMPHASIS
+    #
+    # I figure it's best to stick as closely to the elisp implementation
+    # as possible for emphasis. org.el defines the regular expression that
+    # is used to apply "emphasis" (in my terminology, inline formatting
+    # instead of block formatting). Here's the documentation from org.el.
+    #
+    # Terminology: In an emphasis string like " *strong word* ", we
+    # call the initial space PREMATCH, the final space POSTMATCH, the
+    # stars MARKERS, "s" and "d" are BORDER characters and "trong wor"
+    # is the body.  The different components in this variable specify
+    # what is allowed/forbidden in each part:
+    #
+    # pre          Chars allowed as prematch.  Line beginning allowed, too.
+    # post         Chars allowed as postmatch.  Line end will be allowed too.
+    # border       The chars *forbidden* as border characters.
+    # body-regexp  A regexp like \".\" to match a body character.  Don't use
+    #              non-shy groups here, and don't allow newline here.
+    # newline      The maximum number of newlines allowed in an emphasis exp.
+    #
+    # I currently don't use +newline+ because I've thrown this information
+    # away by this point in the code. TODO -- revisit?
+    attr_reader   :pre_emphasis
+    attr_reader   :post_emphasis
+    attr_reader   :border_forbidden
+    attr_reader   :body_regexp
+    attr_reader   :markers
+
+    attr_reader   :org_emphasis_regexp
+
+    def initialize
+      # Set up the emphasis regular expression.
+      @pre_emphasis = " \t\\('\""
+      @post_emphasis = "- \t.,:!?;'\"\\)"
+      @border_forbidden = " \t\r\n,\"'"
+      @body_regexp = ".*?"
+      @markers = "*/_=~+"
+      @logger = Logger.new(STDERR)
+      @logger.level = Logger::WARN
+      build_org_emphasis_regexp
+      build_org_link_regexp
+    end
+
+    # Finds all emphasis matches in a string.
+    # Supply a block that will get the marker and body as parameters.
+    def match_all(str)
+      str.scan(@org_emphasis_regexp) do |match|
+        yield $2, $3
+      end
+    end
+
+    # Compute replacements for all matching emphasized phrases.
+    # Supply a block that will get the marker and body as parameters;
+    # return the replacement string from your block.
+    #
+    # = Example
+    #
+    #   re = RegexpHelper.new
+    #   result = re.rewrite_emphasis("*bold*, /italic/, =code=") do |marker, body|
+    #       "<#{map[marker]}>#{body}</#{map[marker]}>"
+    #   end
+    #
+    # In this example, the block body will get called three times:
+    #
+    # 1. Marker: "*", body: "bold"
+    # 2. Marker: "/", body: "italic"
+    # 3. Marker: "=", body: "code"
+    #
+    # The return from this block is a string that will be used to
+    # replace "*bold*", "/italic/", and "=code=",
+    # respectively. (Clearly this sample string will use HTML-like
+    # syntax, assuming +map+ is defined appropriately.)
+    def rewrite_emphasis(str)
+      str.gsub(@org_emphasis_regexp) do |match|
+        inner = yield $2, $3
+        "#{$1}#{inner}#{$4}"
+      end
+    end
+
+    # = Summary
+    #
+    # Rewrite org-mode links in a string to markup suitable to the
+    # output format.
+    #
+    # = Usage
+    # 
+    # Give this a block that expect the link and optional friendly
+    # text. Return how that link should get formatted.
+    #
+    # = Example
+    #
+    #   re = RegexpHelper.new
+    #   result = re.rewrite_links("[[http://www.bing.com]] and [[http://www.hotmail.com][Hotmail]]") do |link, text}
+    #       text ||= link
+    #       "<a href=\"#{link}\">#{text}</a>"
+    #    end
+    #
+    # In this example, the block body will get called two times. In the
+    # first instance, +text+ will be nil (the org-mode markup gives no
+    # friendly text for the link +http://www.bing.com+. In the second
+    # instance, the block will get text of *Hotmail* and the link
+    # +http://www.hotmail.com+. In both cases, the block returns an
+    # HTML-style link, and that is how things will get recorded in
+    # +result+.
+    def rewrite_links(str)
+      i = str.gsub(@org_link_regexp) do |match|
+        yield $1, nil
+      end
+      i.gsub(@org_link_text_regexp) do |match|
+        yield $1, $2
+      end
+    end
+
+    private
+
+    def build_org_emphasis_regexp
+      @org_emphasis_regexp = Regexp.new("([#{@pre_emphasis}]|^)\n" +
+                                        "(  [#{@markers}]  )\n" + 
+                                        "(  [^#{@border_forbidden}]  | " +
+                                        "  [^#{@border_forbidden}]#{@body_regexp}[^#{@border_forbidden}]  )\n" +
+                                        "\\2\n" +
+                                        "([#{@post_emphasis}]|$)\n", Regexp::EXTENDED)
+      @logger.debug "Just created regexp: #{@org_emphasis_regexp}"
+    end
+
+    def build_org_link_regexp
+      @org_link_regexp = /\[\[
+                             ([^\]]*) # This is the URL
+                          \]\]/x
+      @org_link_text_regexp = /\[\[
+                                 ([^\]]*) # This is the URL
+                               \]\[
+                                 ([^\]]*) # This is the friendly text
+                               \]\]/x
+    end
+  end                           # class Emphasis
+end                             # module Orgmode

data/lib/org-ruby/textile_output_buffer.rb

@@ -1,68 +1,67 @@
-require 'stringio'
-
-module Orgmode
-
-  class TextileOutputBuffer < OutputBuffer
-
-    def initialize(output)
-      super(output)
-      @add_paragraph = false
-    end
-
-    def push_mode(mode)
-      super(mode)
-      @output << "bc.. " if mode_is_code(mode)
-    end
-
-    def pop_mode(mode = nil)
-      m = super(mode)
-      @add_paragraph = (mode_is_code(m))
-      m
-    end
-
-    # Maps org markup to textile markup.
-    TextileMap = {
-      "*" => "*",
-      "/" => "_",
-      "_" => "_",
-      "=" => "@",
-      "~" => "@",
-      "+" => "+"
-    }
-
-    # Handles inline formatting for textile.
-    def inline_formatting(input)
-      input = @re_help.rewrite_emphasis(input) do |marker, body|
-        m = TextileMap[marker]
-        "#{m}#{body}#{m}"
-      end
-      input = @re_help.rewrite_links(input) do |link, text|
-        text ||= link
-        link = link.gsub(/ /, "%20")
-        "\"#{text}\":#{link}"
-      end
-      input
-    end
-
-    # Flushes the current buffer
-    def flush!
-      @logger.debug "FLUSH ==========> #{@output_type}"
-      if (@output_type == :blank) then
-        @output << "\n"
-      elsif (@buffer.length > 0) then
-        if @add_paragraph then
-          @output << "p. " if @output_type == :paragraph
-          @add_paragraph = false
-        end
-        @output << "bq. " if current_mode == :blockquote
-        @output << "#" * @list_indent_stack.length << " " if @output_type == :ordered_list
-        @output << "*" * @list_indent_stack.length << " " if @output_type == :unordered_list
-        @output << inline_formatting(@buffer) << "\n"
-      end
-      @buffer = ""
-      @buffer_mode = nil
-    end
-
-
-  end                           # class TextileOutputBuffer
-end                             # module Orgmode
+require 'stringio'
+
+module Orgmode
+
+  class TextileOutputBuffer < OutputBuffer
+
+    def initialize(output)
+      super(output)
+      @add_paragraph = false
+    end
+
+    def push_mode(mode)
+      super(mode)
+      @output << "bc.. " if mode_is_code(mode)
+    end
+
+    def pop_mode(mode = nil)
+      m = super(mode)
+      @add_paragraph = (mode_is_code(m))
+      m
+    end
+
+    # Maps org markup to textile markup.
+    TextileMap = {
+      "*" => "*",
+      "/" => "_",
+      "_" => "_",
+      "=" => "@",
+      "~" => "@",
+      "+" => "+"
+    }
+
+    # Handles inline formatting for textile.
+    def inline_formatting(input)
+      input = @re_help.rewrite_emphasis(input) do |marker, body|
+        m = TextileMap[marker]
+        "#{m}#{body}#{m}"
+      end
+      input = @re_help.rewrite_links(input) do |link, text|
+        text ||= link
+        link = link.gsub(/ /, "%20")
+        "\"#{text}\":#{link}"
+      end
+      input
+    end
+
+    # Flushes the current buffer
+    def flush!
+      @logger.debug "FLUSH ==========> #{@output_type}"
+      if (@output_type == :blank) then
+        @output << "\n"
+      elsif (@buffer.length > 0) then
+        if @add_paragraph then
+          @output << "p. " if @output_type == :paragraph
+          @add_paragraph = false
+        end
+        @output << "bq. " if current_mode == :blockquote
+        @output << "#" * @list_indent_stack.length << " " if @output_type == :ordered_list
+        @output << "*" * @list_indent_stack.length << " " if @output_type == :unordered_list
+        @output << inline_formatting(@buffer) << "\n"
+      end
+      clear_accumulation_buffer!
+    end
+
+
+  end                           # class TextileOutputBuffer
+end                             # module Orgmode

data/spec/data/freeform-example.org

@@ -1,113 +1,113 @@
-#+BEGIN_EXAMPLE
-#+TITLE:     Freeform
-#+AUTHOR:    
-#+EMAIL:     bdewey@gmail.com
-#+DATE:      2009-12-20 Sun
-#+DESCRIPTION: 
-#+KEYWORDS: 
-#+LANGUAGE:  en
-#+OPTIONS:   H:3 num:t toc:nil \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
-#+OPTIONS:   TeX:t LaTeX:nil skip:nil d:nil todo:t pri:nil tags:not-in-toc
-#+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 path:http://orgmode.org/org-info.js
-#+EXPORT_SELECT_TAGS: export
-#+EXPORT_EXCLUDE_TAGS: noexport
-#+LINK_UP:   
-#+LINK_HOME: 
-#+END_EXAMPLE
-Freeform
-
-This is my todo list, research file, and log record from working on
-the Freeform project.
-
-* Future ideas						:someday:
-  - Add *posts*
-  - Enforce uniqueness of url_token
-  - Add FeedSync support
-  - Auto-recognize URLs
-  - Edit in place
-  - Import/export of content. I want it to be safe to store real content on the site.
-  - Page reordering.
-  - AtomPub support.
-  - Organization:
-    - Move pages around
-    - Add tags and navigation by tags
-    - Add a breadcrumb bar
-
-* TODO Add versioning support			:current:feature:
-
-** DONE UI rough-in
-   CLOSED: [2009-11-26 Thu]
-
-** DONE Author logging
-   CLOSED: [2009-11-27 Fri]
-
-** DONE Version table and model updates
-   CLOSED: [2009-11-28 Sat 22:40]
-   CLOCK: [2009-11-28 Sat 21:35]--[2009-11-28 Sat 22:40] =>  1:05
-   CLOCK: [2009-11-28 Sat 21:01]--[2009-11-28 Sat 21:25] =>  0:24
-   CLOCK: [2009-11-28 Sat 19:46]--[2009-11-28 Sat 20:54] =>  1:08
-   CLOCK: [2009-11-28 Sat 14:38]--[2009-11-28 Sat 15:08] =>  0:30
-   CLOCK: [2009-11-28 Sat 13:21]--[2009-11-28 Sat 14:37] =>  1:16
-
-   OK, my current thinking is to have each idea have many Changes. A
-   change has many change records. A change record is a list of
-   specific attributes that change, and includes the old and the new
-   values. I'll use callbacks on the Idea model to maintain the
-   changes.
-
-
-*** DONE Create version method
-    CLOSED: [2009-11-28 Sat 22:40]
-
-*** DONE Make current method
-    CLOSED: [2009-11-28 Sat 22:40]
-
-** Update pages controller
-
-*** DONE Show versions
-    CLOSED: [2009-11-30 Mon 00:34]
-    CLOCK: [2009-11-29 Sun 21:27]--[2009-11-29 Sun 21:54] =>  0:27
-    CLOCK: [2009-11-29 Sun 15:40]--[2009-11-29 Sun 15:44] =>  0:04
-    CLOCK: [2009-11-28 Sat 22:44]--[2009-11-28 Sat 23:50] =>  1:06
-
-    I'm now at the point where I *list* versions, but I can't show
-    them. 
-
-    - [X] I currently suspect that I broke my version recovery code
-      when I switched the order of the idea_changes. I need to
-      investigate why nothing's failing in the tests; I expected
-      failures. Possible addition to test: start looking at those
-      version numbers.
-
-	  OK, here's what was going on: In the test, you need to
-          reload the idea_changes array from the database to get the
-          database sort order. I also make sure I do this inside the
-          Idea methods.
-
-**** DONE Write a test for Idea::attributes_for_change
-     CLOSED: [2009-11-29 Sun 23:59]
-     CLOCK: [2009-11-29 Sun 23:47]--[2009-11-29 Sun 23:58] =>  0:11
-     CLOCK: [2009-11-29 Sun 22:02]--[2009-11-29 Sun 23:42] =>  1:40
-     CLOCK: [2009-11-29 Sun 21:54]--[2009-11-29 Sun 21:56] =>  0:02
-
-*** DONE Write integration tests that cover versions.
-    CLOSED: [2009-12-11 Fri 23:25]
-    CLOCK: [2009-12-11 Fri 20:27]--[2009-12-11 Fri 23:25] =>  2:58
-
-*** DONE Recover versions
-    CLOSED: [2009-12-12 Sat 22:09]
-    CLOCK: [2009-12-12 Sat 21:02]--[2009-12-12 Sat 22:09] =>  1:07
-    CLOCK: [2009-12-12 Sat 20:13]--[2009-12-12 Sat 21:00] =>  0:47
-
-*** DONE Move to recycle bin
-    CLOSED: [2009-12-12 Sat 22:59]
-    CLOCK: [2009-12-12 Sat 22:23]--[2009-12-12 Sat 22:59] =>  0:36
-
-    Note I'm avoiding logging delete operations because I'm presuming
-    there will be a recycle bin, and therefore the *pages* controller
-    will never actually delete files. At some point, when I want to
-    support full FeedSync, I'll need to tackle this.
-
-    The other timebomb: I don't know how well my logging scheme will
-    work when pages move. I don't yet know if I will address this in
-    the current sprint.
+#+BEGIN_EXAMPLE
+#+TITLE:     Freeform
+#+AUTHOR:    
+#+EMAIL:     bdewey@gmail.com
+#+DATE:      2009-12-20 Sun
+#+DESCRIPTION: 
+#+KEYWORDS: 
+#+LANGUAGE:  en
+#+OPTIONS:   H:3 num:t toc:nil \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
+#+OPTIONS:   TeX:t LaTeX:nil skip:nil d:nil todo:t pri:nil tags:not-in-toc
+#+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 path:http://orgmode.org/org-info.js
+#+EXPORT_SELECT_TAGS: export
+#+EXPORT_EXCLUDE_TAGS: noexport
+#+LINK_UP:   
+#+LINK_HOME: 
+#+END_EXAMPLE
+Freeform
+
+This is my todo list, research file, and log record from working on
+the Freeform project.
+
+* Future ideas						:someday:
+  - Add *posts*
+  - Enforce uniqueness of url_token
+  - Add FeedSync support
+  - Auto-recognize URLs
+  - Edit in place
+  - Import/export of content. I want it to be safe to store real content on the site.
+  - Page reordering.
+  - AtomPub support.
+  - Organization:
+    - Move pages around
+    - Add tags and navigation by tags
+    - Add a breadcrumb bar
+
+* TODO Add versioning support			:current:feature:
+
+** DONE UI rough-in
+   CLOSED: [2009-11-26 Thu]
+
+** DONE Author logging
+   CLOSED: [2009-11-27 Fri]
+
+** DONE Version table and model updates
+   CLOSED: [2009-11-28 Sat 22:40]
+   CLOCK: [2009-11-28 Sat 21:35]--[2009-11-28 Sat 22:40] =>  1:05
+   CLOCK: [2009-11-28 Sat 21:01]--[2009-11-28 Sat 21:25] =>  0:24
+   CLOCK: [2009-11-28 Sat 19:46]--[2009-11-28 Sat 20:54] =>  1:08
+   CLOCK: [2009-11-28 Sat 14:38]--[2009-11-28 Sat 15:08] =>  0:30
+   CLOCK: [2009-11-28 Sat 13:21]--[2009-11-28 Sat 14:37] =>  1:16
+
+   OK, my current thinking is to have each idea have many Changes. A
+   change has many change records. A change record is a list of
+   specific attributes that change, and includes the old and the new
+   values. I'll use callbacks on the Idea model to maintain the
+   changes.
+
+
+*** DONE Create version method
+    CLOSED: [2009-11-28 Sat 22:40]
+
+*** DONE Make current method
+    CLOSED: [2009-11-28 Sat 22:40]
+
+** Update pages controller
+
+*** DONE Show versions
+    CLOSED: [2009-11-30 Mon 00:34]
+    CLOCK: [2009-11-29 Sun 21:27]--[2009-11-29 Sun 21:54] =>  0:27
+    CLOCK: [2009-11-29 Sun 15:40]--[2009-11-29 Sun 15:44] =>  0:04
+    CLOCK: [2009-11-28 Sat 22:44]--[2009-11-28 Sat 23:50] =>  1:06
+
+    I'm now at the point where I *list* versions, but I can't show
+    them. 
+
+    - [X] I currently suspect that I broke my version recovery code
+      when I switched the order of the idea_changes. I need to
+      investigate why nothing's failing in the tests; I expected
+      failures. Possible addition to test: start looking at those
+      version numbers.
+
+	  OK, here's what was going on: In the test, you need to
+          reload the idea_changes array from the database to get the
+          database sort order. I also make sure I do this inside the
+          Idea methods.
+
+**** DONE Write a test for Idea::attributes_for_change
+     CLOSED: [2009-11-29 Sun 23:59]
+     CLOCK: [2009-11-29 Sun 23:47]--[2009-11-29 Sun 23:58] =>  0:11
+     CLOCK: [2009-11-29 Sun 22:02]--[2009-11-29 Sun 23:42] =>  1:40
+     CLOCK: [2009-11-29 Sun 21:54]--[2009-11-29 Sun 21:56] =>  0:02
+
+*** DONE Write integration tests that cover versions.
+    CLOSED: [2009-12-11 Fri 23:25]
+    CLOCK: [2009-12-11 Fri 20:27]--[2009-12-11 Fri 23:25] =>  2:58
+
+*** DONE Recover versions
+    CLOSED: [2009-12-12 Sat 22:09]
+    CLOCK: [2009-12-12 Sat 21:02]--[2009-12-12 Sat 22:09] =>  1:07
+    CLOCK: [2009-12-12 Sat 20:13]--[2009-12-12 Sat 21:00] =>  0:47
+
+*** DONE Move to recycle bin
+    CLOSED: [2009-12-12 Sat 22:59]
+    CLOCK: [2009-12-12 Sat 22:23]--[2009-12-12 Sat 22:59] =>  0:36
+
+    Note I'm avoiding logging delete operations because I'm presuming
+    there will be a recycle bin, and therefore the *pages* controller
+    will never actually delete files. At some point, when I want to
+    support full FeedSync, I'll need to tackle this.
+
+    The other timebomb: I don't know how well my logging scheme will
+    work when pages move. I don't yet know if I will address this in
+    the current sprint.