add NodeName and OuterHtml utility functions

return error if response`s request is nil on NewDocumentFromResponse
make AttrOr return default value if selection is empty
2024-04-21 12:31:36 +00:00 · 2016-02-02 12:28:50 -05:00 · 2015-09-27 16:28:20 -04:00 · 2015-06-05 22:16:32 -04:00 · 2015-04-20 19:20:24 -04:00 · 2015-04-20 19:17:32 -04:00
25 changed files with 2181 additions and 374 deletions
@@ -3,4 +3,5 @@ language: go
 go:
    - 1.1
    - 1.2
+    - 1.3
    - tip
@@ -4,11 +4,9 @@

 [![GoDoc](https://godoc.org/github.com/PuerkitoBio/goquery?status.png)](http://godoc.org/github.com/PuerkitoBio/goquery)

-GoQuery brings a syntax and a set of features similar to [jQuery][] to the [Go language][go]. It is based on Go's [net/html package][html] and the CSS Selector library [cascadia][]. Since the net/html parser returns tokens (nodes), and not a full-featured DOM object, jQuery's manipulation and modification functions have been left off (no point in modifying data in the parsed tree of the HTML, it has no effect).
+goquery brings a syntax and a set of features similar to [jQuery][] to the [Go language][go]. It is based on Go's [net/html package][html] and the CSS Selector library [cascadia][]. Since the net/html parser returns nodes, and not a full-featured DOM tree, jQuery's stateful manipulation functions (like height(), css(), detach()) have been left off.

-Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML.
-
-Supported functions are query-oriented features (`hasClass()`, `attr()` and the likes), as well as traversing functions that make sense given what we have to work with. This makes GoQuery a great library for scraping web pages.
+Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML. See the [wiki][] for various options to do this.

 Syntax-wise, it is as close as possible to jQuery, with the same function names when possible, and that warm and fuzzy chainable interface. jQuery being the ultra-popular library that it is, I felt that writing a similar HTML-manipulating library was better to follow its API than to start anew (in the same spirit as Go's `fmt` package), even though some of its methods are less than intuitive (looking at you, [index()][index]...).

@@ -32,6 +30,12 @@ Please note that because of the net/html dependency, goquery requires Go1.1+.

 **Note that goquery's API is now stable, and will not break.**

+*    **2016-02-02** : Add `NodeName` utility function similar to the DOM's `nodeName` property. It returns the tag name of the first element in a selection, and other relevant values of non-element nodes (see godoc for details). Add `OuterHtml` utility function similar to the DOM's `outerHTML` property (named `OuterHtml` in small caps for consistency with the existing `Html` method on the `Selection`).
+*    **2015-04-20** : Add `AttrOr` helper method to return the attribute's value or a default value if absent. Thanks to [piotrkowalczuk][piotr].
+*    **2015-02-04** : Add more manipulation functions - Prepend* - thanks again to [Andrew Stone][thatguystone].
+*    **2014-11-28** : Add more manipulation functions - ReplaceWith*, Wrap* and Unwrap - thanks again to [Andrew Stone][thatguystone].
+*    **2014-11-07** : Add manipulation functions (thanks to [Andrew Stone][thatguystone]) and `*Matcher` functions, that receive compiled cascadia selectors instead of selector strings, thus avoiding potential panics thrown by goquery via `cascadia.MustCompile` calls. This results in better performance (selectors can be compiled once and reused) and more idiomatic error handling (you can handle cascadia's compilation errors, instead of recovering from panics, which had been bugging me for a long time). Note that the actual type expected is a `Matcher` interface, that `cascadia.Selector` implements. Other matcher implementations could be used.
+*    **2014-11-06** : Change import paths of net/html to golang.org/x/net/html (see https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA). Make sure to update your code to use the new import path too when you call goquery with `html.Node`s.
 *    **v0.3.2** : Add `NewDocumentFromReader()` (thanks jweir) which allows creating a goquery document from an io.Reader.
 *    **v0.3.1** : Add `NewDocumentFromResponse()` (thanks assassingj) which allows creating a goquery document from an http response.
 *    **v0.3.0** : Add `EachWithBreak()` which allows to break out of an `Each()` loop by returning false. This function was added instead of changing the existing `Each()` to avoid breaking compatibility.
@@ -42,19 +46,22 @@ Please note that because of the net/html dependency, goquery requires Go1.1+.

 ## API

-GoQuery exposes two classes, `Document` and `Selection`. Unlike jQuery, which is loaded as part of a DOM document, and thus acts on its containing document, GoQuery doesn't know which HTML document to act upon. So it needs to be told, and that's what the `Document` class is for. It holds the root document node as the initial Selection object to manipulate.
+goquery exposes two structs, `Document` and `Selection`, and the `Matcher` interface. Unlike jQuery, which is loaded as part of a DOM document, and thus acts on its containing document, goquery doesn't know which HTML document to act upon. So it needs to be told, and that's what the `Document` type is for. It holds the root document node as the initial Selection value to manipulate.

-jQuery often has many variants for the same function (no argument, a selector string argument, a jQuery object argument, a DOM element argument, ...). Instead of exposing the same features in GoQuery as a single method with variadic empty interface arguments, I use statically-typed signatures following this naming convention:
+jQuery often has many variants for the same function (no argument, a selector string argument, a jQuery object argument, a DOM element argument, ...). Instead of exposing the same features in goquery as a single method with variadic empty interface arguments, statically-typed signatures are used following this naming convention:

 *    When the jQuery equivalent can be called with no argument, it has the same name as jQuery for the no argument signature (e.g.: `Prev()`), and the version with a selector string argument is called `XxxFiltered()` (e.g.: `PrevFiltered()`)
 *    When the jQuery equivalent **requires** one argument, the same name as jQuery is used for the selector string version (e.g.: `Is()`)
-*    The signatures accepting a jQuery object as argument are defined in GoQuery as `XxxSelection()` and take a `*Selection` object as argument (e.g.: `FilterSelection()`)
-*    The signatures accepting a DOM element as argument in jQuery are defined in GoQuery as `XxxNodes()` and take a variadic argument of type `*html.Node` (e.g.: `FilterNodes()`)
-*    Finally, the signatures accepting a function as argument in jQuery are defined in GoQuery as `XxxFunction()` and take a function as argument (e.g.: `FilterFunction()`)
+*    The signatures accepting a jQuery object as argument are defined in goquery as `XxxSelection()` and take a `*Selection` object as argument (e.g.: `FilterSelection()`)
+*    The signatures accepting a DOM element as argument in jQuery are defined in goquery as `XxxNodes()` and take a variadic argument of type `*html.Node` (e.g.: `FilterNodes()`)
+*    The signatures accepting a function as argument in jQuery are defined in goquery as `XxxFunction()` and take a function as argument (e.g.: `FilterFunction()`)
+*    The goquery methods that can be called with a selector string have a corresponding version that take a `Matcher` interface and are defined as `XxxMatcher()` (e.g.: `IsMatcher()`)

-GoQuery's complete [godoc reference documentation can be found here][doc].
+Utility functions that are not in jQuery but are useful in Go are implemented as functions (that take a `*Selection` as parameter), to avoid a potential naming clash on the `*Selection`'s methods (reserved for jQuery-equivalent behaviour).

-Please note that Cascadia's selectors do NOT necessarily match all supported selectors of jQuery (Sizzle). See the [cascadia project][cascadia] for details.
+The complete [godoc reference documentation can be found here][doc].
+
+Please note that Cascadia's selectors do not necessarily match all supported selectors of jQuery (Sizzle). See the [cascadia project][cascadia] for details.

 ## Examples

@@ -96,12 +103,14 @@ The [BSD 3-Clause license][bsd], the same as the [Go language][golic]. Cascadia'

 [jquery]: http://jquery.com/
 [go]: http://golang.org/
-[cascadia]: http://code.google.com/p/cascadia/
+[cascadia]: https://github.com/andybalholm/cascadia
 [bsd]: http://opensource.org/licenses/BSD-3-Clause
 [golic]: http://golang.org/LICENSE
-[caslic]: http://code.google.com/p/cascadia/source/browse/LICENSE
+[caslic]: https://github.com/andybalholm/cascadia/blob/master/LICENSE
 [doc]: http://godoc.org/github.com/PuerkitoBio/goquery
 [index]: http://api.jquery.com/index/
-[gonet]: http://code.google.com/p/go/source/detail?r=f7f5159120f51ba0070774d3c5907969b5fe7858&repo=net
-[html]: http://godoc.org/code.google.com/p/go.net/html
+[gonet]: https://github.com/golang/net/
+[html]: http://godoc.org/golang.org/x/net/html
 [wiki]: https://github.com/PuerkitoBio/goquery/wiki/Tips-and-tricks
+[thatguystone]: https://github.com/thatguystone
+[piotr]: https://github.com/piotrkowalczuk
@@ -36,7 +36,7 @@ func (s *Selection) Eq(index int) *Selection {

 // Slice reduces the set of matched elements to a subset specified by a range
 // of indices.
-func (s *Selection) Slice(start int, end int) *Selection {
+func (s *Selection) Slice(start, end int) *Selection {
 	if start < 0 {
 		start += len(s.Nodes)
 	}
@@ -76,6 +76,17 @@ func (s *Selection) IndexSelector(selector string) int {
 	return -1
 }

+// IndexMatcher returns the position of the first element within the
+// Selection object relative to the elements matched by the matcher, or -1 if
+// not found.
+func (s *Selection) IndexMatcher(m Matcher) int {
+	if len(s.Nodes) > 0 {
+		sel := s.document.FindMatcher(m)
+		return indexInSlice(sel.Nodes, s.Nodes[0])
+	}
+	return -1
+}
+
 // IndexOfNode returns the position of the specified node within the Selection
 // object, or -1 if not found.
 func (s *Selection) IndexOfNode(node *html.Node) int {
@@ -6,23 +6,23 @@ import (

 func TestFirst(t *testing.T) {
 	sel := Doc().Find(".pvk-content").First()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestFirstEmpty(t *testing.T) {
 	sel := Doc().Find(".pvk-zzcontentzz").First()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestFirstRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.First().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestLast(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Last()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)

 	// Should contain Footer
 	foot := Doc().Find(".footer")
@@ -33,23 +33,23 @@ func TestLast(t *testing.T) {

 func TestLastEmpty(t *testing.T) {
 	sel := Doc().Find(".pvk-zzcontentzz").Last()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestLastRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Last().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestEq(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Eq(1)
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestEqNegative(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Eq(-1)
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)

 	// Should contain Footer
 	foot := Doc().Find(".footer")
@@ -60,65 +60,65 @@ func TestEqNegative(t *testing.T) {

 func TestEqEmpty(t *testing.T) {
 	sel := Doc().Find("something_random_that_does_not_exists").Eq(0)
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestEqInvalidPositive(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Eq(3)
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestEqInvalidNegative(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Eq(-4)
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestEqRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Eq(1).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestSlice(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Slice(0, 2)

-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestSliceOutOfBounds(t *testing.T) {
-	defer AssertPanic(t)
+	defer assertPanic(t)
 	Doc().Find(".pvk-content").Slice(2, 12)
 }

 func TestNegativeSliceStart(t *testing.T) {
 	sel := Doc().Find(".container-fluid").Slice(-2, 3)
-	AssertLength(t, sel.Nodes, 1)
-	AssertSelectionIs(t, sel.Eq(0), "#cf3")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel.Eq(0), "#cf3")
 }

 func TestNegativeSliceEnd(t *testing.T) {
 	sel := Doc().Find(".container-fluid").Slice(1, -1)
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel.Eq(0), "#cf2")
-	AssertSelectionIs(t, sel.Eq(1), "#cf3")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel.Eq(0), "#cf2")
+	assertSelectionIs(t, sel.Eq(1), "#cf3")
 }

 func TestNegativeSliceBoth(t *testing.T) {
 	sel := Doc().Find(".container-fluid").Slice(-3, -1)
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel.Eq(0), "#cf2")
-	AssertSelectionIs(t, sel.Eq(1), "#cf3")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel.Eq(0), "#cf2")
+	assertSelectionIs(t, sel.Eq(1), "#cf3")
 }

 func TestNegativeSliceOutOfBounds(t *testing.T) {
-	defer AssertPanic(t)
+	defer assertPanic(t)
 	Doc().Find(".container-fluid").Slice(-12, -7)
 }

 func TestSliceRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Slice(0, 2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestGet(t *testing.T) {
@@ -138,7 +138,7 @@ func TestGetNegative(t *testing.T) {
 }

 func TestGetInvalid(t *testing.T) {
-	defer AssertPanic(t)
+	defer assertPanic(t)
 	sel := Doc().Find(".pvk-content")
 	sel.Get(129)
 }
@@ -12,7 +12,7 @@ func BenchmarkMetalReviewExample(b *testing.B) {
 	var buf bytes.Buffer

 	b.StopTimer()
-	doc := LoadDoc("metalreview.html")
+	doc := loadDoc("metalreview.html")
 	b.StartTimer()
 	for i := 0; i < b.N; i++ {
 		doc.Find(".slider-row:nth-child(1) .slider-item").Each(func(i int, s *Selection) {
@@ -25,22 +25,19 @@
 Package goquery implements features similar to jQuery, including the chainable
 syntax, to manipulate and query an HTML document.

-GoQuery brings a syntax and a set of features similar to jQuery to the Go language.
-It is based on Go's net/html package and the CSS Selector library cascadia. Since
-the net/html parser returns tokens (nodes), and not a full-featured DOM object,
-jQuery's manipulation and modification functions have been left off (no point in
-modifying data in the parsed tree of the HTML, it has no effect).
+It brings a syntax and a set of features similar to jQuery to the Go language.
+It is based on Go's net/html package and the CSS Selector library cascadia.
+Since the net/html parser returns nodes, and not a full-featured DOM
+tree, jQuery's stateful manipulation functions (like height(), css(), detach())
+have been left off.

 Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is
 the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML.
+See the repository's wiki for various options on how to do this.

-Supported functions are query-oriented features (`hasClass()`, `attr()` and the likes),
-as well as traversing functions that make sense given what we have to work with.
-This makes GoQuery a great library for scraping web pages.
-
-Syntax-wise, it is as close as possible to jQuery, with the same function names when
+Syntax-wise, it is as close as possible to jQuery, with the same method names when
 possible, and that warm and fuzzy chainable interface. jQuery being the
-ultra-popular library that it is, I felt that writing a similar HTML-manipulating
+ultra-popular library that it is, writing a similar HTML-manipulating
 library was better to follow its API than to start anew (in the same spirit as
 Go's fmt package), even though some of its methods are less than intuitive (looking
 at you, index()...).
@@ -50,7 +47,8 @@ file: https://github.com/puerkitobio/goquery

 Please note that because of the net/html dependency, goquery requires Go1.1+.

-The various methods are split into files based on the category of behavior:
+The various methods are split into files based on the category of behavior.
+The three dots (...) indicate that various "overloads" are available.

 * array.go : array-like positional manipulation of the selection.
    - Eq()
@@ -77,8 +75,23 @@ The various methods are split into files based on the category of behavior:
    - EachWithBreak()
    - Map()

+* manipulation.go : methods for modifying the document
+    - After...()
+    - Append...()
+    - Before...()
+    - Clone()
+    - Empty()
+    - Prepend...()
+    - Remove...()
+    - ReplaceWith...()
+    - Unwrap()
+    - Wrap...()
+    - WrapAll...()
+    - WrapInner...()
+
 * property.go : methods that inspect and get the node's properties values.
-    - Attr()
+    - Attr*(), RemoveAttr(), SetAttr()
+    - AddClass(), HasClass(), RemoveClass(), ToggleClass()
    - Html()
    - Length()
    - Size(), which is an alias for Length()
@@ -86,7 +99,6 @@ The various methods are split into files based on the category of behavior:

 * query.go : methods that query, or reflect, a node's identity.
    - Contains()
-    - HasClass()
    - Is...()

 * traversal.go : methods to traverse the HTML document tree.
@@ -98,8 +110,14 @@ The various methods are split into files based on the category of behavior:
    - Prev...()
    - Siblings...()

-* type.go : definition of the types exposed by GoQuery.
+* type.go : definition of the types exposed by goquery.
    - Document
    - Selection
+    - Matcher
+
+* utilities.go : definition of helper functions (and not methods on a *Selection)
+that are not part of jQuery, but are useful to goquery.
+    - NodeName
+    - OuterHtml
 */
 package goquery
@@ -1,6 +1,7 @@
 package goquery

 import (
+	"github.com/andybalholm/cascadia"
 	"golang.org/x/net/html"
 )

@@ -9,7 +10,15 @@ import (
 // The selector string is run in the context of the document of the current
 // Selection object.
 func (s *Selection) Add(selector string) *Selection {
-	return s.AddNodes(findWithSelector([]*html.Node{s.document.rootNode}, selector)...)
+	return s.AddNodes(findWithMatcher([]*html.Node{s.document.rootNode}, cascadia.MustCompile(selector))...)
+}
+
+// AddMatcher adds the matcher's matching nodes to those in the current
+// selection and returns a new Selection object.
+// The matcher is run in the context of the document of the current
+// Selection object.
+func (s *Selection) AddMatcher(m Matcher) *Selection {
+	return s.AddNodes(findWithMatcher([]*html.Node{s.document.rootNode}, m)...)
 }

 // AddSelection adds the specified Selection object's nodes to those in the
@@ -6,63 +6,63 @@ import (

 func TestAdd(t *testing.T) {
 	sel := Doc().Find("div.row-fluid").Add("a")
-	AssertLength(t, sel.Nodes, 19)
+	assertLength(t, sel.Nodes, 19)
 }

 func TestAddRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Add("a").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestAddSelection(t *testing.T) {
 	sel := Doc().Find("div.row-fluid")
 	sel2 := Doc().Find("a")
 	sel = sel.AddSelection(sel2)
-	AssertLength(t, sel.Nodes, 19)
+	assertLength(t, sel.Nodes, 19)
 }

 func TestAddSelectionNil(t *testing.T) {
 	sel := Doc().Find("div.row-fluid")
-	AssertLength(t, sel.Nodes, 9)
+	assertLength(t, sel.Nodes, 9)

 	sel = sel.AddSelection(nil)
-	AssertLength(t, sel.Nodes, 9)
+	assertLength(t, sel.Nodes, 9)
 }

 func TestAddSelectionRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Find("a")
 	sel2 = sel.AddSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestAddNodes(t *testing.T) {
 	sel := Doc().Find("div.pvk-gutter")
 	sel2 := Doc().Find(".pvk-content")
 	sel = sel.AddNodes(sel2.Nodes...)
-	AssertLength(t, sel.Nodes, 9)
+	assertLength(t, sel.Nodes, 9)
 }

 func TestAddNodesNone(t *testing.T) {
 	sel := Doc().Find("div.pvk-gutter").AddNodes()
-	AssertLength(t, sel.Nodes, 6)
+	assertLength(t, sel.Nodes, 6)
 }

 func TestAddNodesRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Find("a")
 	sel2 = sel.AddNodes(sel2.Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestAndSelf(t *testing.T) {
 	sel := Doc().Find(".span12").Last().AndSelf()
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestAndSelfRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Find("a").AndSelf().End().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }
@@ -1,20 +1,33 @@
 package goquery

 import (
-	"code.google.com/p/cascadia"
+	"github.com/andybalholm/cascadia"
 	"golang.org/x/net/html"
 )

 // Filter reduces the set of matched elements to those that match the selector string.
 // It returns a new Selection object for this subset of matching elements.
 func (s *Selection) Filter(selector string) *Selection {
-	return pushStack(s, winnow(s, selector, true))
+	return s.FilterMatcher(cascadia.MustCompile(selector))
+}
+
+// FilterMatcher reduces the set of matched elements to those that match
+// the given matcher.
+// It returns a new Selection object for this subset of matching elements.
+func (s *Selection) FilterMatcher(m Matcher) *Selection {
+	return pushStack(s, winnow(s, m, true))
 }

 // Not removes elements from the Selection that match the selector string.
 // It returns a new Selection object with the matching elements removed.
 func (s *Selection) Not(selector string) *Selection {
-	return pushStack(s, winnow(s, selector, false))
+	return s.NotMatcher(cascadia.MustCompile(selector))
+}
+
+// NotMatcher removes elements from the Selection that match the given matcher.
+// It returns a new Selection object with the matching elements removed.
+func (s *Selection) NotMatcher(m Matcher) *Selection {
+	return pushStack(s, winnow(s, m, false))
 }

 // FilterFunction reduces the set of matched elements to those that pass the function's test.
@@ -72,6 +85,13 @@ func (s *Selection) Has(selector string) *Selection {
 	return s.HasSelection(s.document.Find(selector))
 }

+// HasMatcher reduces the set of matched elements to those that have a descendant
+// that matches the matcher.
+// It returns a new Selection object with the matching elements.
+func (s *Selection) HasMatcher(m Matcher) *Selection {
+	return s.HasSelection(s.document.FindMatcher(m))
+}
+
 // HasNodes reduces the set of matched elements to those that have a
 // descendant that matches one of the nodes.
 // It returns a new Selection object with the matching elements.
@@ -106,18 +126,16 @@ func (s *Selection) End() *Selection {
 	return newEmptySelection(s.document)
 }

-// Filter based on a selector string, and the indicator to keep (Filter) or
+// Filter based on the matcher, and the indicator to keep (Filter) or
 // to get rid of (Not) the matching elements.
-func winnow(sel *Selection, selector string, keep bool) []*html.Node {
-	cs := cascadia.MustCompile(selector)
-
+func winnow(sel *Selection, m Matcher, keep bool) []*html.Node {
 	// Optimize if keep is requested
 	if keep {
-		return cs.Filter(sel.Nodes)
+		return m.Filter(sel.Nodes)
 	}
 	// Use grep
 	return grep(sel, func(i int, s *Selection) bool {
-		return !cs.Match(s.Get(0))
+		return !m.Match(s.Get(0))
 	})
 }

@@ -6,25 +6,25 @@ import (

 func TestFilter(t *testing.T) {
 	sel := Doc().Find(".span12").Filter(".alert")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestFilterNone(t *testing.T) {
 	sel := Doc().Find(".span12").Filter(".zzalert")
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestFilterRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Filter(".alert").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestFilterFunction(t *testing.T) {
 	sel := Doc().Find(".pvk-content").FilterFunction(func(i int, s *Selection) bool {
 		return i > 0
 	})
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestFilterFunctionRollback(t *testing.T) {
@@ -32,33 +32,33 @@ func TestFilterFunctionRollback(t *testing.T) {
 	sel2 := sel.FilterFunction(func(i int, s *Selection) bool {
 		return i > 0
 	}).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestFilterNode(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.FilterNodes(sel.Nodes[2])
-	AssertLength(t, sel2.Nodes, 1)
+	assertLength(t, sel2.Nodes, 1)
 }

 func TestFilterNodeRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.FilterNodes(sel.Nodes[2]).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestFilterSelection(t *testing.T) {
 	sel := Doc().Find(".link")
 	sel2 := Doc().Find("a[ng-click]")
 	sel3 := sel.FilterSelection(sel2)
-	AssertLength(t, sel3.Nodes, 1)
+	assertLength(t, sel3.Nodes, 1)
 }

 func TestFilterSelectionRollback(t *testing.T) {
 	sel := Doc().Find(".link")
 	sel2 := Doc().Find("a[ng-click]")
 	sel2 = sel.FilterSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestFilterSelectionNil(t *testing.T) {
@@ -66,30 +66,30 @@ func TestFilterSelectionNil(t *testing.T) {

 	sel := Doc().Find(".link")
 	sel3 := sel.FilterSelection(sel2)
-	AssertLength(t, sel3.Nodes, 0)
+	assertLength(t, sel3.Nodes, 0)
 }

 func TestNot(t *testing.T) {
 	sel := Doc().Find(".span12").Not(".alert")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestNotRollback(t *testing.T) {
 	sel := Doc().Find(".span12")
 	sel2 := sel.Not(".alert").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNotNone(t *testing.T) {
 	sel := Doc().Find(".span12").Not(".zzalert")
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestNotFunction(t *testing.T) {
 	sel := Doc().Find(".pvk-content").NotFunction(func(i int, s *Selection) bool {
 		return i > 0
 	})
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestNotFunctionRollback(t *testing.T) {
@@ -97,65 +97,65 @@ func TestNotFunctionRollback(t *testing.T) {
 	sel2 := sel.NotFunction(func(i int, s *Selection) bool {
 		return i > 0
 	}).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNotNode(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.NotNodes(sel.Nodes[2])
-	AssertLength(t, sel2.Nodes, 2)
+	assertLength(t, sel2.Nodes, 2)
 }

 func TestNotNodeRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.NotNodes(sel.Nodes[2]).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNotSelection(t *testing.T) {
 	sel := Doc().Find(".link")
 	sel2 := Doc().Find("a[ng-click]")
 	sel3 := sel.NotSelection(sel2)
-	AssertLength(t, sel3.Nodes, 6)
+	assertLength(t, sel3.Nodes, 6)
 }

 func TestNotSelectionRollback(t *testing.T) {
 	sel := Doc().Find(".link")
 	sel2 := Doc().Find("a[ng-click]")
 	sel2 = sel.NotSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestIntersection(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter")
 	sel2 := Doc().Find("div").Intersection(sel)
-	AssertLength(t, sel2.Nodes, 6)
+	assertLength(t, sel2.Nodes, 6)
 }

 func TestIntersectionRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter")
 	sel2 := Doc().Find("div")
 	sel2 = sel.Intersection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestHas(t *testing.T) {
 	sel := Doc().Find(".container-fluid").Has(".center-content")
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 	// Has() returns the high-level .container-fluid div, and the one that is the immediate parent of center-content
 }

 func TestHasRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.Has(".center-content").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestHasNodes(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".center-content")
 	sel = sel.HasNodes(sel2.Nodes...)
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 	// Has() returns the high-level .container-fluid div, and the one that is the immediate parent of center-content
 }

@@ -163,29 +163,29 @@ func TestHasNodesRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".center-content")
 	sel2 = sel.HasNodes(sel2.Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestHasSelection(t *testing.T) {
 	sel := Doc().Find("p")
 	sel2 := Doc().Find("small")
 	sel = sel.HasSelection(sel2)
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestHasSelectionRollback(t *testing.T) {
 	sel := Doc().Find("p")
 	sel2 := Doc().Find("small")
 	sel2 = sel.HasSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestEnd(t *testing.T) {
 	sel := Doc().Find("p").Has("small").End()
-	AssertLength(t, sel.Nodes, 4)
+	assertLength(t, sel.Nodes, 4)
 }

 func TestEndToTop(t *testing.T) {
 	sel := Doc().Find("p").Has("small").End().End().End()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }
@@ -17,7 +17,7 @@ func TestEach(t *testing.T) {
 	if cnt != 4 {
 		t.Errorf("Expected Each() to call function 4 times, got %v times.", cnt)
 	}
-	AssertLength(t, sel.Nodes, 6)
+	assertLength(t, sel.Nodes, 6)
 }

 func TestEachWithBreak(t *testing.T) {
@@ -32,7 +32,7 @@ func TestEachWithBreak(t *testing.T) {
 	if cnt != 1 {
 		t.Errorf("Expected Each() to call function 1 time, got %v times.", cnt)
 	}
-	AssertLength(t, sel.Nodes, 6)
+	assertLength(t, sel.Nodes, 6)
 }

 func TestEachEmptySelection(t *testing.T) {
@@ -46,7 +46,7 @@ func TestEachEmptySelection(t *testing.T) {
 		t.Error("Expected Each() to not be called on empty Selection.")
 	}
 	sel2 := sel.Find("div")
-	AssertLength(t, sel2.Nodes, 0)
+	assertLength(t, sel2.Nodes, 0)
 }

 func TestMap(t *testing.T) {
@@ -0,0 +1,551 @@
+package goquery
+
+import (
+	"strings"
+
+	"github.com/andybalholm/cascadia"
+	"golang.org/x/net/html"
+)
+
+// After applies the selector from the root document and inserts the matched elements
+// after the elements in the set of matched elements.
+//
+// If one of the matched elements in the selection is not currently in the
+// document, it's impossible to insert nodes after it, so it will be ignored.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) After(selector string) *Selection {
+	return s.AfterMatcher(cascadia.MustCompile(selector))
+}
+
+// AfterMatcher applies the matcher from the root document and inserts the matched elements
+// after the elements in the set of matched elements.
+//
+// If one of the matched elements in the selection is not currently in the
+// document, it's impossible to insert nodes after it, so it will be ignored.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterMatcher(m Matcher) *Selection {
+	return s.AfterNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// AfterSelection inserts the elements in the selection after each element in the set of matched
+// elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterSelection(sel *Selection) *Selection {
+	return s.AfterNodes(sel.Nodes...)
+}
+
+// AfterHtml parses the html and inserts it after the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterHtml(html string) *Selection {
+	return s.AfterNodes(parseHtml(html)...)
+}
+
+// AfterNodes inserts the nodes after each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, true, func(sn *html.Node, n *html.Node) {
+		if sn.Parent != nil {
+			sn.Parent.InsertBefore(n, sn.NextSibling)
+		}
+	})
+}
+
+// Append appends the elements specified by the selector to the end of each element
+// in the set of matched elements, following those rules:
+//
+// 1) The selector is applied to the root document.
+//
+// 2) Elements that are part of the document will be moved to the new location.
+//
+// 3) If there are multiple locations to append to, cloned nodes will be
+// appended to all target locations except the last one, which will be moved
+// as noted in (2).
+func (s *Selection) Append(selector string) *Selection {
+	return s.AppendMatcher(cascadia.MustCompile(selector))
+}
+
+// AppendMatcher appends the elements specified by the matcher to the end of each element
+// in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AppendMatcher(m Matcher) *Selection {
+	return s.AppendNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// AppendSelection appends the elements in the selection to the end of each element
+// in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AppendSelection(sel *Selection) *Selection {
+	return s.AppendNodes(sel.Nodes...)
+}
+
+// AppendHtml parses the html and appends it to the set of matched elements.
+func (s *Selection) AppendHtml(html string) *Selection {
+	return s.AppendNodes(parseHtml(html)...)
+}
+
+// AppendNodes appends the specified nodes to each node in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AppendNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, false, func(sn *html.Node, n *html.Node) {
+		sn.AppendChild(n)
+	})
+}
+
+// Before inserts the matched elements before each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) Before(selector string) *Selection {
+	return s.BeforeMatcher(cascadia.MustCompile(selector))
+}
+
+// BeforeMatcher inserts the matched elements before each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeMatcher(m Matcher) *Selection {
+	return s.BeforeNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// BeforeSelection inserts the elements in the selection before each element in the set of matched
+// elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeSelection(sel *Selection) *Selection {
+	return s.BeforeNodes(sel.Nodes...)
+}
+
+// BeforeHtml parses the html and inserts it before the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeHtml(html string) *Selection {
+	return s.BeforeNodes(parseHtml(html)...)
+}
+
+// BeforeNodes inserts the nodes before each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, false, func(sn *html.Node, n *html.Node) {
+		if sn.Parent != nil {
+			sn.Parent.InsertBefore(n, sn)
+		}
+	})
+}
+
+// Clone creates a deep copy of the set of matched nodes. The new nodes will not be
+// attached to the document.
+func (s *Selection) Clone() *Selection {
+	ns := newEmptySelection(s.document)
+	ns.Nodes = cloneNodes(s.Nodes)
+	return ns
+}
+
+// Empty removes all children nodes from the set of matched elements.
+// It returns the children nodes in a new Selection.
+func (s *Selection) Empty() *Selection {
+	var nodes []*html.Node
+
+	for _, n := range s.Nodes {
+		for c := n.FirstChild; c != nil; c = n.FirstChild {
+			n.RemoveChild(c)
+			nodes = append(nodes, c)
+		}
+	}
+
+	return pushStack(s, nodes)
+}
+
+// Prepend prepends the elements specified by the selector to each element in
+// the set of matched elements, following the same rules as Append.
+func (s *Selection) Prepend(selector string) *Selection {
+	return s.PrependMatcher(cascadia.MustCompile(selector))
+}
+
+// PrependMatcher prepends the elements specified by the matcher to each
+// element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) PrependMatcher(m Matcher) *Selection {
+	return s.PrependNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// PrependSelection prepends the elements in the selection to each element in
+// the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) PrependSelection(sel *Selection) *Selection {
+	return s.PrependNodes(sel.Nodes...)
+}
+
+// PrependHtml parses the html and prepends it to the set of matched elements.
+func (s *Selection) PrependHtml(html string) *Selection {
+	return s.PrependNodes(parseHtml(html)...)
+}
+
+// PrependNodes prepends the specified nodes to each node in the set of
+// matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) PrependNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, true, func(sn *html.Node, n *html.Node) {
+		// sn.FirstChild may be nil, in which case this functions like
+		// sn.AppendChild()
+		sn.InsertBefore(n, sn.FirstChild)
+	})
+}
+
+// Remove removes the set of matched elements from the document.
+// It returns the same selection, now consisting of nodes not in the document.
+func (s *Selection) Remove() *Selection {
+	for _, n := range s.Nodes {
+		if n.Parent != nil {
+			n.Parent.RemoveChild(n)
+		}
+	}
+
+	return s
+}
+
+// RemoveFiltered removes the set of matched elements by selector.
+// It returns the Selection of removed nodes.
+func (s *Selection) RemoveFiltered(selector string) *Selection {
+	return s.RemoveMatcher(cascadia.MustCompile(selector))
+}
+
+// RemoveMatcher removes the set of matched elements.
+// It returns the Selection of removed nodes.
+func (s *Selection) RemoveMatcher(m Matcher) *Selection {
+	return s.FilterMatcher(m).Remove()
+}
+
+// ReplaceWith replaces each element in the set of matched elements with the
+// nodes matched by the given selector.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWith(selector string) *Selection {
+	return s.ReplaceWithMatcher(cascadia.MustCompile(selector))
+}
+
+// ReplaceWithMatcher replaces each element in the set of matched elements with
+// the nodes matched by the given Matcher.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithMatcher(m Matcher) *Selection {
+	return s.ReplaceWithNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// ReplaceWithSelection replaces each element in the set of matched elements with
+// the nodes from the given Selection.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithSelection(sel *Selection) *Selection {
+	return s.ReplaceWithNodes(sel.Nodes...)
+}
+
+// ReplaceWithHtml replaces each element in the set of matched elements with
+// the parsed HTML.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithHtml(html string) *Selection {
+	return s.ReplaceWithNodes(parseHtml(html)...)
+}
+
+// ReplaceWithNodes replaces each element in the set of matched elements with
+// the given nodes.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithNodes(ns ...*html.Node) *Selection {
+	s.AfterNodes(ns...)
+	return s.Remove()
+}
+
+// Unwrap removes the parents of the set of matched elements, leaving the matched
+// elements (and their siblings, if any) in their place.
+// It returns the original selection.
+func (s *Selection) Unwrap() *Selection {
+	s.Parent().Each(func(i int, ss *Selection) {
+		// For some reason, jquery allows unwrap to remove the <head> element, so
+		// allowing it here too. Same for <html>. Why it allows those elements to
+		// be unwrapped while not allowing body is a mystery to me.
+		if ss.Nodes[0].Data != "body" {
+			ss.ReplaceWithSelection(ss.Contents())
+		}
+	})
+
+	return s
+}
+
+// Wrap wraps each element in the set of matched elements inside the first
+// element matched by the given selector. The matched child is cloned before
+// being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) Wrap(selector string) *Selection {
+	return s.WrapMatcher(cascadia.MustCompile(selector))
+}
+
+// WrapMatcher wraps each element in the set of matched elements inside the
+// first element matched by the given matcher. The matched child is cloned
+// before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapMatcher(m Matcher) *Selection {
+	return s.wrapNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// WrapSelection wraps each element in the set of matched elements inside the
+// first element in the given Selection. The element is cloned before being
+// inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapSelection(sel *Selection) *Selection {
+	return s.wrapNodes(sel.Nodes...)
+}
+
+// WrapHtml wraps each element in the set of matched elements inside the inner-
+// most child of the given HTML.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapHtml(html string) *Selection {
+	return s.wrapNodes(parseHtml(html)...)
+}
+
+// WrapNode wraps each element in the set of matched elements inside the inner-
+// most child of the given node. The given node is copied before being inserted
+// into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapNode(n *html.Node) *Selection {
+	return s.wrapNodes(n)
+}
+
+func (s *Selection) wrapNodes(ns ...*html.Node) *Selection {
+	s.Each(func(i int, ss *Selection) {
+		ss.wrapAllNodes(ns...)
+	})
+
+	return s
+}
+
+// WrapAll wraps a single HTML structure, matched by the given selector, around
+// all elements in the set of matched elements. The matched child is cloned
+// before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAll(selector string) *Selection {
+	return s.WrapAllMatcher(cascadia.MustCompile(selector))
+}
+
+// WrapAllMatcher wraps a single HTML structure, matched by the given Matcher,
+// around all elements in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllMatcher(m Matcher) *Selection {
+	return s.wrapAllNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// WrapAllSelection wraps a single HTML structure, the first node of the given
+// Selection, around all elements in the set of matched elements. The matched
+// child is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllSelection(sel *Selection) *Selection {
+	return s.wrapAllNodes(sel.Nodes...)
+}
+
+// WrapAllHtml wraps the given HTML structure around all elements in the set of
+// matched elements. The matched child is cloned before being inserted into the
+// document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllHtml(html string) *Selection {
+	return s.wrapAllNodes(parseHtml(html)...)
+}
+
+func (s *Selection) wrapAllNodes(ns ...*html.Node) *Selection {
+	if len(ns) > 0 {
+		return s.WrapAllNode(ns[0])
+	}
+	return s
+}
+
+// WrapAllNode wraps the given node around the first element in the Selection,
+// making all other nodes in the Selection children of the given node. The node
+// is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllNode(n *html.Node) *Selection {
+	if s.Size() == 0 {
+		return s
+	}
+
+	wrap := cloneNode(n)
+
+	first := s.Nodes[0]
+	if first.Parent != nil {
+		first.Parent.InsertBefore(wrap, first)
+		first.Parent.RemoveChild(first)
+	}
+
+	for c := getFirstChildEl(wrap); c != nil; c = getFirstChildEl(wrap) {
+		wrap = c
+	}
+
+	newSingleSelection(wrap, s.document).AppendSelection(s)
+
+	return s
+}
+
+// WrapInner wraps an HTML structure, matched by the given selector, around the
+// content of element in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInner(selector string) *Selection {
+	return s.WrapInnerMatcher(cascadia.MustCompile(selector))
+}
+
+// WrapInnerMatcher wraps an HTML structure, matched by the given selector,
+// around the content of element in the set of matched elements. The matched
+// child is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerMatcher(m Matcher) *Selection {
+	return s.wrapInnerNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// WrapInnerSelection wraps an HTML structure, matched by the given selector,
+// around the content of element in the set of matched elements. The matched
+// child is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerSelection(sel *Selection) *Selection {
+	return s.wrapInnerNodes(sel.Nodes...)
+}
+
+// WrapInnerHtml wraps an HTML structure, matched by the given selector, around
+// the content of element in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerHtml(html string) *Selection {
+	return s.wrapInnerNodes(parseHtml(html)...)
+}
+
+// WrapInnerNode wraps an HTML structure, matched by the given selector, around
+// the content of element in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerNode(n *html.Node) *Selection {
+	return s.wrapInnerNodes(n)
+}
+
+func (s *Selection) wrapInnerNodes(ns ...*html.Node) *Selection {
+	if len(ns) == 0 {
+		return s
+	}
+
+	s.Each(func(i int, s *Selection) {
+		contents := s.Contents()
+
+		if contents.Size() > 0 {
+			contents.wrapAllNodes(ns...)
+		} else {
+			s.AppendNodes(cloneNode(ns[0]))
+		}
+	})
+
+	return s
+}
+
+func parseHtml(h string) []*html.Node {
+	// Errors are only returned when the io.Reader returns any error besides
+	// EOF, but strings.Reader never will
+	nodes, err := html.ParseFragment(strings.NewReader(h), &html.Node{Type: html.ElementNode})
+	if err != nil {
+		panic("goquery: failed to parse HTML: " + err.Error())
+	}
+	return nodes
+}
+
+// Get the first child that is an ElementNode
+func getFirstChildEl(n *html.Node) *html.Node {
+	c := n.FirstChild
+	for c != nil && c.Type != html.ElementNode {
+		c = c.NextSibling
+	}
+	return c
+}
+
+// Deep copy a slice of nodes.
+func cloneNodes(ns []*html.Node) []*html.Node {
+	cns := make([]*html.Node, 0, len(ns))
+
+	for _, n := range ns {
+		cns = append(cns, cloneNode(n))
+	}
+
+	return cns
+}
+
+// Deep copy a node. The new node has clones of all the original node's
+// children but none of its parents or siblings.
+func cloneNode(n *html.Node) *html.Node {
+	nn := &html.Node{
+		Type:     n.Type,
+		DataAtom: n.DataAtom,
+		Data:     n.Data,
+		Attr:     make([]html.Attribute, len(n.Attr)),
+	}
+
+	copy(nn.Attr, n.Attr)
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		nn.AppendChild(cloneNode(c))
+	}
+
+	return nn
+}
+
+func (s *Selection) manipulateNodes(ns []*html.Node, reverse bool,
+	f func(sn *html.Node, n *html.Node)) *Selection {
+
+	lasti := s.Size() - 1
+
+	// net.Html doesn't provide document fragments for insertion, so to get
+	// things in the correct order with After() and Prepend(), the callback
+	// needs to be called on the reverse of the nodes.
+	if reverse {
+		for i, j := 0, len(ns)-1; i < j; i, j = i+1, j-1 {
+			ns[i], ns[j] = ns[j], ns[i]
+		}
+	}
+
+	for i, sn := range s.Nodes {
+		for _, n := range ns {
+			if i != lasti {
+				f(sn, cloneNode(n))
+			} else {
+				if n.Parent != nil {
+					n.Parent.RemoveChild(n)
+				}
+				f(sn, n)
+			}
+		}
+	}
+
+	return s
+}
@@ -0,0 +1,453 @@
+package goquery
+
+import (
+	"testing"
+)
+
+const (
+	wrapHtml = "<div id=\"ins\">test string<div><p><em><b></b></em></p></div></div>"
+)
+
+func TestAfter(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").After("#nf6")
+
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main + #nf6").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterMany(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".one").After("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 1)
+	assertLength(t, doc.Find(".one + #nf6").Nodes, 2)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterWithRemoved(t *testing.T) {
+	doc := Doc2Clone()
+	s := doc.Find("#main").Remove()
+	s.After("#nf6")
+
+	assertLength(t, s.Find("#nf6").Nodes, 0)
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AfterSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#main #nf1, #main #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf1, #foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#main + #nf1, #nf1 + #nf2").Nodes, 2)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AfterHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("#main + strong").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppend(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").Append("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendBody(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("body").Append("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf6").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AppendSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf1").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf2").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendSelectionExisting(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AppendSelection(doc.Find("#n1, #n2"))
+
+	assertClass(t, doc.Find("#main :nth-child(1)"), "three")
+	assertClass(t, doc.Find("#main :nth-child(5)"), "one")
+	assertClass(t, doc.Find("#main :nth-child(6)"), "two")
+	printSel(t, doc.Selection)
+}
+
+func TestAppendClone(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#n1").AppendSelection(doc.Find("#nf1").Clone())
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf1").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("div").AppendHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("strong").Nodes, 14)
+	printSel(t, doc.Selection)
+}
+
+func TestBefore(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").Before("#nf6")
+
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf6:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestBeforeWithRemoved(t *testing.T) {
+	doc := Doc2Clone()
+	s := doc.Find("#main").Remove()
+	s.Before("#nf6")
+
+	assertLength(t, s.Find("#nf6").Nodes, 0)
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestBeforeSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").BeforeSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#main #nf1, #main #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf1, #foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf1:first-child, #nf1 + #nf2").Nodes, 2)
+	printSel(t, doc.Selection)
+}
+
+func TestBeforeHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").BeforeHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("body > strong:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestEmpty(t *testing.T) {
+	doc := Doc2Clone()
+	s := doc.Find("#main").Empty()
+
+	assertLength(t, doc.Find("#main").Children().Nodes, 0)
+	assertLength(t, s.Filter("div").Nodes, 6)
+	printSel(t, doc.Selection)
+}
+
+func TestPrepend(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").Prepend("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependBody(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("body").Prepend("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf6:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").PrependSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf1:first-child").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf2:nth-child(2)").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependSelectionExisting(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").PrependSelection(doc.Find("#n5, #n6"))
+
+	assertClass(t, doc.Find("#main :nth-child(1)"), "five")
+	assertClass(t, doc.Find("#main :nth-child(2)"), "six")
+	assertClass(t, doc.Find("#main :nth-child(5)"), "three")
+	assertClass(t, doc.Find("#main :nth-child(6)"), "four")
+	printSel(t, doc.Selection)
+}
+
+func TestPrependClone(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#n1").PrependSelection(doc.Find("#nf1").Clone())
+
+	assertLength(t, doc.Find("#foot #nf1:first-child").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf1:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("div").PrependHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("strong:first-child").Nodes, 14)
+	printSel(t, doc.Selection)
+}
+
+func TestRemove(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").Remove()
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestRemoveAll(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("*").Remove()
+
+	assertLength(t, doc.Find("*").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestRemoveRoot(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("html").Remove()
+
+	assertLength(t, doc.Find("html").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestRemoveFiltered(t *testing.T) {
+	doc := Doc2Clone()
+	nf6 := doc.Find("#nf6")
+	s := doc.Find("div").RemoveFiltered("#nf6")
+
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	assertLength(t, s.Nodes, 1)
+	if nf6.Nodes[0] != s.Nodes[0] {
+		t.Error("Removed node does not match original")
+	}
+	printSel(t, doc.Selection)
+}
+
+func TestReplaceWith(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("#nf6").ReplaceWith("#main")
+	assertLength(t, doc.Find("#foot #main:last-child").Nodes, 1)
+	printSel(t, doc.Selection)
+
+	doc.Find("#foot").ReplaceWith("#main")
+	assertLength(t, doc.Find("#foot").Nodes, 0)
+	assertLength(t, doc.Find("#main").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestReplaceWithHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main, #foot").ReplaceWithHtml("<div id=\"replace\"></div>")
+
+	assertLength(t, doc.Find("#replace").Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestReplaceWithSelection(t *testing.T) {
+	doc := Doc2Clone()
+	sel := doc.Find("#nf6").ReplaceWithSelection(doc.Find("#nf5"))
+
+	assertSelectionIs(t, sel, "#nf6")
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	assertLength(t, doc.Find("#nf5").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrap(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("#nf5").Unwrap()
+	assertLength(t, doc.Find("#foot").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf1").Nodes, 1)
+	assertLength(t, doc.Find("body > #nf5").Nodes, 1)
+
+	printSel(t, doc.Selection)
+
+	doc = Doc2Clone()
+
+	doc.Find("#nf5, #n1").Unwrap()
+	assertLength(t, doc.Find("#foot").Nodes, 0)
+	assertLength(t, doc.Find("#main").Nodes, 0)
+	assertLength(t, doc.Find("body > #n1").Nodes, 1)
+	assertLength(t, doc.Find("body > #nf5").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrapBody(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("#main").Unwrap()
+	assertLength(t, doc.Find("body").Nodes, 1)
+	assertLength(t, doc.Find("body > #main").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrapHead(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("title").Unwrap()
+	assertLength(t, doc.Find("head").Nodes, 0)
+	assertLength(t, doc.Find("head > title").Nodes, 0)
+	assertLength(t, doc.Find("title").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrapHtml(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("head").Unwrap()
+	assertLength(t, doc.Find("html").Nodes, 0)
+	assertLength(t, doc.Find("html head").Nodes, 0)
+	assertLength(t, doc.Find("head").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrap(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").Wrap("#nf2")
+	nf1 := doc.Find("#foot #nf2 #nf1")
+	assertLength(t, nf1.Nodes, 1)
+
+	nf2 := doc.Find("#nf2")
+	assertLength(t, nf2.Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapEmpty(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").Wrap("#doesnt-exist")
+
+	origHtml, _ := Doc2().Html()
+	newHtml, _ := doc.Html()
+
+	if origHtml != newHtml {
+		t.Error("Expected the two documents to be identical.")
+	}
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".odd").WrapHtml(wrapHtml)
+	nf2 := doc.Find("#ins #nf2")
+	assertLength(t, nf2.Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestWrapSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").WrapSelection(doc.Find("#nf2"))
+	nf1 := doc.Find("#foot #nf2 #nf1")
+	assertLength(t, nf1.Nodes, 1)
+
+	nf2 := doc.Find("#nf2")
+	assertLength(t, nf2.Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapAll(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".odd").WrapAll("#nf1")
+	nf1 := doc.Find("#main #nf1")
+	assertLength(t, nf1.Nodes, 1)
+
+	sel := nf1.Find("#n2 ~ #n4 ~ #n6 ~ #nf2 ~ #nf4 ~ #nf6")
+	assertLength(t, sel.Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapAllHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".odd").WrapAllHtml(wrapHtml)
+	nf1 := doc.Find("#main div#ins div p em b #n2 ~ #n4 ~ #n6 ~ #nf2 ~ #nf4 ~ #nf6")
+	assertLength(t, nf1.Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerNoContent(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".one").WrapInner(".two")
+
+	twos := doc.Find(".two")
+	assertLength(t, twos.Nodes, 4)
+	assertLength(t, doc.Find(".one .two").Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerWithContent(t *testing.T) {
+	doc := Doc3Clone()
+	doc.Find(".one").WrapInner(".two")
+
+	twos := doc.Find(".two")
+	assertLength(t, twos.Nodes, 4)
+	assertLength(t, doc.Find(".one .two").Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerNoWrapper(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".one").WrapInner(".not-exist")
+
+	twos := doc.Find(".two")
+	assertLength(t, twos.Nodes, 2)
+	assertLength(t, doc.Find(".one").Nodes, 2)
+	assertLength(t, doc.Find(".one .two").Nodes, 0)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#foot").WrapInnerHtml(wrapHtml)
+
+	foot := doc.Find("#foot div#ins div p em b #nf1 ~ #nf2 ~ #nf3")
+	assertLength(t, foot.Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
@@ -2,10 +2,14 @@ package goquery

 import (
 	"bytes"
+	"regexp"
+	"strings"

 	"golang.org/x/net/html"
 )

+var rxClassTrim = regexp.MustCompile("[\t\r\n]")
+
 // Attr gets the specified attribute's value for the first element in the
 // Selection. To get the value for each element individually, use a looping
 // construct such as Each or Map method.
@@ -16,6 +20,43 @@ func (s *Selection) Attr(attrName string) (val string, exists bool) {
 	return getAttributeValue(attrName, s.Nodes[0])
 }

+// AttrOr works like Attr but returns default value if attribute is not present.
+func (s *Selection) AttrOr(attrName, defaultValue string) string {
+	if len(s.Nodes) == 0 {
+		return defaultValue
+	}
+
+	val, exists := getAttributeValue(attrName, s.Nodes[0])
+	if !exists {
+		return defaultValue
+	}
+
+	return val
+}
+
+// RemoveAttr removes the named attribute from each element in the set of matched elements.
+func (s *Selection) RemoveAttr(attrName string) *Selection {
+	for _, n := range s.Nodes {
+		removeAttr(n, attrName)
+	}
+
+	return s
+}
+
+// SetAttr sets the given attribute on each element in the set of matched elements.
+func (s *Selection) SetAttr(attrName, val string) *Selection {
+	for _, n := range s.Nodes {
+		attr := getAttributePtr(attrName, n)
+		if attr == nil {
+			n.Attr = append(n.Attr, html.Attribute{Key: attrName, Val: val})
+		} else {
+			attr.Val = val
+		}
+	}
+
+	return s
+}
+
 // Text gets the combined text contents of each element in the set of matched
 // elements, including their descendants.
 func (s *Selection) Text() string {
@@ -58,6 +99,99 @@ func (s *Selection) Html() (ret string, e error) {
 	return
 }

+// AddClass adds the given class(es) to each element in the set of matched elements.
+// Multiple class names can be specified, separated by a space or via multiple arguments.
+func (s *Selection) AddClass(class ...string) *Selection {
+	classStr := strings.TrimSpace(strings.Join(class, " "))
+
+	if classStr == "" {
+		return s
+	}
+
+	tcls := getClassesSlice(classStr)
+	for _, n := range s.Nodes {
+		curClasses, attr := getClassesAndAttr(n, true)
+		for _, newClass := range tcls {
+			if strings.Index(curClasses, " "+newClass+" ") == -1 {
+				curClasses += newClass + " "
+			}
+		}
+
+		setClasses(n, attr, curClasses)
+	}
+
+	return s
+}
+
+// HasClass determines whether any of the matched elements are assigned the
+// given class.
+func (s *Selection) HasClass(class string) bool {
+	class = " " + class + " "
+	for _, n := range s.Nodes {
+		classes, _ := getClassesAndAttr(n, false)
+		if strings.Index(classes, class) > -1 {
+			return true
+		}
+	}
+	return false
+}
+
+// RemoveClass removes the given class(es) from each element in the set of matched elements.
+// Multiple class names can be specified, separated by a space or via multiple arguments.
+// If no class name is provided, all classes are removed.
+func (s *Selection) RemoveClass(class ...string) *Selection {
+	var rclasses []string
+
+	classStr := strings.TrimSpace(strings.Join(class, " "))
+	remove := classStr == ""
+
+	if !remove {
+		rclasses = getClassesSlice(classStr)
+	}
+
+	for _, n := range s.Nodes {
+		if remove {
+			removeAttr(n, "class")
+		} else {
+			classes, attr := getClassesAndAttr(n, true)
+			for _, rcl := range rclasses {
+				classes = strings.Replace(classes, " "+rcl+" ", " ", -1)
+			}
+
+			setClasses(n, attr, classes)
+		}
+	}
+
+	return s
+}
+
+// ToggleClass adds or removes the given class(es) for each element in the set of matched elements.
+// Multiple class names can be specified, separated by a space or via multiple arguments.
+func (s *Selection) ToggleClass(class ...string) *Selection {
+	classStr := strings.TrimSpace(strings.Join(class, " "))
+
+	if classStr == "" {
+		return s
+	}
+
+	tcls := getClassesSlice(classStr)
+
+	for _, n := range s.Nodes {
+		classes, attr := getClassesAndAttr(n, true)
+		for _, tcl := range tcls {
+			if strings.Index(classes, " "+tcl+" ") != -1 {
+				classes = strings.Replace(classes, " "+tcl+" ", " ", -1)
+			} else {
+				classes += tcl + " "
+			}
+		}
+
+		setClasses(n, attr, classes)
+	}
+
+	return s
+}
+
 // Get the specified node's text content.
 func getNodeText(node *html.Node) string {
 	if node.Type == html.TextNode {
@@ -74,18 +208,71 @@ func getNodeText(node *html.Node) string {
 	return ""
 }

-// Private function to get the specified attribute's value from a node.
-func getAttributeValue(attrName string, n *html.Node) (val string, exists bool) {
+func getAttributePtr(attrName string, n *html.Node) *html.Attribute {
 	if n == nil {
-		return
+		return nil
 	}

-	for _, a := range n.Attr {
+	for i, a := range n.Attr {
 		if a.Key == attrName {
-			val = a.Val
-			exists = true
-			return
+			return &n.Attr[i]
 		}
 	}
+	return nil
+}
+
+// Private function to get the specified attribute's value from a node.
+func getAttributeValue(attrName string, n *html.Node) (val string, exists bool) {
+	if a := getAttributePtr(attrName, n); a != nil {
+		val = a.Val
+		exists = true
+	}
 	return
 }
+
+// Get and normalize the "class" attribute from the node.
+func getClassesAndAttr(n *html.Node, create bool) (classes string, attr *html.Attribute) {
+	// Applies only to element nodes
+	if n.Type == html.ElementNode {
+		attr = getAttributePtr("class", n)
+		if attr == nil && create {
+			n.Attr = append(n.Attr, html.Attribute{
+				Key: "class",
+				Val: "",
+			})
+			attr = &n.Attr[len(n.Attr)-1]
+		}
+	}
+
+	if attr == nil {
+		classes = " "
+	} else {
+		classes = rxClassTrim.ReplaceAllString(" "+attr.Val+" ", " ")
+	}
+
+	return
+}
+
+func getClassesSlice(classes string) []string {
+	return strings.Split(rxClassTrim.ReplaceAllString(" "+classes+" ", " "), " ")
+}
+
+func removeAttr(n *html.Node, attrName string) {
+	for i, a := range n.Attr {
+		if a.Key == attrName {
+			n.Attr[i], n.Attr[len(n.Attr)-1], n.Attr =
+				n.Attr[len(n.Attr)-1], html.Attribute{}, n.Attr[:len(n.Attr)-1]
+			return
+		}
+	}
+}
+
+func setClasses(n *html.Node, attr *html.Attribute, classes string) {
+	classes = strings.TrimSpace(classes)
+	if classes == "" {
+		removeAttr(n, "class")
+		return
+	}
+
+	attr.Val = classes
+}
@@ -14,12 +14,66 @@ func TestAttrExists(t *testing.T) {
 	}
 }

+func TestAttrOr(t *testing.T) {
+	if val := Doc().Find("a").AttrOr("fake-attribute", "alternative"); val != "alternative" {
+		t.Error("Expected an alternative value for 'fake-attribute' attribute.")
+	} else {
+		t.Logf("Value returned for not existing attribute: %v.", val)
+	}
+	if val := Doc().Find("zz").AttrOr("fake-attribute", "alternative"); val != "alternative" {
+		t.Error("Expected an alternative value for 'fake-attribute' on an empty selection.")
+	} else {
+		t.Logf("Value returned for empty selection: %v.", val)
+	}
+}
+
 func TestAttrNotExist(t *testing.T) {
 	if val, ok := Doc().Find("div.row-fluid").Attr("href"); ok {
 		t.Errorf("Expected no value for the href attribute, got %v.", val)
 	}
 }

+func TestRemoveAttr(t *testing.T) {
+	sel := Doc2Clone().Find("div")
+
+	sel.RemoveAttr("id")
+
+	_, ok := sel.Attr("id")
+	if ok {
+		t.Error("Expected there to be no id attributes set")
+	}
+}
+
+func TestSetAttr(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+
+	sel.SetAttr("id", "not-main")
+
+	val, ok := sel.Attr("id")
+	if !ok {
+		t.Error("Expected an id attribute on main")
+	}
+
+	if val != "not-main" {
+		t.Errorf("Expected an attribute id to be not-main, got %s", val)
+	}
+}
+
+func TestSetAttr2(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+
+	sel.SetAttr("foo", "bar")
+
+	val, ok := sel.Attr("foo")
+	if !ok {
+		t.Error("Expected an 'foo' attribute on main")
+	}
+
+	if val != "bar" {
+		t.Errorf("Expected an attribute 'foo' to be 'bar', got '%s'", val)
+	}
+}
+
 func TestText(t *testing.T) {
 	txt := Doc().Find("h1").Text()
 	if strings.Trim(txt, " \n\r\t") != "Provok.in" {
@@ -83,3 +137,116 @@ func TestNbsp(t *testing.T) {
 		t.Errorf("Html: expected a non-breaking space at index 4, got %d", ix)
 	}
 }
+
+func TestAddClass(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+	sel.AddClass("main main main")
+
+	// Make sure that class was only added once
+	if a, ok := sel.Attr("class"); !ok || a != "main" {
+		t.Error("Expected #main to have class main")
+	}
+}
+
+func TestAddClassSimilar(t *testing.T) {
+	sel := Doc2Clone().Find("#nf5")
+	sel.AddClass("odd")
+
+	assertClass(t, sel, "odd")
+	assertClass(t, sel, "odder")
+	printSel(t, sel.Parent())
+}
+
+func TestAddEmptyClass(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+	sel.AddClass("")
+
+	// Make sure that class was only added once
+	if a, ok := sel.Attr("class"); ok {
+		t.Errorf("Expected #main to not to have a class, have: %s", a)
+	}
+}
+
+func TestAddClasses(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+	sel.AddClass("a b")
+
+	// Make sure that class was only added once
+	if !sel.HasClass("a") || !sel.HasClass("b") {
+		t.Errorf("#main does not have classes")
+	}
+}
+
+func TestHasClass(t *testing.T) {
+	sel := Doc().Find("div")
+	if !sel.HasClass("span12") {
+		t.Error("Expected at least one div to have class span12.")
+	}
+}
+
+func TestHasClassNone(t *testing.T) {
+	sel := Doc().Find("h2")
+	if sel.HasClass("toto") {
+		t.Error("Expected h1 to have no class.")
+	}
+}
+
+func TestHasClassNotFirst(t *testing.T) {
+	sel := Doc().Find(".alert")
+	if !sel.HasClass("alert-error") {
+		t.Error("Expected .alert to also have class .alert-error.")
+	}
+}
+
+func TestRemoveClass(t *testing.T) {
+	sel := Doc2Clone().Find("#nf1")
+	sel.RemoveClass("one row")
+
+	if !sel.HasClass("even") || sel.HasClass("one") || sel.HasClass("row") {
+		classes, _ := sel.Attr("class")
+		t.Error("Expected #nf1 to have class even, has ", classes)
+	}
+}
+
+func TestRemoveClassSimilar(t *testing.T) {
+	sel := Doc2Clone().Find("#nf5, #nf6")
+	assertLength(t, sel.Nodes, 2)
+
+	sel.RemoveClass("odd")
+	assertClass(t, sel.Eq(0), "odder")
+	printSel(t, sel)
+}
+
+func TestRemoveAllClasses(t *testing.T) {
+	sel := Doc2Clone().Find("#nf1")
+	sel.RemoveClass()
+
+	if a, ok := sel.Attr("class"); ok {
+		t.Error("All classes were not removed, has ", a)
+	}
+
+	sel = Doc2Clone().Find("#main")
+	sel.RemoveClass()
+	if a, ok := sel.Attr("class"); ok {
+		t.Error("All classes were not removed, has ", a)
+	}
+}
+
+func TestToggleClass(t *testing.T) {
+	sel := Doc2Clone().Find("#nf1")
+
+	sel.ToggleClass("one")
+	if sel.HasClass("one") {
+		t.Error("Expected #nf1 to not have class one")
+	}
+
+	sel.ToggleClass("one")
+	if !sel.HasClass("one") {
+		t.Error("Expected #nf1 to have class one")
+	}
+
+	sel.ToggleClass("one even row")
+	if a, ok := sel.Attr("class"); ok {
+		t.Errorf("Expected #nf1 to have no classes, have %q", a)
+	}
+}
@@ -1,25 +1,28 @@
 package goquery

 import (
-	"regexp"
-	"strings"
-
-	"code.google.com/p/cascadia"
+	"github.com/andybalholm/cascadia"
 	"golang.org/x/net/html"
 )

-var rxClassTrim = regexp.MustCompile("[\t\r\n]")
-
 // Is checks the current matched set of elements against a selector and
 // returns true if at least one of these elements matches.
 func (s *Selection) Is(selector string) bool {
 	if len(s.Nodes) > 0 {
-		// Attempt a match with the selector
-		cs := cascadia.MustCompile(selector)
+		return s.IsMatcher(cascadia.MustCompile(selector))
+	}
+
+	return false
+}
+
+// IsMatcher checks the current matched set of elements against a matcher and
+// returns true if at least one of these elements matches.
+func (s *Selection) IsMatcher(m Matcher) bool {
+	if len(s.Nodes) > 0 {
 		if len(s.Nodes) == 1 {
-			return cs.Match(s.Nodes[0])
+			return m.Match(s.Nodes[0])
 		}
-		return len(cs.Filter(s.Nodes)) > 0
+		return len(m.Filter(s.Nodes)) > 0
 	}

 	return false
@@ -43,24 +46,6 @@ func (s *Selection) IsNodes(nodes ...*html.Node) bool {
 	return s.FilterNodes(nodes...).Length() > 0
 }

-// HasClass determines whether any of the matched elements are assigned the
-// given class.
-func (s *Selection) HasClass(class string) bool {
-	class = " " + class + " "
-	for _, n := range s.Nodes {
-		// Applies only to element nodes
-		if n.Type == html.ElementNode {
-			if elClass, ok := getAttributeValue("class", n); ok {
-				elClass = rxClassTrim.ReplaceAllString(" "+elClass+" ", " ")
-				if strings.Index(elClass, class) > -1 {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
 // Contains returns true if the specified Node is within,
 // at any depth, one of the nodes in the Selection object.
 // It is NOT inclusive, to behave like jQuery's implementation, and
@@ -72,27 +72,6 @@ func TestIsNodes(t *testing.T) {
 	}
 }

-func TestHasClass(t *testing.T) {
-	sel := Doc().Find("div")
-	if !sel.HasClass("span12") {
-		t.Error("Expected at least one div to have class span12.")
-	}
-}
-
-func TestHasClassNone(t *testing.T) {
-	sel := Doc().Find("h2")
-	if sel.HasClass("toto") {
-		t.Error("Expected h1 to have no class.")
-	}
-}
-
-func TestHasClassNotFirst(t *testing.T) {
-	sel := Doc().Find(".alert")
-	if !sel.HasClass("alert-error") {
-		t.Error("Expected .alert to also have class .alert-error.")
-	}
-}
-
 func TestDocContains(t *testing.T) {
 	sel := Doc().Find("h1")
 	if !Doc().Contains(sel.Nodes[0]) {
@@ -3,7 +3,7 @@
  <head>
    <title>Tests for siblings</title>
  </head>
-  <body>
+  <BODY>
    <div id="main">
      <div id="n1" class="one even row"></div>
      <div id="n2" class="two odd row"></div>
@@ -17,8 +17,8 @@
      <div id="nf2" class="two odd row"></div>
      <div id="nf3" class="three even row"></div>
      <div id="nf4" class="four odd row"></div>
-      <div id="nf5" class="five even row"></div>
+      <div id="nf5" class="five even row odder"></div>
      <div id="nf6" class="six odd row"></div>
    </div>
-  </body>
+  </BODY>
 </html>
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Tests for siblings</title>
+  </head>
+  <BODY>
+    <div id="main">
+      <div id="n1" class="one even row">hello</div>
+      <div id="n2" class="two odd row"></div>
+      <div id="n3" class="three even row"></div>
+      <div id="n4" class="four odd row"></div>
+      <div id="n5" class="five even row"></div>
+      <div id="n6" class="six odd row"></div>
+    </div>
+    <div id="foot">
+      <div id="nf1" class="one even row">text</div>
+      <div id="nf2" class="two odd row"></div>
+      <div id="nf3" class="three even row"></div>
+      <div id="nf4" class="four odd row"></div>
+      <div id="nf5" class="five even row odder"></div>
+      <div id="nf6" class="six odd row"></div>
+    </div>
+  </BODY>
+</html>
@@ -1,7 +1,7 @@
 package goquery

 import (
-	"code.google.com/p/cascadia"
+	"github.com/andybalholm/cascadia"
 	"golang.org/x/net/html"
 )

@@ -24,7 +24,14 @@ const (
 // elements, filtered by a selector. It returns a new Selection object
 // containing these matched elements.
 func (s *Selection) Find(selector string) *Selection {
-	return pushStack(s, findWithSelector(s.Nodes, selector))
+	return pushStack(s, findWithMatcher(s.Nodes, cascadia.MustCompile(selector)))
+}
+
+// FindMatcher gets the descendants of each element in the current set of matched
+// elements, filtered by the matcher. It returns a new Selection object
+// containing these matched elements.
+func (s *Selection) FindMatcher(m Matcher) *Selection {
+	return pushStack(s, findWithMatcher(s.Nodes, m))
 }

 // FindSelection gets the descendants of each element in the current
@@ -68,6 +75,14 @@ func (s *Selection) ContentsFiltered(selector string) *Selection {
 	return s.Contents()
 }

+// ContentsMatcher gets the children of each element in the Selection,
+// filtered by the specified matcher. It returns a new Selection
+// object containing these elements. Since matchers only act on Element nodes,
+// this function is an alias to ChildrenMatcher.
+func (s *Selection) ContentsMatcher(m Matcher) *Selection {
+	return s.ChildrenMatcher(m)
+}
+
 // Children gets the child elements of each element in the Selection.
 // It returns a new Selection object containing these elements.
 func (s *Selection) Children() *Selection {
@@ -78,7 +93,14 @@ func (s *Selection) Children() *Selection {
 // filtered by the specified selector. It returns a new
 // Selection object containing these elements.
 func (s *Selection) ChildrenFiltered(selector string) *Selection {
-	return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), selector)
+	return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), cascadia.MustCompile(selector))
+}
+
+// ChildrenMatcher gets the child elements of each element in the Selection,
+// filtered by the specified matcher. It returns a new
+// Selection object containing these elements.
+func (s *Selection) ChildrenMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), m)
 }

 // Parent gets the parent of each element in the Selection. It returns a
@@ -90,19 +112,30 @@ func (s *Selection) Parent() *Selection {
 // ParentFiltered gets the parent of each element in the Selection filtered by a
 // selector. It returns a new Selection object containing the matched elements.
 func (s *Selection) ParentFiltered(selector string) *Selection {
-	return filterAndPush(s, getParentNodes(s.Nodes), selector)
+	return filterAndPush(s, getParentNodes(s.Nodes), cascadia.MustCompile(selector))
+}
+
+// ParentMatcher gets the parent of each element in the Selection filtered by a
+// matcher. It returns a new Selection object containing the matched elements.
+func (s *Selection) ParentMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getParentNodes(s.Nodes), m)
 }

 // Closest gets the first element that matches the selector by testing the
 // element itself and traversing up through its ancestors in the DOM tree.
 func (s *Selection) Closest(selector string) *Selection {
 	cs := cascadia.MustCompile(selector)
+	return s.ClosestMatcher(cs)
+}

+// ClosestMatcher gets the first element that matches the matcher by testing the
+// element itself and traversing up through its ancestors in the DOM tree.
+func (s *Selection) ClosestMatcher(m Matcher) *Selection {
 	return pushStack(s, mapNodes(s.Nodes, func(i int, n *html.Node) []*html.Node {
 		// For each node in the selection, test the node itself, then each parent
 		// until a match is found.
 		for ; n != nil; n = n.Parent {
-			if cs.Match(n) {
+			if m.Match(n) {
 				return []*html.Node{n}
 			}
 		}
@@ -138,20 +171,33 @@ func (s *Selection) ClosestSelection(sel *Selection) *Selection {
 // Parents gets the ancestors of each element in the current Selection. It
 // returns a new Selection object with the matched elements.
 func (s *Selection) Parents() *Selection {
-	return pushStack(s, getParentsNodes(s.Nodes, "", nil))
+	return pushStack(s, getParentsNodes(s.Nodes, nil, nil))
 }

 // ParentsFiltered gets the ancestors of each element in the current
 // Selection. It returns a new Selection object with the matched elements.
 func (s *Selection) ParentsFiltered(selector string) *Selection {
-	return filterAndPush(s, getParentsNodes(s.Nodes, "", nil), selector)
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nil), cascadia.MustCompile(selector))
+}
+
+// ParentsMatcher gets the ancestors of each element in the current
+// Selection. It returns a new Selection object with the matched elements.
+func (s *Selection) ParentsMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nil), m)
 }

 // ParentsUntil gets the ancestors of each element in the Selection, up to but
 // not including the element matched by the selector. It returns a new Selection
 // object containing the matched elements.
 func (s *Selection) ParentsUntil(selector string) *Selection {
-	return pushStack(s, getParentsNodes(s.Nodes, selector, nil))
+	return pushStack(s, getParentsNodes(s.Nodes, cascadia.MustCompile(selector), nil))
+}
+
+// ParentsUntilMatcher gets the ancestors of each element in the Selection, up to but
+// not including the element matched by the matcher. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) ParentsUntilMatcher(m Matcher) *Selection {
+	return pushStack(s, getParentsNodes(s.Nodes, m, nil))
 }

 // ParentsUntilSelection gets the ancestors of each element in the Selection,
@@ -168,96 +214,151 @@ func (s *Selection) ParentsUntilSelection(sel *Selection) *Selection {
 // up to but not including the specified nodes. It returns a
 // new Selection object containing the matched elements.
 func (s *Selection) ParentsUntilNodes(nodes ...*html.Node) *Selection {
-	return pushStack(s, getParentsNodes(s.Nodes, "", nodes))
+	return pushStack(s, getParentsNodes(s.Nodes, nil, nodes))
 }

 // ParentsFilteredUntil is like ParentsUntil, with the option to filter the
 // results based on a selector string. It returns a new Selection
 // object containing the matched elements.
-func (s *Selection) ParentsFilteredUntil(filterSelector string, untilSelector string) *Selection {
-	return filterAndPush(s, getParentsNodes(s.Nodes, untilSelector, nil), filterSelector)
+func (s *Selection) ParentsFilteredUntil(filterSelector, untilSelector string) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, cascadia.MustCompile(untilSelector), nil), cascadia.MustCompile(filterSelector))
+}
+
+// ParentsFilteredUntilMatcher is like ParentsUntilMatcher, with the option to filter the
+// results based on a matcher. It returns a new Selection object containing the matched elements.
+func (s *Selection) ParentsFilteredUntilMatcher(filter, until Matcher) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, until, nil), filter)
 }

 // ParentsFilteredUntilSelection is like ParentsUntilSelection, with the
 // option to filter the results based on a selector string. It returns a new
 // Selection object containing the matched elements.
 func (s *Selection) ParentsFilteredUntilSelection(filterSelector string, sel *Selection) *Selection {
+	return s.ParentsMatcherUntilSelection(cascadia.MustCompile(filterSelector), sel)
+}
+
+// ParentsMatcherUntilSelection is like ParentsUntilSelection, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) ParentsMatcherUntilSelection(filter Matcher, sel *Selection) *Selection {
 	if sel == nil {
-		return s.ParentsFiltered(filterSelector)
+		return s.ParentsMatcher(filter)
 	}
-	return s.ParentsFilteredUntilNodes(filterSelector, sel.Nodes...)
+	return s.ParentsMatcherUntilNodes(filter, sel.Nodes...)
 }

 // ParentsFilteredUntilNodes is like ParentsUntilNodes, with the
 // option to filter the results based on a selector string. It returns a new
 // Selection object containing the matched elements.
 func (s *Selection) ParentsFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection {
-	return filterAndPush(s, getParentsNodes(s.Nodes, "", nodes), filterSelector)
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nodes), cascadia.MustCompile(filterSelector))
+}
+
+// ParentsMatcherUntilNodes is like ParentsUntilNodes, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) ParentsMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nodes), filter)
 }

 // Siblings gets the siblings of each element in the Selection. It returns
 // a new Selection object containing the matched elements.
 func (s *Selection) Siblings() *Selection {
-	return pushStack(s, getSiblingNodes(s.Nodes, siblingAll, "", nil))
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil))
 }

 // SiblingsFiltered gets the siblings of each element in the Selection
 // filtered by a selector. It returns a new Selection object containing the
 // matched elements.
 func (s *Selection) SiblingsFiltered(selector string) *Selection {
-	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, "", nil), selector)
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil), cascadia.MustCompile(selector))
+}
+
+// SiblingsMatcher gets the siblings of each element in the Selection
+// filtered by a matcher. It returns a new Selection object containing the
+// matched elements.
+func (s *Selection) SiblingsMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil), m)
 }

 // Next gets the immediately following sibling of each element in the
 // Selection. It returns a new Selection object containing the matched elements.
 func (s *Selection) Next() *Selection {
-	return pushStack(s, getSiblingNodes(s.Nodes, siblingNext, "", nil))
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil))
 }

 // NextFiltered gets the immediately following sibling of each element in the
 // Selection filtered by a selector. It returns a new Selection object
 // containing the matched elements.
 func (s *Selection) NextFiltered(selector string) *Selection {
-	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, "", nil), selector)
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil), cascadia.MustCompile(selector))
+}
+
+// NextMatcher gets the immediately following sibling of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) NextMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil), m)
 }

 // NextAll gets all the following siblings of each element in the
 // Selection. It returns a new Selection object containing the matched elements.
 func (s *Selection) NextAll() *Selection {
-	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextAll, "", nil))
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil))
 }

 // NextAllFiltered gets all the following siblings of each element in the
 // Selection filtered by a selector. It returns a new Selection object
 // containing the matched elements.
 func (s *Selection) NextAllFiltered(selector string) *Selection {
-	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, "", nil), selector)
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil), cascadia.MustCompile(selector))
+}
+
+// NextAllMatcher gets all the following siblings of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) NextAllMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil), m)
 }

 // Prev gets the immediately preceding sibling of each element in the
 // Selection. It returns a new Selection object containing the matched elements.
 func (s *Selection) Prev() *Selection {
-	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrev, "", nil))
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil))
 }

 // PrevFiltered gets the immediately preceding sibling of each element in the
 // Selection filtered by a selector. It returns a new Selection object
 // containing the matched elements.
 func (s *Selection) PrevFiltered(selector string) *Selection {
-	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, "", nil), selector)
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil), cascadia.MustCompile(selector))
+}
+
+// PrevMatcher gets the immediately preceding sibling of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) PrevMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil), m)
 }

 // PrevAll gets all the preceding siblings of each element in the
 // Selection. It returns a new Selection object containing the matched elements.
 func (s *Selection) PrevAll() *Selection {
-	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevAll, "", nil))
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil))
 }

 // PrevAllFiltered gets all the preceding siblings of each element in the
 // Selection filtered by a selector. It returns a new Selection object
 // containing the matched elements.
 func (s *Selection) PrevAllFiltered(selector string) *Selection {
-	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, "", nil), selector)
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil), cascadia.MustCompile(selector))
+}
+
+// PrevAllMatcher gets all the preceding siblings of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) PrevAllMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil), m)
 }

 // NextUntil gets all following siblings of each element up to but not
@@ -265,7 +366,15 @@ func (s *Selection) PrevAllFiltered(selector string) *Selection {
 // object containing the matched elements.
 func (s *Selection) NextUntil(selector string) *Selection {
 	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil,
-		selector, nil))
+		cascadia.MustCompile(selector), nil))
+}
+
+// NextUntilMatcher gets all following siblings of each element up to but not
+// including the element matched by the matcher. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) NextUntilMatcher(m Matcher) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		m, nil))
 }

 // NextUntilSelection gets all following siblings of each element up to but not
@@ -283,7 +392,7 @@ func (s *Selection) NextUntilSelection(sel *Selection) *Selection {
 // object containing the matched elements.
 func (s *Selection) NextUntilNodes(nodes ...*html.Node) *Selection {
 	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil,
-		"", nodes))
+		nil, nodes))
 }

 // PrevUntil gets all preceding siblings of each element up to but not
@@ -291,7 +400,15 @@ func (s *Selection) NextUntilNodes(nodes ...*html.Node) *Selection {
 // object containing the matched elements.
 func (s *Selection) PrevUntil(selector string) *Selection {
 	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
-		selector, nil))
+		cascadia.MustCompile(selector), nil))
+}
+
+// PrevUntilMatcher gets all preceding siblings of each element up to but not
+// including the element matched by the matcher. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) PrevUntilMatcher(m Matcher) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		m, nil))
 }

 // PrevUntilSelection gets all preceding siblings of each element up to but not
@@ -309,25 +426,40 @@ func (s *Selection) PrevUntilSelection(sel *Selection) *Selection {
 // object containing the matched elements.
 func (s *Selection) PrevUntilNodes(nodes ...*html.Node) *Selection {
 	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
-		"", nodes))
+		nil, nodes))
 }

 // NextFilteredUntil is like NextUntil, with the option to filter
 // the results based on a selector string.
 // It returns a new Selection object containing the matched elements.
-func (s *Selection) NextFilteredUntil(filterSelector string, untilSelector string) *Selection {
+func (s *Selection) NextFilteredUntil(filterSelector, untilSelector string) *Selection {
 	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
-		untilSelector, nil), filterSelector)
+		cascadia.MustCompile(untilSelector), nil), cascadia.MustCompile(filterSelector))
+}
+
+// NextFilteredUntilMatcher is like NextUntilMatcher, with the option to filter
+// the results based on a matcher.
+// It returns a new Selection object containing the matched elements.
+func (s *Selection) NextFilteredUntilMatcher(filter, until Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		until, nil), filter)
 }

 // NextFilteredUntilSelection is like NextUntilSelection, with the
 // option to filter the results based on a selector string. It returns a new
 // Selection object containing the matched elements.
 func (s *Selection) NextFilteredUntilSelection(filterSelector string, sel *Selection) *Selection {
+	return s.NextMatcherUntilSelection(cascadia.MustCompile(filterSelector), sel)
+}
+
+// NextMatcherUntilSelection is like NextUntilSelection, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) NextMatcherUntilSelection(filter Matcher, sel *Selection) *Selection {
 	if sel == nil {
-		return s.NextFiltered(filterSelector)
+		return s.NextMatcher(filter)
 	}
-	return s.NextFilteredUntilNodes(filterSelector, sel.Nodes...)
+	return s.NextMatcherUntilNodes(filter, sel.Nodes...)
 }

 // NextFilteredUntilNodes is like NextUntilNodes, with the
@@ -335,25 +467,48 @@ func (s *Selection) NextFilteredUntilSelection(filterSelector string, sel *Selec
 // Selection object containing the matched elements.
 func (s *Selection) NextFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection {
 	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
-		"", nodes), filterSelector)
+		nil, nodes), cascadia.MustCompile(filterSelector))
+}
+
+// NextMatcherUntilNodes is like NextUntilNodes, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) NextMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		nil, nodes), filter)
 }

 // PrevFilteredUntil is like PrevUntil, with the option to filter
 // the results based on a selector string.
 // It returns a new Selection object containing the matched elements.
-func (s *Selection) PrevFilteredUntil(filterSelector string, untilSelector string) *Selection {
+func (s *Selection) PrevFilteredUntil(filterSelector, untilSelector string) *Selection {
 	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
-		untilSelector, nil), filterSelector)
+		cascadia.MustCompile(untilSelector), nil), cascadia.MustCompile(filterSelector))
+}
+
+// PrevFilteredUntilMatcher is like PrevUntilMatcher, with the option to filter
+// the results based on a matcher.
+// It returns a new Selection object containing the matched elements.
+func (s *Selection) PrevFilteredUntilMatcher(filter, until Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		until, nil), filter)
 }

 // PrevFilteredUntilSelection is like PrevUntilSelection, with the
 // option to filter the results based on a selector string. It returns a new
 // Selection object containing the matched elements.
 func (s *Selection) PrevFilteredUntilSelection(filterSelector string, sel *Selection) *Selection {
+	return s.PrevMatcherUntilSelection(cascadia.MustCompile(filterSelector), sel)
+}
+
+// PrevMatcherUntilSelection is like PrevUntilSelection, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) PrevMatcherUntilSelection(filter Matcher, sel *Selection) *Selection {
 	if sel == nil {
-		return s.PrevFiltered(filterSelector)
+		return s.PrevMatcher(filter)
 	}
-	return s.PrevFilteredUntilNodes(filterSelector, sel.Nodes...)
+	return s.PrevMatcherUntilNodes(filter, sel.Nodes...)
 }

 // PrevFilteredUntilNodes is like PrevUntilNodes, with the
@@ -361,28 +516,34 @@ func (s *Selection) PrevFilteredUntilSelection(filterSelector string, sel *Selec
 // Selection object containing the matched elements.
 func (s *Selection) PrevFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection {
 	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
-		"", nodes), filterSelector)
+		nil, nodes), cascadia.MustCompile(filterSelector))
 }

-// Filter and push filters the nodes based on a selector, and pushes the results
+// PrevMatcherUntilNodes is like PrevUntilNodes, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) PrevMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		nil, nodes), filter)
+}
+
+// Filter and push filters the nodes based on a matcher, and pushes the results
 // on the stack, with the srcSel as previous selection.
-func filterAndPush(srcSel *Selection, nodes []*html.Node, selector string) *Selection {
+func filterAndPush(srcSel *Selection, nodes []*html.Node, m Matcher) *Selection {
 	// Create a temporary Selection with the specified nodes to filter using winnow
 	sel := &Selection{nodes, srcSel.document, nil}
-	// Filter based on selector and push on stack
-	return pushStack(srcSel, winnow(sel, selector, true))
+	// Filter based on matcher and push on stack
+	return pushStack(srcSel, winnow(sel, m, true))
 }

 // Internal implementation of Find that return raw nodes.
-func findWithSelector(nodes []*html.Node, selector string) []*html.Node {
-	// Compile the selector once
-	sel := cascadia.MustCompile(selector)
+func findWithMatcher(nodes []*html.Node, m Matcher) []*html.Node {
 	// Map nodes to find the matches within the children of each node
 	return mapNodes(nodes, func(i int, n *html.Node) (result []*html.Node) {
 		// Go down one level, becausejQuery's Find selects only within descendants
 		for c := n.FirstChild; c != nil; c = c.NextSibling {
 			if c.Type == html.ElementNode {
-				result = append(result, sel.MatchAll(c)...)
+				result = append(result, m.MatchAll(c)...)
 			}
 		}
 		return
@@ -391,12 +552,12 @@ func findWithSelector(nodes []*html.Node, selector string) []*html.Node {

 // Internal implementation to get all parent nodes, stopping at the specified
 // node (or nil if no stop).
-func getParentsNodes(nodes []*html.Node, stopSelector string, stopNodes []*html.Node) []*html.Node {
+func getParentsNodes(nodes []*html.Node, stopm Matcher, stopNodes []*html.Node) []*html.Node {
 	return mapNodes(nodes, func(i int, n *html.Node) (result []*html.Node) {
 		for p := n.Parent; p != nil; p = p.Parent {
 			sel := newSingleSelection(p, nil)
-			if stopSelector != "" {
-				if sel.Is(stopSelector) {
+			if stopm != nil {
+				if sel.IsMatcher(stopm) {
 					break
 				}
 			} else if len(stopNodes) > 0 {
@@ -413,17 +574,17 @@ func getParentsNodes(nodes []*html.Node, stopSelector string, stopNodes []*html.
 }

 // Internal implementation of sibling nodes that return a raw slice of matches.
-func getSiblingNodes(nodes []*html.Node, st siblingType, untilSelector string, untilNodes []*html.Node) []*html.Node {
+func getSiblingNodes(nodes []*html.Node, st siblingType, untilm Matcher, untilNodes []*html.Node) []*html.Node {
 	var f func(*html.Node) bool

 	// If the requested siblings are ...Until, create the test function to
 	// determine if the until condition is reached (returns true if it is)
 	if st == siblingNextUntil || st == siblingPrevUntil {
 		f = func(n *html.Node) bool {
-			if untilSelector != "" {
-				// Selector-based condition
+			if untilm != nil {
+				// Matcher-based condition
 				sel := newSingleSelection(n, nil)
-				return sel.Is(untilSelector)
+				return sel.IsMatcher(untilm)
 			} else if len(untilNodes) > 0 {
 				// Nodes-based condition
 				sel := newSingleSelection(n, nil)
@@ -7,672 +7,672 @@ import (

 func TestFind(t *testing.T) {
 	sel := Doc().Find("div.row-fluid")
-	AssertLength(t, sel.Nodes, 9)
+	assertLength(t, sel.Nodes, 9)
 }

 func TestFindRollback(t *testing.T) {
 	sel := Doc().Find("div.row-fluid")
 	sel2 := sel.Find("a").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestFindNotSelf(t *testing.T) {
 	sel := Doc().Find("h1").Find("h1")
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestFindInvalidSelector(t *testing.T) {
-	defer AssertPanic(t)
+	defer assertPanic(t)
 	Doc().Find(":+ ^")
 }

 func TestChainedFind(t *testing.T) {
 	sel := Doc().Find("div.hero-unit").Find(".row-fluid")
-	AssertLength(t, sel.Nodes, 4)
+	assertLength(t, sel.Nodes, 4)
 }

 func TestChildren(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Children()
-	AssertLength(t, sel.Nodes, 5)
+	assertLength(t, sel.Nodes, 5)
 }

 func TestChildrenRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Children().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestContents(t *testing.T) {
 	sel := Doc().Find(".pvk-content").Contents()
-	AssertLength(t, sel.Nodes, 13)
+	assertLength(t, sel.Nodes, 13)
 }

 func TestContentsRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.Contents().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestChildrenFiltered(t *testing.T) {
 	sel := Doc().Find(".pvk-content").ChildrenFiltered(".hero-unit")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestChildrenFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.ChildrenFiltered(".hero-unit").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestContentsFiltered(t *testing.T) {
 	sel := Doc().Find(".pvk-content").ContentsFiltered(".hero-unit")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestContentsFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-content")
 	sel2 := sel.ContentsFiltered(".hero-unit").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestChildrenFilteredNone(t *testing.T) {
 	sel := Doc().Find(".pvk-content").ChildrenFiltered("a.btn")
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestParent(t *testing.T) {
 	sel := Doc().Find(".container-fluid").Parent()
-	AssertLength(t, sel.Nodes, 3)
+	assertLength(t, sel.Nodes, 3)
 }

 func TestParentRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.Parent().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentBody(t *testing.T) {
 	sel := Doc().Find("body").Parent()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestParentFiltered(t *testing.T) {
 	sel := Doc().Find(".container-fluid").ParentFiltered(".hero-unit")
-	AssertLength(t, sel.Nodes, 1)
-	AssertClass(t, sel, "hero-unit")
+	assertLength(t, sel.Nodes, 1)
+	assertClass(t, sel, "hero-unit")
 }

 func TestParentFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ParentFiltered(".hero-unit").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParents(t *testing.T) {
 	sel := Doc().Find(".container-fluid").Parents()
-	AssertLength(t, sel.Nodes, 8)
+	assertLength(t, sel.Nodes, 8)
 }

 func TestParentsOrder(t *testing.T) {
 	sel := Doc().Find("#cf2").Parents()
-	AssertLength(t, sel.Nodes, 6)
-	AssertSelectionIs(t, sel, ".hero-unit", ".pvk-content", "div.row-fluid", "#cf1", "body", "html")
+	assertLength(t, sel.Nodes, 6)
+	assertSelectionIs(t, sel, ".hero-unit", ".pvk-content", "div.row-fluid", "#cf1", "body", "html")
 }

 func TestParentsRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.Parents().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsFiltered(t *testing.T) {
 	sel := Doc().Find(".container-fluid").ParentsFiltered("body")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestParentsFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ParentsFiltered("body").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsUntil(t *testing.T) {
 	sel := Doc().Find(".container-fluid").ParentsUntil("body")
-	AssertLength(t, sel.Nodes, 6)
+	assertLength(t, sel.Nodes, 6)
 }

 func TestParentsUntilRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ParentsUntil("body").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsUntilSelection(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".pvk-content")
 	sel = sel.ParentsUntilSelection(sel2)
-	AssertLength(t, sel.Nodes, 3)
+	assertLength(t, sel.Nodes, 3)
 }

 func TestParentsUntilSelectionRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".pvk-content")
 	sel2 = sel.ParentsUntilSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsUntilNodes(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".pvk-content, .hero-unit")
 	sel = sel.ParentsUntilNodes(sel2.Nodes...)
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestParentsUntilNodesRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".pvk-content, .hero-unit")
 	sel2 = sel.ParentsUntilNodes(sel2.Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsFilteredUntil(t *testing.T) {
 	sel := Doc().Find(".container-fluid").ParentsFilteredUntil(".pvk-content", "body")
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestParentsFilteredUntilRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ParentsFilteredUntil(".pvk-content", "body").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsFilteredUntilSelection(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".row-fluid")
 	sel = sel.ParentsFilteredUntilSelection("div", sel2)
-	AssertLength(t, sel.Nodes, 3)
+	assertLength(t, sel.Nodes, 3)
 }

 func TestParentsFilteredUntilSelectionRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".row-fluid")
 	sel2 = sel.ParentsFilteredUntilSelection("div", sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestParentsFilteredUntilNodes(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".row-fluid")
 	sel = sel.ParentsFilteredUntilNodes("body", sel2.Nodes...)
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestParentsFilteredUntilNodesRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := Doc().Find(".row-fluid")
 	sel2 = sel.ParentsFilteredUntilNodes("body", sel2.Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestSiblings(t *testing.T) {
 	sel := Doc().Find("h1").Siblings()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestSiblingsRollback(t *testing.T) {
 	sel := Doc().Find("h1")
 	sel2 := sel.Siblings().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestSiblings2(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter").Siblings()
-	AssertLength(t, sel.Nodes, 9)
+	assertLength(t, sel.Nodes, 9)
 }

 func TestSiblings3(t *testing.T) {
 	sel := Doc().Find("body>.container-fluid").Siblings()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestSiblingsFiltered(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter").SiblingsFiltered(".pvk-content")
-	AssertLength(t, sel.Nodes, 3)
+	assertLength(t, sel.Nodes, 3)
 }

 func TestSiblingsFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter")
 	sel2 := sel.SiblingsFiltered(".pvk-content").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNext(t *testing.T) {
 	sel := Doc().Find("h1").Next()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestNextRollback(t *testing.T) {
 	sel := Doc().Find("h1")
 	sel2 := sel.Next().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNext2(t *testing.T) {
 	sel := Doc().Find(".close").Next()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestNextNone(t *testing.T) {
 	sel := Doc().Find("small").Next()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestNextFiltered(t *testing.T) {
 	sel := Doc().Find(".container-fluid").NextFiltered("div")
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestNextFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.NextFiltered("div").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextFiltered2(t *testing.T) {
 	sel := Doc().Find(".container-fluid").NextFiltered("[ng-view]")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestPrev(t *testing.T) {
 	sel := Doc().Find(".red").Prev()
-	AssertLength(t, sel.Nodes, 1)
-	AssertClass(t, sel, "green")
+	assertLength(t, sel.Nodes, 1)
+	assertClass(t, sel, "green")
 }

 func TestPrevRollback(t *testing.T) {
 	sel := Doc().Find(".red")
 	sel2 := sel.Prev().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestPrev2(t *testing.T) {
 	sel := Doc().Find(".row-fluid").Prev()
-	AssertLength(t, sel.Nodes, 5)
+	assertLength(t, sel.Nodes, 5)
 }

 func TestPrevNone(t *testing.T) {
 	sel := Doc().Find("h2").Prev()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestPrevFiltered(t *testing.T) {
 	sel := Doc().Find(".row-fluid").PrevFiltered(".row-fluid")
-	AssertLength(t, sel.Nodes, 5)
+	assertLength(t, sel.Nodes, 5)
 }

 func TestPrevFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".row-fluid")
 	sel2 := sel.PrevFiltered(".row-fluid").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextAll(t *testing.T) {
 	sel := Doc().Find("#cf2 div:nth-child(1)").NextAll()
-	AssertLength(t, sel.Nodes, 3)
+	assertLength(t, sel.Nodes, 3)
 }

 func TestNextAllRollback(t *testing.T) {
 	sel := Doc().Find("#cf2 div:nth-child(1)")
 	sel2 := sel.NextAll().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextAll2(t *testing.T) {
 	sel := Doc().Find("div[ng-cloak]").NextAll()
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestNextAllNone(t *testing.T) {
 	sel := Doc().Find(".footer").NextAll()
-	AssertLength(t, sel.Nodes, 0)
+	assertLength(t, sel.Nodes, 0)
 }

 func TestNextAllFiltered(t *testing.T) {
 	sel := Doc().Find("#cf2 .row-fluid").NextAllFiltered("[ng-cloak]")
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestNextAllFilteredRollback(t *testing.T) {
 	sel := Doc().Find("#cf2 .row-fluid")
 	sel2 := sel.NextAllFiltered("[ng-cloak]").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextAllFiltered2(t *testing.T) {
 	sel := Doc().Find(".close").NextAllFiltered("h4")
-	AssertLength(t, sel.Nodes, 1)
+	assertLength(t, sel.Nodes, 1)
 }

 func TestPrevAll(t *testing.T) {
 	sel := Doc().Find("[ng-view]").PrevAll()
-	AssertLength(t, sel.Nodes, 2)
+	assertLength(t, sel.Nodes, 2)
 }

 func TestPrevAllOrder(t *testing.T) {
 	sel := Doc().Find("[ng-view]").PrevAll()
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel, "#cf4", "#cf3")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#cf4", "#cf3")
 }

 func TestPrevAllRollback(t *testing.T) {
 	sel := Doc().Find("[ng-view]")
 	sel2 := sel.PrevAll().End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestPrevAll2(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter").PrevAll()
-	AssertLength(t, sel.Nodes, 6)
+	assertLength(t, sel.Nodes, 6)
 }

 func TestPrevAllFiltered(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter").PrevAllFiltered(".pvk-content")
-	AssertLength(t, sel.Nodes, 3)
+	assertLength(t, sel.Nodes, 3)
 }

 func TestPrevAllFilteredRollback(t *testing.T) {
 	sel := Doc().Find(".pvk-gutter")
 	sel2 := sel.PrevAllFiltered(".pvk-content").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextUntil(t *testing.T) {
 	sel := Doc().Find(".alert a").NextUntil("p")
-	AssertLength(t, sel.Nodes, 1)
-	AssertSelectionIs(t, sel, "h4")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "h4")
 }

 func TestNextUntil2(t *testing.T) {
 	sel := Doc().Find("#cf2-1").NextUntil("[ng-cloak]")
-	AssertLength(t, sel.Nodes, 1)
-	AssertSelectionIs(t, sel, "#cf2-2")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "#cf2-2")
 }

 func TestNextUntilOrder(t *testing.T) {
 	sel := Doc().Find("#cf2-1").NextUntil("#cf2-4")
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel, "#cf2-2", "#cf2-3")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#cf2-2", "#cf2-3")
 }

 func TestNextUntilRollback(t *testing.T) {
 	sel := Doc().Find("#cf2-1")
 	sel2 := sel.PrevUntil("#cf2-4").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextUntilSelection(t *testing.T) {
 	sel := Doc2().Find("#n2")
 	sel2 := Doc2().Find("#n4")
 	sel2 = sel.NextUntilSelection(sel2)
-	AssertLength(t, sel2.Nodes, 1)
-	AssertSelectionIs(t, sel2, "#n3")
+	assertLength(t, sel2.Nodes, 1)
+	assertSelectionIs(t, sel2, "#n3")
 }

 func TestNextUntilSelectionRollback(t *testing.T) {
 	sel := Doc2().Find("#n2")
 	sel2 := Doc2().Find("#n4")
 	sel2 = sel.NextUntilSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextUntilNodes(t *testing.T) {
 	sel := Doc2().Find("#n2")
 	sel2 := Doc2().Find("#n5")
 	sel2 = sel.NextUntilNodes(sel2.Nodes...)
-	AssertLength(t, sel2.Nodes, 2)
-	AssertSelectionIs(t, sel2, "#n3", "#n4")
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#n3", "#n4")
 }

 func TestNextUntilNodesRollback(t *testing.T) {
 	sel := Doc2().Find("#n2")
 	sel2 := Doc2().Find("#n5")
 	sel2 = sel.NextUntilNodes(sel2.Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestPrevUntil(t *testing.T) {
 	sel := Doc().Find(".alert p").PrevUntil("a")
-	AssertLength(t, sel.Nodes, 1)
-	AssertSelectionIs(t, sel, "h4")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "h4")
 }

 func TestPrevUntil2(t *testing.T) {
 	sel := Doc().Find("[ng-cloak]").PrevUntil(":not([ng-cloak])")
-	AssertLength(t, sel.Nodes, 1)
-	AssertSelectionIs(t, sel, "[ng-cloak]")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "[ng-cloak]")
 }

 func TestPrevUntilOrder(t *testing.T) {
 	sel := Doc().Find("#cf2-4").PrevUntil("#cf2-1")
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel, "#cf2-3", "#cf2-2")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#cf2-3", "#cf2-2")
 }

 func TestPrevUntilRollback(t *testing.T) {
 	sel := Doc().Find("#cf2-4")
 	sel2 := sel.PrevUntil("#cf2-1").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestPrevUntilSelection(t *testing.T) {
 	sel := Doc2().Find("#n4")
 	sel2 := Doc2().Find("#n2")
 	sel2 = sel.PrevUntilSelection(sel2)
-	AssertLength(t, sel2.Nodes, 1)
-	AssertSelectionIs(t, sel2, "#n3")
+	assertLength(t, sel2.Nodes, 1)
+	assertSelectionIs(t, sel2, "#n3")
 }

 func TestPrevUntilSelectionRollback(t *testing.T) {
 	sel := Doc2().Find("#n4")
 	sel2 := Doc2().Find("#n2")
 	sel2 = sel.PrevUntilSelection(sel2).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestPrevUntilNodes(t *testing.T) {
 	sel := Doc2().Find("#n5")
 	sel2 := Doc2().Find("#n2")
 	sel2 = sel.PrevUntilNodes(sel2.Nodes...)
-	AssertLength(t, sel2.Nodes, 2)
-	AssertSelectionIs(t, sel2, "#n4", "#n3")
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#n4", "#n3")
 }

 func TestPrevUntilNodesRollback(t *testing.T) {
 	sel := Doc2().Find("#n5")
 	sel2 := Doc2().Find("#n2")
 	sel2 = sel.PrevUntilNodes(sel2.Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextFilteredUntil(t *testing.T) {
 	sel := Doc2().Find(".two").NextFilteredUntil(".even", ".six")
-	AssertLength(t, sel.Nodes, 4)
-	AssertSelectionIs(t, sel, "#n3", "#n5", "#nf3", "#nf5")
+	assertLength(t, sel.Nodes, 4)
+	assertSelectionIs(t, sel, "#n3", "#n5", "#nf3", "#nf5")
 }

 func TestNextFilteredUntilRollback(t *testing.T) {
 	sel := Doc2().Find(".two")
 	sel2 := sel.NextFilteredUntil(".even", ".six").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestNextFilteredUntilSelection(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".five")
 	sel = sel.NextFilteredUntilSelection(".even", sel2)
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel, "#n3", "#nf3")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#n3", "#nf3")
 }

 func TestNextFilteredUntilSelectionRollback(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".five")
 	sel3 := sel.NextFilteredUntilSelection(".even", sel2).End()
-	AssertEqual(t, sel, sel3)
+	assertEqual(t, sel, sel3)
 }

 func TestNextFilteredUntilNodes(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".four")
 	sel = sel.NextFilteredUntilNodes(".odd", sel2.Nodes...)
-	AssertLength(t, sel.Nodes, 4)
-	AssertSelectionIs(t, sel, "#n2", "#n6", "#nf2", "#nf6")
+	assertLength(t, sel.Nodes, 4)
+	assertSelectionIs(t, sel, "#n2", "#n6", "#nf2", "#nf6")
 }

 func TestNextFilteredUntilNodesRollback(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".four")
 	sel3 := sel.NextFilteredUntilNodes(".odd", sel2.Nodes...).End()
-	AssertEqual(t, sel, sel3)
+	assertEqual(t, sel, sel3)
 }

 func TestPrevFilteredUntil(t *testing.T) {
 	sel := Doc2().Find(".five").PrevFilteredUntil(".odd", ".one")
-	AssertLength(t, sel.Nodes, 4)
-	AssertSelectionIs(t, sel, "#n4", "#n2", "#nf4", "#nf2")
+	assertLength(t, sel.Nodes, 4)
+	assertSelectionIs(t, sel, "#n4", "#n2", "#nf4", "#nf2")
 }

 func TestPrevFilteredUntilRollback(t *testing.T) {
 	sel := Doc2().Find(".four")
 	sel2 := sel.PrevFilteredUntil(".odd", ".one").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestPrevFilteredUntilSelection(t *testing.T) {
 	sel := Doc2().Find(".odd")
 	sel2 := Doc2().Find(".two")
 	sel = sel.PrevFilteredUntilSelection(".odd", sel2)
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel, "#n4", "#nf4")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#n4", "#nf4")
 }

 func TestPrevFilteredUntilSelectionRollback(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".five")
 	sel3 := sel.PrevFilteredUntilSelection(".even", sel2).End()
-	AssertEqual(t, sel, sel3)
+	assertEqual(t, sel, sel3)
 }

 func TestPrevFilteredUntilNodes(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".four")
 	sel = sel.PrevFilteredUntilNodes(".odd", sel2.Nodes...)
-	AssertLength(t, sel.Nodes, 2)
-	AssertSelectionIs(t, sel, "#n2", "#nf2")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#n2", "#nf2")
 }

 func TestPrevFilteredUntilNodesRollback(t *testing.T) {
 	sel := Doc2().Find(".even")
 	sel2 := Doc2().Find(".four")
 	sel3 := sel.PrevFilteredUntilNodes(".odd", sel2.Nodes...).End()
-	AssertEqual(t, sel, sel3)
+	assertEqual(t, sel, sel3)
 }

 func TestClosestItself(t *testing.T) {
 	sel := Doc2().Find(".three")
 	sel2 := sel.Closest(".row")
-	AssertLength(t, sel2.Nodes, sel.Length())
-	AssertSelectionIs(t, sel2, "#n3", "#nf3")
+	assertLength(t, sel2.Nodes, sel.Length())
+	assertSelectionIs(t, sel2, "#n3", "#nf3")
 }

 func TestClosestNoDupes(t *testing.T) {
 	sel := Doc().Find(".span12")
 	sel2 := sel.Closest(".pvk-content")
-	AssertLength(t, sel2.Nodes, 1)
-	AssertClass(t, sel2, "pvk-content")
+	assertLength(t, sel2.Nodes, 1)
+	assertClass(t, sel2, "pvk-content")
 }

 func TestClosestNone(t *testing.T) {
 	sel := Doc().Find("h4")
 	sel2 := sel.Closest("a")
-	AssertLength(t, sel2.Nodes, 0)
+	assertLength(t, sel2.Nodes, 0)
 }

 func TestClosestMany(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.Closest(".pvk-content")
-	AssertLength(t, sel2.Nodes, 2)
-	AssertSelectionIs(t, sel2, "#pc1", "#pc2")
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#pc1", "#pc2")
 }

 func TestClosestRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.Closest(".pvk-content").End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestClosestSelectionItself(t *testing.T) {
 	sel := Doc2().Find(".three")
 	sel2 := sel.ClosestSelection(Doc2().Find(".row"))
-	AssertLength(t, sel2.Nodes, sel.Length())
+	assertLength(t, sel2.Nodes, sel.Length())
 }

 func TestClosestSelectionNoDupes(t *testing.T) {
 	sel := Doc().Find(".span12")
 	sel2 := sel.ClosestSelection(Doc().Find(".pvk-content"))
-	AssertLength(t, sel2.Nodes, 1)
-	AssertClass(t, sel2, "pvk-content")
+	assertLength(t, sel2.Nodes, 1)
+	assertClass(t, sel2, "pvk-content")
 }

 func TestClosestSelectionNone(t *testing.T) {
 	sel := Doc().Find("h4")
 	sel2 := sel.ClosestSelection(Doc().Find("a"))
-	AssertLength(t, sel2.Nodes, 0)
+	assertLength(t, sel2.Nodes, 0)
 }

 func TestClosestSelectionMany(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ClosestSelection(Doc().Find(".pvk-content"))
-	AssertLength(t, sel2.Nodes, 2)
-	AssertSelectionIs(t, sel2, "#pc1", "#pc2")
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#pc1", "#pc2")
 }

 func TestClosestSelectionRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ClosestSelection(Doc().Find(".pvk-content")).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestClosestNodesItself(t *testing.T) {
 	sel := Doc2().Find(".three")
 	sel2 := sel.ClosestNodes(Doc2().Find(".row").Nodes...)
-	AssertLength(t, sel2.Nodes, sel.Length())
+	assertLength(t, sel2.Nodes, sel.Length())
 }

 func TestClosestNodesNoDupes(t *testing.T) {
 	sel := Doc().Find(".span12")
 	sel2 := sel.ClosestNodes(Doc().Find(".pvk-content").Nodes...)
-	AssertLength(t, sel2.Nodes, 1)
-	AssertClass(t, sel2, "pvk-content")
+	assertLength(t, sel2.Nodes, 1)
+	assertClass(t, sel2, "pvk-content")
 }

 func TestClosestNodesNone(t *testing.T) {
 	sel := Doc().Find("h4")
 	sel2 := sel.ClosestNodes(Doc().Find("a").Nodes...)
-	AssertLength(t, sel2.Nodes, 0)
+	assertLength(t, sel2.Nodes, 0)
 }

 func TestClosestNodesMany(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ClosestNodes(Doc().Find(".pvk-content").Nodes...)
-	AssertLength(t, sel2.Nodes, 2)
-	AssertSelectionIs(t, sel2, "#pc1", "#pc2")
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#pc1", "#pc2")
 }

 func TestClosestNodesRollback(t *testing.T) {
 	sel := Doc().Find(".container-fluid")
 	sel2 := sel.ClosestNodes(Doc().Find(".pvk-content").Nodes...).End()
-	AssertEqual(t, sel, sel2)
+	assertEqual(t, sel, sel2)
 }

 func TestIssue26(t *testing.T) {
@@ -692,6 +692,6 @@ func TestIssue26(t *testing.T) {
 			t.Fatal(err)
 		}
 		sel := doc.Find("img[src]")
-		AssertLength(t, sel.Nodes, c.l)
+		assertLength(t, sel.Nodes, c.l)
 	}
 }
@@ -51,15 +51,17 @@ func NewDocumentFromReader(r io.Reader) (*Document, error) {
 	return newDocument(root, nil), nil
 }

-// NewDocumentFromResponse is another Document constructor that takes an http resonse as argument.
+// NewDocumentFromResponse is another Document constructor that takes an http response as argument.
 // It loads the specified response's document, parses it, and stores the root Document
 // node, ready to be manipulated. The response's body is closed on return.
 func NewDocumentFromResponse(res *http.Response) (*Document, error) {
 	if res == nil {
-		return nil, errors.New("Response is nil pointer")
+		return nil, errors.New("Response is nil")
 	}
-
 	defer res.Body.Close()
+	if res.Request == nil {
+		return nil, errors.New("Response.Request is nil")
+	}

 	// Parse the HTML into nodes
 	root, e := html.Parse(res.Body)
@@ -71,6 +73,11 @@ func NewDocumentFromResponse(res *http.Response) (*Document, error) {
 	return newDocument(root, res.Request.URL), nil
 }

+// CloneDocument creates a deep-clone of a document.
+func CloneDocument(doc *Document) *Document {
+	return newDocument(cloneNode(doc.rootNode), doc.Url)
+}
+
 // Private constructor, make sure all fields are correctly filled.
 func newDocument(root *html.Node, url *url.URL) *Document {
 	// Create and fill the document
@@ -97,3 +104,12 @@ func newEmptySelection(doc *Document) *Selection {
 func newSingleSelection(node *html.Node, doc *Document) *Selection {
 	return &Selection{[]*html.Node{node}, doc, nil}
 }
+
+// Matcher is an interface that defines the methods to match
+// HTML nodes against a compiled selector string. Cascadia's
+// Selector implements this interface.
+type Matcher interface {
+	Match(*html.Node) bool
+	MatchAll(*html.Node) []*html.Node
+	Filter([]*html.Node) []*html.Node
+}
@@ -12,35 +12,57 @@ import (
 // Test helper functions and members
 var doc *Document
 var doc2 *Document
+var doc3 *Document
 var docB *Document
 var docW *Document

 func Doc() *Document {
 	if doc == nil {
-		doc = LoadDoc("page.html")
+		doc = loadDoc("page.html")
 	}
 	return doc
 }
+func DocClone() *Document {
+	return CloneDocument(Doc())
+}
 func Doc2() *Document {
 	if doc2 == nil {
-		doc2 = LoadDoc("page2.html")
+		doc2 = loadDoc("page2.html")
 	}
 	return doc2
 }
+func Doc2Clone() *Document {
+	return CloneDocument(Doc2())
+}
+func Doc3() *Document {
+	if doc3 == nil {
+		doc3 = loadDoc("page3.html")
+	}
+	return doc3
+}
+func Doc3Clone() *Document {
+	return CloneDocument(Doc3())
+}
 func DocB() *Document {
 	if docB == nil {
-		docB = LoadDoc("gotesting.html")
+		docB = loadDoc("gotesting.html")
 	}
 	return docB
 }
+func DocBClone() *Document {
+	return CloneDocument(DocB())
+}
 func DocW() *Document {
 	if docW == nil {
-		docW = LoadDoc("gowiki.html")
+		docW = loadDoc("gowiki.html")
 	}
 	return docW
 }
+func DocWClone() *Document {
+	return CloneDocument(DocW())
+}

-func AssertLength(t *testing.T, nodes []*html.Node, length int) {
+func assertLength(t *testing.T, nodes []*html.Node, length int) {
 	if len(nodes) != length {
 		t.Errorf("Expected %d nodes, found %d.", length, len(nodes))
 		for i, n := range nodes {
@@ -49,25 +71,25 @@ func AssertLength(t *testing.T, nodes []*html.Node, length int) {
 	}
 }

-func AssertClass(t *testing.T, sel *Selection, class string) {
+func assertClass(t *testing.T, sel *Selection, class string) {
 	if !sel.HasClass(class) {
 		t.Errorf("Expected node to have class %s, found %+v.", class, sel.Get(0))
 	}
 }

-func AssertPanic(t *testing.T) {
+func assertPanic(t *testing.T) {
 	if e := recover(); e == nil {
 		t.Error("Expected a panic.")
 	}
 }

-func AssertEqual(t *testing.T, s1 *Selection, s2 *Selection) {
+func assertEqual(t *testing.T, s1 *Selection, s2 *Selection) {
 	if s1 != s2 {
 		t.Error("Expected selection objects to be the same.")
 	}
 }

-func AssertSelectionIs(t *testing.T, sel *Selection, is ...string) {
+func assertSelectionIs(t *testing.T, sel *Selection, is ...string) {
 	for i := 0; i < sel.Length(); i++ {
 		if !sel.Eq(i).Is(is[i]) {
 			t.Errorf("Expected node %d to be %s, found %+v", i, is[i], sel.Get(i))
@@ -75,7 +97,17 @@ func AssertSelectionIs(t *testing.T, sel *Selection, is ...string) {
 	}
 }

-func LoadDoc(page string) *Document {
+func printSel(t *testing.T, sel *Selection) {
+	if testing.Verbose() {
+		h, err := sel.Html()
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(h)
+	}
+}
+
+func loadDoc(page string) *Document {
 	var f *os.File
 	var e error

@@ -1,9 +1,67 @@
 package goquery

 import (
+	"bytes"
+
 	"golang.org/x/net/html"
 )

+var nodeNames = []string{
+	html.ErrorNode:    "#error",
+	html.TextNode:     "#text",
+	html.DocumentNode: "#document",
+	html.CommentNode:  "#comment",
+}
+
+// NodeName returns the node name of the first element in the selection.
+// It tries to behave in a similar way as the DOM's nodeName property
+// (https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeName).
+//
+// Go's net/html package defines the following node types, listed with
+// the corresponding returned value from this function:
+//
+// ErrorNode : #error
+// TextNode : #text
+// DocumentNode : #document
+// ElementNode : the element's tag name
+// CommentNode : #comment
+// DoctypeNode : the name of the document type
+//
+func NodeName(s *Selection) string {
+	if s.Length() == 0 {
+		return ""
+	}
+	switch n := s.Get(0); n.Type {
+	case html.ElementNode, html.DoctypeNode:
+		return n.Data
+	default:
+		if n.Type >= 0 && int(n.Type) < len(nodeNames) {
+			return nodeNames[n.Type]
+		}
+		return ""
+	}
+}
+
+// OuterHtml returns the outer HTML rendering of the first item in
+// the selection - that is, the HTML including the first element's
+// tag and attributes.
+//
+// Unlike InnerHtml, this is a function and not a method on the Selection,
+// because this is not a jQuery method (in javascript-land, this is
+// a property provided by the DOM).
+func OuterHtml(s *Selection) (string, error) {
+	var buf bytes.Buffer
+
+	if s.Length() == 0 {
+		return "", nil
+	}
+	n := s.Get(0)
+	if err := html.Render(&buf, n); err != nil {
+		return "", err
+	}
+	return buf.String(), nil
+}
+
 func getChildren(n *html.Node) (result []*html.Node) {
 	for c := n.FirstChild; c != nil; c = c.NextSibling {
 		result = append(result, c)
@@ -0,0 +1,128 @@
+package goquery
+
+import (
+	"reflect"
+	"sort"
+	"strings"
+	"testing"
+
+	"golang.org/x/net/html"
+)
+
+var allNodes = `<!doctype html>
+<html>
+	<head>
+		<meta a="b">
+	</head>
+	<body>
+		<p><!-- this is a comment -->
+		This is some text.
+		</p>
+		<div></div>
+		<h1 class="header"></h1>
+		<h2 class="header"></h2>
+	</body>
+</html>`
+
+func TestNodeName(t *testing.T) {
+	doc, err := NewDocumentFromReader(strings.NewReader(allNodes))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	n0 := doc.Nodes[0]
+	nDT := n0.FirstChild
+	sMeta := doc.Find("meta")
+	nMeta := sMeta.Get(0)
+	sP := doc.Find("p")
+	nP := sP.Get(0)
+	nComment := nP.FirstChild
+	nText := nComment.NextSibling
+
+	cases := []struct {
+		node *html.Node
+		typ  html.NodeType
+		want string
+	}{
+		{n0, html.DocumentNode, nodeNames[html.DocumentNode]},
+		{nDT, html.DoctypeNode, "html"},
+		{nMeta, html.ElementNode, "meta"},
+		{nP, html.ElementNode, "p"},
+		{nComment, html.CommentNode, nodeNames[html.CommentNode]},
+		{nText, html.TextNode, nodeNames[html.TextNode]},
+	}
+	for i, c := range cases {
+		got := NodeName(newSingleSelection(c.node, doc))
+		if c.node.Type != c.typ {
+			t.Errorf("%d: want type %v, got %v", i, c.typ, c.node.Type)
+		}
+		if got != c.want {
+			t.Errorf("%d: want %q, got %q", i, c.want, got)
+		}
+	}
+}
+
+func TestNodeNameMultiSel(t *testing.T) {
+	doc, err := NewDocumentFromReader(strings.NewReader(allNodes))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	in := []string{"p", "h1", "div"}
+	var out []string
+	doc.Find(strings.Join(in, ", ")).Each(func(i int, s *Selection) {
+		got := NodeName(s)
+		out = append(out, got)
+	})
+	sort.Strings(in)
+	sort.Strings(out)
+	if !reflect.DeepEqual(in, out) {
+		t.Error("want %v, got %v")
+	}
+}
+
+func TestOuterHtml(t *testing.T) {
+	doc, err := NewDocumentFromReader(strings.NewReader(allNodes))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	n0 := doc.Nodes[0]
+	nDT := n0.FirstChild
+	sMeta := doc.Find("meta")
+	sP := doc.Find("p")
+	nP := sP.Get(0)
+	nComment := nP.FirstChild
+	nText := nComment.NextSibling
+	sHeaders := doc.Find(".header")
+
+	cases := []struct {
+		node *html.Node
+		sel  *Selection
+		want string
+	}{
+		{nDT, nil, "<!DOCTYPE html>"}, // render makes DOCTYPE all caps
+		{nil, sMeta, `<meta a="b"/>`}, // and auto-closes the meta
+		{nil, sP, `<p><!-- this is a comment -->
+		This is some text.
+		</p>`},
+		{nComment, nil, "<!-- this is a comment -->"},
+		{nText, nil, `
+		This is some text.
+		`},
+		{nil, sHeaders, `<h1 class="header"></h1>`},
+	}
+	for i, c := range cases {
+		if c.sel == nil {
+			c.sel = newSingleSelection(c.node, doc)
+		}
+		got, err := OuterHtml(c.sel)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if got != c.want {
+			t.Errorf("%d: want %q, got %q", i, c.want, got)
+		}
+	}
+}
Author	SHA1	Message	Date
Martin Angers	b0437209ef	add NodeName and OuterHtml utility functions	2016-02-02 12:28:50 -05:00
Martin Angers	417cce822c	return error if response`s request is nil on NewDocumentFromResponse	2015-09-27 16:28:20 -04:00
Martin Angers	b4440419d8	make AttrOr return default value if selection is empty	2015-06-05 22:16:32 -04:00
Martin Angers	60ec77b003	doc: document AttrOr addition	2015-04-20 19:20:24 -04:00
Martin Angers	a8c8239eb6	Merge pull request #73 from piotrkowalczuk/master Selection.AttrOr shorthand method	2015-04-20 19:17:32 -04:00
Piotr Kowalczuk	c416dcdfae	Selection.AttrOr test	2015-04-17 00:38:27 +02:00
Piotr Kowalczuk	23904f6805	Selection.AttrOr shorthand method	2015-04-17 00:30:41 +02:00
Martin Angers	5203bc06da	Merge pull request #72 from bfontaine/patch-1 Typo in NewDocumentFromResponse doc	2015-04-09 13:50:05 -04:00
Baptiste Fontaine	2d28dba982	Typo in NewDocumentFromResponse doc	2015-04-09 19:33:38 +02:00
Martin Angers	269246d9e7	doc: fix obsolete links in README	2015-03-28 09:30:56 -04:00
Martin Angers	55f7879c98	Merge pull request #68 from pacificporter/cascadia_has_moved cascadia has moved.	2015-03-28 09:20:13 -04:00
HARUYAMA Seigo	d9b2b5ed51	cascadia has moved. code.google.com/p/cascadia -> github.com/andybalholm/cascadia	2015-03-28 11:15:11 +09:00
Martin Angers	4cf64c51f7	Merge branch 'thatguystone-master'	2015-02-04 20:43:27 -05:00
Martin Angers	fe61b74344	document Prepend addition	2015-02-04 20:43:02 -05:00
Andrew Stone	edcb3e4b1e	manipulation: Add Prepend*() Looks like I missed yet another manipulation function.	2015-02-04 11:28:51 -05:00
Martin Angers	12a46cd4a1	Merge pull request #58 from jpillora/master SetAttr now creates attributes, in addition to updating attributes, clos...	2014-12-09 22:34:46 -05:00
Jaime Pillora	51379dc225	SetAttr now creates attributes, in addition to updating attributes, closes #57	2014-12-06 18:53:56 +11:00
Martin Angers	0db8a55dc4	fix doc alignment	2014-11-28 11:55:26 -05:00
Martin Angers	2922326512	doc	2014-11-28 11:50:40 -05:00
Martin Angers	a923db6a4b	review PR, fix WrapInner bug	2014-11-28 11:46:58 -05:00
Andrew Stone	2455631714	manipulation: Add Unwrap()	2014-11-12 10:37:11 -05:00
Andrew Stone	162ad3a767	manipulation: add ReplaceWith*() functions	2014-11-12 10:37:11 -05:00
Andrew Stone	ca48f5f409	manipulation: add Wrap*() functions	2014-11-12 10:37:11 -05:00
Martin Angers	ffa8a68c9f	accept variadic class names in AddClass	2014-11-07 22:08:57 -05:00
Martin Angers	39d99e8fa4	remove fmt dependency	2014-11-07 13:21:28 -05:00
Martin Angers	522e116ada	doc again	2014-11-07 12:36:55 -05:00
Martin Angers	b89597bb36	doc	2014-11-07 12:33:22 -05:00
Martin Angers	fb2312a925	add final Matcher overloads	2014-11-07 12:19:01 -05:00
Martin Angers	ef025592df	more *Matcher overloads of selector string methods	2014-11-07 11:37:50 -05:00
Martin Angers	c0464bb4c9	fix class manipulation issue	2014-11-07 11:22:08 -05:00
Martin Angers	ac1e87b973	doc	2014-11-07 09:57:08 -05:00
Martin Angers	958027e55f	fix failing test due to CloneDocument renaming	2014-11-07 09:32:11 -05:00
Martin Angers	1ff3f2a033	rename NewDocumentFromDocument to CloneDocument	2014-11-07 09:23:27 -05:00
Martin Angers	3aedb35ed4	remove lint warning	2014-11-07 09:21:01 -05:00
Martin Angers	409e94058f	make test assert helpers private	2014-11-07 09:20:20 -05:00
Martin Angers	54d43ec4b0	add Go 1.3 target in travis tests	2014-11-07 08:38:44 -05:00
Martin Angers	875b65f385	finish transition for Matcher-based overloads	2014-11-07 08:36:55 -05:00
Martin Angers	251095afb5	start adding matcher functions	2014-11-06 21:43:08 -05:00
Martin Angers	cc9b6f8c6f	Merge branch 'master' into manipulation	2014-11-06 20:46:11 -05:00
Martin Angers	98316c249d	changelog	2014-11-06 16:46:53 -05:00
Martin Angers	9324e7076d	Merge branch 'golang-import-paths', fix #52	2014-11-06 16:41:10 -05:00
Andrew Stone	e7ef1f75eb	Update documentation to include manipulation functions	2014-10-29 11:58:26 -04:00
Andrew Stone	9b29a63ff5	property: Add Set/Remove Attr functions	2014-10-29 11:11:06 -04:00
Andrew Stone	25807d1884	property: Add/Remove/Toggle Class functions	2014-10-29 11:11:01 -04:00
Andrew Stone	2abc410148	manipulation: Add Before*() functions.	2014-10-24 11:49:20 -04:00
Andrew Stone	2bd0871a77	manipulation: Add After*() functions.	2014-10-24 11:49:20 -04:00
Andrew Stone	b7dabffd85	manipulation: Add Empty() function.	2014-10-24 11:49:05 -04:00
Andrew Stone	b800859dea	manipulation: Add Remove*() functions.	2014-10-24 11:49:05 -04:00
Andrew Stone	9848519841	filter: Add *Selector for filtering methods that accepts a pre-compiled cascadia selector.	2014-10-24 11:49:05 -04:00
Andrew Stone	0e970f1f85	manipulation: Add Append*() functions	2014-10-24 11:49:01 -04:00