From 7d010055142c14aa5ee56ac5aae600dfdc03dcae Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 18 Apr 2005 20:10:11 +0000 Subject: Fixed documentation and prepared for release of 0.12 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1216 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/assertions.rb | 18 +++++++++--------- .../vendor/html-scanner/html/document.rb | 4 ++-- .../action_controller/vendor/html-scanner/html/node.rb | 10 +++++----- .../vendor/html-scanner/html/tokenizer.rb | 4 ++-- .../vendor/html-scanner/html/version.rb | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index 0c1ca76e19..53d53af400 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -134,15 +134,15 @@ module Test #:nodoc: # must meet the criteria described by the hash. # * :children: a hash, for counting children of a node. Accepts # the keys: - # ** :count: either a number or a range which must equal (or - # include) the number of children that match. - # ** :less_than: the number of matching children must be less - # than this number. - # ** :greater_than: the number of matching children must be - # greater than this number. - # ** :only: another hash consisting of the keys to use - # to match on the children, and only matching children will be - # counted. + # * :count: either a number or a range which must equal (or + # include) the number of children that match. + # * :less_than: the number of matching children must be less + # than this number. + # * :greater_than: the number of matching children must be + # greater than this number. + # * :only: another hash consisting of the keys to use + # to match on the children, and only matching children will be + # counted. # * :content: (text nodes only). The content of the node must # match the given value. # diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb index a196bdea44..e14d9de166 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb @@ -1,11 +1,11 @@ require 'html/tokenizer' require 'html/node' -module HTML +module HTML#:nodoc: # A top-level HTMl document. You give it a body of text, and it will parse that # text into a tree of nodes. - class Document + class Document #:nodoc: # The root of the parsed document. attr_reader :root diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb index 018309a9f9..b3979fa3cb 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb @@ -1,8 +1,8 @@ require 'strscan' -module HTML +module HTML#:nodoc: - class Conditions < Hash + class Conditions < Hash#:nodoc: def initialize(hash) super() hash = { :content => hash } unless Hash === hash @@ -53,7 +53,7 @@ module HTML end # The base class of all nodes, textual and otherwise, in an HTML document. - class Node + class Node#:nodoc: # The array of children of this node. Not all nodes have children. attr_reader :children @@ -167,7 +167,7 @@ module HTML end # A node that represents text, rather than markup. - class Text < Node + class Text < Node#:nodoc: attr_reader :content @@ -223,7 +223,7 @@ module HTML # A Tag is any node that represents markup. It may be an opening tag, a # closing tag, or a self-closing tag. It has a name, and may have a hash of # attributes. - class Tag < Node + class Tag < Node#:nodoc: # Either +nil+, :close, or :self attr_reader :closing diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb index 11bd48708e..2c3ee922d9 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb @@ -1,6 +1,6 @@ require 'strscan' -module HTML +module HTML#:nodoc: # A simple HTML tokenizer. It simply breaks a stream of text into tokens, where each # token is a string. Each string represents either "text", or an HTML element. @@ -13,7 +13,7 @@ module HTML # while token = tokenizer.next # p token # end - class Tokenizer + class Tokenizer#:nodoc: # The current (byte) position in the text attr_reader :position diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb index 90025fa57f..761ea40294 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb @@ -1,5 +1,5 @@ -module HTML - module Version +module HTML#:nodoc: + module Version#:nodoc: MAJOR = 0 MINOR = 5 -- cgit v1.2.3